Re: drop opencore-amr?

ping

On Sep 20 15:13:33, hans@stare.cz wrote:
> On Sep 20 15:05:01, hans@stare.cz wrote:
> > Below is a diff that unhooks opencore-amr from audio/Makefile
> > and removes the dependency from audio/sox, multimedia/imagination,
> > and telephony/pjsua. Please correct me where I missed something.
>
> On Sep 20 13:11:38, stu@spacehopper.org wrote:
> > multimedia/imagination just picks up the library dependency from sox.
> > Regen wantlib and bump REVISION to fix.
> > For telephony/pjsua just remove the dep/wantlib, add
> > --disable-opencore-amr to CONFIGURE_ARGS, and bump.
>
> Better diff below, except I don't know how to convey
> the actual removal of the audio/opencore-amr directory in a diff.
>
> Jan
>
>
> Index: audio/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.391
> diff -u -p -r1.391 Makefile
> --- audio/Makefile 17 Sep 2017 16:45:29 -0000 1.391
> +++ audio/Makefile 20 Sep 2017 13:10:19 -0000
> @@ -142,7 +142,6 @@
> SUBDIR += ocp
> SUBDIR += oggtag
> SUBDIR += openal
> - SUBDIR += opencore-amr
> SUBDIR += opennap
> SUBDIR += opus
> SUBDIR += opus-tools
> Index: audio/sox/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/sox/Makefile,v
> retrieving revision 1.68
> diff -u -p -r1.68 Makefile
> --- audio/sox/Makefile 22 Sep 2016 19:58:22 -0000 1.68
> +++ audio/sox/Makefile 20 Sep 2017 13:10:19 -0000
> @@ -5,21 +5,19 @@ BROKEN-hppa = bend.c:155:12: internal co
> COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
>
> DISTNAME= sox-14.4.2
> -REVISION= 2
> +REVISION= 3
> SHARED_LIBS += sox 4.0 # 3.0
>
> CATEGORIES= audio
> HOMEPAGE= http://sox.sourceforge.net/
> MAINTAINER= Jan Stary <hans@stare.cz>
>
> -# code is GPLv2+, however as opencore is under Apache License we must use
> -# sox under the terms of GPLv3 to avoid license conflict.
> +# GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB += c m z sndio
> WANTLIB += FLAC gsm mad id3tag mp3lame ogg
> WANTLIB += sndfile vorbis vorbisenc vorbisfile
> -WANTLIB += opencore-amrnb opencore-amrwb
> WANTLIB += opus opusfile twolame wavpack
> WANTLIB += iconv png
>
> @@ -35,7 +33,6 @@ LIB_DEPENDS= \
> audio/libogg \
> audio/libsndfile \
> audio/libvorbis \
> - audio/opencore-amr \
> audio/opus \
> audio/opusfile \
> audio/twolame \
> @@ -75,8 +72,8 @@ CONFIGURE_ARGS+= \
> --with-oggvorbis \
> --with-opus \
> --with-flac \
> - --with-amrwb \
> - --with-amrnb \
> + --without-amrwb \
> + --without-amrnb \
> --with-wavpack \
> --with-sndfile \
> --with-mp3 \
> Index: multimedia/imagination/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/imagination/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- multimedia/imagination/Makefile 22 Sep 2016 21:30:17 -0000 1.12
> +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = lightweight and simple DVD slide show maker
> DISTNAME = imagination-3.0
> -REVISION = 5
> +REVISION = 6
>
> CATEGORIES = multimedia
>
> @@ -17,8 +17,8 @@ WANTLIB += FLAC X11 Xcomposite Xcursor X
> WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig
> WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 gtk-x11-2.0
> -WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg opencore-amrnb
> -WANTLIB += opencore-amrwb opus opusfile pango-1.0 pangocairo-1.0
> +WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg
> +WANTLIB += opus opusfile pango-1.0 pangocairo-1.0
> WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
> WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile
> WANTLIB += wavpack xcb xcb-render xcb-shm z
> Index: telephony/pjsua/Makefile
> ===================================================================
> RCS file: /cvs/ports/telephony/pjsua/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- telephony/pjsua/Makefile 5 Aug 2017 12:31:01 -0000 1.43
> +++ telephony/pjsua/Makefile 20 Sep 2017 13:10:43 -0000
> @@ -4,7 +4,7 @@ COMMENT-main= multimedia communication l
> COMMENT-pjsua= lightweight sip client
>
> V= 2.4.5
> -REVISION= 2
> +REVISION= 3
> DISTNAME= pjproject-$V
> PKGNAME-main= pjsip-$V
> PKGNAME-pjsua= pjsua-$V
> @@ -35,7 +35,7 @@ MASTER_SITES= ${HOMEPAGE}release/$V/
> # GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB += crypto gsm m opencore-amrnb opencore-amrwb portaudio pthread
> +WANTLIB += crypto gsm m portaudio pthread
> WANTLIB += speex speexdsp ssl
>
> WANTLIB-pjsua += ${WANTLIB}
> @@ -48,7 +48,6 @@ WANTLIB-main = ${WANTLIB} ${COMPILER_LIB
> MULTI_PACKAGES= -main -pjsua
>
> LIB_DEPENDS-main= audio/gsm \
> - audio/opencore-amr \
> audio/portaudio-svn \
> audio/speex
>
> @@ -63,6 +62,7 @@ AUTOCONF_VERSION= 2.69
> CONFIGURE_ARGS= --enable-shared \
> --disable-oss \
> --disable-video \
> + --disable-opencore-amr \
> --with-external-gsm \
> --with-external-pa \
> --with-external-speex \
>