drop opencore-amr?
A new version of opencore-amr is out since January.
Before I upgrade the port, shouldn't we rather drop it?
Originaly, I added the opencore-amr port to have AMR in SoX,
because AMR is what Android recorded by default in its voice recorder.
That's no longer true ("normal quality" is m4a, "high quality" is wav),
and I have no other use of the amr codec.
Also, it is encumbered with patents.
Does anyone need audio/opencore-amr?
Jan
drop opencore-amr
audio/opencore-amr is no longer used by sox or imagination.
The only remaining use is by telephony/pjsua (no maintainer)
- do other pjsua users actually use AMR? I have never seen it used.
If we drop opencore-amr from pjsua (pending), we can drop opencore-amr
altogether. I originally imported it to have it in SoX, because
my android recorded AMR by default back then. Tha't no longer true,
and the whole codec is imho outdated by now, beside being
encumbered by patents.
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.398
diff -u -p -u -p -r1.398 Makefile
--- Makefile16 Jan 2018 01:42:40 - 1.398
+++ Makefile18 Mar 2018 16:07:58 -
@@ -139,7 +139,6 @@
SUBDIR += nspmod
SUBDIR += ocp
SUBDIR += openal
- SUBDIR += opencore-amr
SUBDIR += opennap
SUBDIR += opus
SUBDIR += opus-tools
Index: opencore-amr/Makefile
===
RCS file: opencore-amr/Makefile
diff -N opencore-amr/Makefile
--- opencore-amr/Makefile 16 Mar 2015 18:07:36 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-# $OpenBSD: Makefile,v 1.6 2015/03/16 18:07:36 naddy Exp $
-
-COMMENT= implementation of the Adaptive Multi Rate speech codec
-
-DISTNAME= opencore-amr-0.1.3
-REVISION= 0
-
-SHARED_LIBS += opencore-amrnb 0.0 # .0.3
-SHARED_LIBS += opencore-amrwb 0.0 # .0.3
-
-CATEGORIES=audio
-
-HOMEPAGE= http://opencore-amr.sourceforge.net/
-
-MAINTAINER=Jan Stary
-
-# Apache 2.0
-PERMIT_PACKAGE_CDROM= http://www.voiceage.com/amr_licterms.php
-PERMIT_PACKAGE_FTP=Yes
-
-WANTLIB += m
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencore-amr/}
-
-SEPARATE_BUILD=yes
-CONFIGURE_STYLE= gnu
-
-.include
Index: opencore-amr/distinfo
===
RCS file: opencore-amr/distinfo
diff -N opencore-amr/distinfo
--- opencore-amr/distinfo 18 Jan 2015 03:12:46 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (opencore-amr-0.1.3.tar.gz) =
EGv4EcHzZETXZx2P0lifiy4Myliix2TaYv/EoHBZU4U=
-SIZE (opencore-amr-0.1.3.tar.gz) = 881105
Index: opencore-amr/pkg/DESCR
===
RCS file: opencore-amr/pkg/DESCR
diff -N opencore-amr/pkg/DESCR
--- opencore-amr/pkg/DESCR 6 Jul 2012 17:21:11 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,6 +0,0 @@
-opencore-amr contains an implementation of the 3GPP TS 26.073
-specification for the Adaptive Multi Rate (AMR) speech codec
-and an implementation of the 3GPP TS 26.173 specification for
-the Adaptive Multi-Rate Wideband (AMR-WB) speech decoder.
-The implementation is derived from the OpenCORE framework,
-part of the Google Android project.
Index: opencore-amr/pkg/PLIST
===
RCS file: opencore-amr/pkg/PLIST
diff -N opencore-amr/pkg/PLIST
--- opencore-amr/pkg/PLIST 16 Mar 2015 18:07:36 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:36 naddy Exp $
-include/opencore-amrnb/
-include/opencore-amrnb/interf_dec.h
-include/opencore-amrnb/interf_enc.h
-include/opencore-amrwb/
-include/opencore-amrwb/dec_if.h
-include/opencore-amrwb/if_rom.h
-lib/libopencore-amrnb.a
-lib/libopencore-amrnb.la
-@lib lib/libopencore-amrnb.so.${LIBopencore-amrnb_VERSION}
-lib/libopencore-amrwb.a
-lib/libopencore-amrwb.la
-@lib lib/libopencore-amrwb.so.${LIBopencore-amrwb_VERSION}
-lib/pkgconfig/opencore-amrnb.pc
-lib/pkgconfig/opencore-amrwb.pc
Re: drop opencore-amr?
On 2017/09/15 07:56, Jan Stary wrote:
> A new version of opencore-amr is out since January.
> Before I upgrade the port, shouldn't we rather drop it?
>
> Originaly, I added the opencore-amr port to have AMR in SoX,
> because AMR is what Android recorded by default in its voice recorder.
> That's no longer true ("normal quality" is m4a, "high quality" is wav),
> and I have no other use of the amr codec.
>
> Also, it is encumbered with patents.
>
> Does anyone need audio/opencore-amr?
>
> Jan
>
No objections here - FFmpeg can decode AMR and AMR-WB internally so there's
still a way to get audio out of these files if necessary. pjsip will need to
be changed but that should be straightforward.
Re: drop opencore-amr?
On Sep 15 08:36:42, s...@spacehopper.org wrote:
> On 2017/09/15 07:56, Jan Stary wrote:
> > A new version of opencore-amr is out since January.
> > Before I upgrade the port, shouldn't we rather drop it?
> >
> > Originaly, I added the opencore-amr port to have AMR in SoX,
> > because AMR is what Android recorded by default in its voice recorder.
> > That's no longer true ("normal quality" is m4a, "high quality" is wav),
> > and I have no other use of the amr codec.
> >
> > Also, it is encumbered with patents.
> >
> > Does anyone need audio/opencore-amr?
> >
> > Jan
> >
>
> No objections here - FFmpeg can decode AMR and AMR-WB internally so there's
> still a way to get audio out of these files if necessary. pjsip will need to
> be changed but that should be straightforward.
As a first step, below is a diff to remove opencore-amr from audio/sox.
(That also brings the licensing back to GPL2.) Tested on amd64 and i386
and macppc and armv7; please test everywhere.
Grep'ing /usr/ports for 'opencore', these seem to be affected:
* audio/opencore-amr (obviously)
* audio/sox (handled below)
* multimedia/imagination (cc maintainer)
* telephony/pjsua (no maintainer)
These seem to _not_ be affected:
* x11/mplayer (--disable-libopencore_amrnb --disable-libopencore_amrwb)
* audio/fdk-aac (cc maintainer)
Would any of these miss opencore-amr if we removed it?
(Is suppose in e.g. pjsua the codec might actually be used.)
Jan
Index: sox/Makefile
===
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- sox/Makefile22 Sep 2016 19:58:22 - 1.68
+++ sox/Makefile20 Sep 2017 09:55:31 -
@@ -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
-# 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 \
Re: drop opencore-amr?
On Sep 20 12:09:25, h...@stare.cz wrote: > Grep'ing /usr/ports for 'opencore', these seem to be affected: > > * audio/opencore-amr (obviously) > * audio/sox (handled below) > * multimedia/imagination (cc maintainer) > * telephony/pjsua (no maintainer) > > These seem to _not_ be affected: > > * x11/mplayer (--disable-libopencore_amrnb --disable-libopencore_amrwb) > * audio/fdk-aac (cc maintainer) > > Would any of these miss opencore-amr if we removed it? > (Is suppose in e.g. pjsua the codec might actually be used.) And grep'ing for 'amr', here is a few more (cc maintainer) * A patch for multimedia/avidemux mentions libamrnb, but it seems to be unused both with and without the patch * multimedia/gstreamer-0.10 mentions libvo_amrwbenc I am not sure if it uses opencore-amr * multimedia/gstreamer-0.10/plugins-ugly says CONFIGURE_ARGS= --disable-amrnb --disable-amrwb so I suppose it is not affected * multimedia/gstreamer1 says --disable-voamrwbenc * multimedia/gstreamer1/plugins-ugly says --disable-amrnb --disable-amrwb Jan
Re: drop opencore-amr?
On 2017/09/20 11:21, Jan Stary wrote: > On Sep 20 12:09:25, h...@stare.cz wrote: > > Grep'ing /usr/ports for 'opencore', these seem to be affected: > > > > * audio/opencore-amr (obviously) > > * audio/sox (handled below) > > * multimedia/imagination (cc maintainer) > > * telephony/pjsua (no maintainer) > > > > These seem to _not_ be affected: > > > > * x11/mplayer (--disable-libopencore_amrnb --disable-libopencore_amrwb) > > * audio/fdk-aac (cc maintainer) > > > > Would any of these miss opencore-amr if we removed it? > > (Is suppose in e.g. pjsua the codec might actually be used.) > > And grep'ing for 'amr', here is a few more (cc maintainer) > > * A patch for multimedia/avidemux mentions libamrnb, > but it seems to be unused both with and without the patch > > * multimedia/gstreamer-0.10 mentions libvo_amrwbenc > I am not sure if it uses opencore-amr > > * multimedia/gstreamer-0.10/plugins-ugly says > CONFIGURE_ARGS= --disable-amrnb --disable-amrwb > so I suppose it is not affected > * multimedia/gstreamer1 says --disable-voamrwbenc > * multimedia/gstreamer1/plugins-ugly says --disable-amrnb --disable-amrwb > > Jan > 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. Apart from sox, I think that is all you need to do.
Re: drop opencore-amr?
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.
(The current multimedia/imagination mentions opencore-amr in WANTLIB
but not in LIB_DEPENDS - is that right?)
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 - 1.391
+++ audio/Makefile 20 Sep 2017 12:55:59 -
@@ -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 - 1.68
+++ audio/sox/Makefile 20 Sep 2017 12:55:59 -
@@ -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
-# 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 - 1.12
+++ multimedia/imagination/Makefile 20 Sep 2017 12:56:12 -
@@ -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/Makefile5 Aug 2017 12:31:01 - 1.43
+++ telephony/pjsua/Makefile20 Sep 2017 12:56:22 -
@@ -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
Re: drop opencore-amr?
On Sep 20 15:05:01, h...@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, s...@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 - 1.391
+++ audio/Makefile 20 Sep 2017 13:10:19 -
@@ -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 - 1.68
+++ audio/sox/Makefile 20 Sep 2017 13:10:19 -
@@ -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
-# 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 - 1.12
+++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 -
@@ -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/Makefile5 Aug 2017 12:31:01 - 1.43
+++ telephony/pjsua/Makefile20 Sep 2017 13:10:43 -
@@ -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
M
Re: drop opencore-amr?
ping
On Sep 20 15:13:33, h...@stare.cz wrote:
> On Sep 20 15:05:01, h...@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, s...@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/Makefile17 Sep 2017 16:45:29 - 1.391
> +++ audio/Makefile20 Sep 2017 13:10:19 -
> @@ -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/Makefile22 Sep 2016 19:58:22 - 1.68
> +++ audio/sox/Makefile20 Sep 2017 13:10:19 -
> @@ -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
>
> -# 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 - 1.12
> +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 -
> @@ -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 - 1.43
> +++ telephony/pjsua/Makefile 20 Sep 2017 13:10:43 -
> @@ -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/
> #
Re: drop opencore-amr?
ping On Nov 01 14:49:04, h...@stare.cz wrote: > ping > > On Sep 20 15:13:33, h...@stare.cz wrote: > > On Sep 20 15:05:01, h...@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, s...@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 - 1.391 > > +++ audio/Makefile 20 Sep 2017 13:10:19 - > > @@ -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 - 1.68 > > +++ audio/sox/Makefile 20 Sep 2017 13:10:19 - > > @@ -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 > > > > -# 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 - 1.12 > > +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 - > > @@ -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/Makefile5 Aug 2017 12:31:01 - 1.43 > > +++ telephony/pjsua/Makefile20 Sep 2017 13:10:43 - > > @@ -4,7 +4,7 @@ COMMENT-main= multimedia communication l > > COMMENT-pjsua=
Re: drop opencore-amr?
ping On Jan 28 09:08:24, h...@stare.cz wrote: > ping > > On Nov 01 14:49:04, h...@stare.cz wrote: > > ping > > > > On Sep 20 15:13:33, h...@stare.cz wrote: > > > On Sep 20 15:05:01, h...@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, s...@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/Makefile17 Sep 2017 16:45:29 - 1.391 > > > +++ audio/Makefile20 Sep 2017 13:10:19 - > > > @@ -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/Makefile22 Sep 2016 19:58:22 - 1.68 > > > +++ audio/sox/Makefile20 Sep 2017 13:10:19 - > > > @@ -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 > > > > > > -# 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 - > > > 1.12 > > > +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 - > > > @@ -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/
Re: drop opencore-amr?
Ping On 17 Mar 2018 3:32 pm, "Jan Stary" wrote: > ping > > On Jan 28 09:08:24, h...@stare.cz wrote: > > ping > > > > On Nov 01 14:49:04, h...@stare.cz wrote: > > > ping > > > > > > On Sep 20 15:13:33, h...@stare.cz wrote: > > > > On Sep 20 15:05:01, h...@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, s...@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/Makefile17 Sep 2017 16:45:29 - 1.391 > > > > +++ audio/Makefile20 Sep 2017 13:10:19 - > > > > @@ -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/Makefile22 Sep 2016 19:58:22 - 1.68 > > > > +++ audio/sox/Makefile20 Sep 2017 13:10:19 - > > > > @@ -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 > > > > > > > > -# 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 > - 1.12 > > > > +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 - > > > > @@ -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 > > > >
Re: drop opencore-amr
On Mar 18 17:08:44, h...@stare.cz wrote: > audio/opencore-amr is no longer used by sox or imagination. > The only remaining use is by telephony/pjsua (no maintainer) Here are the other ports mentioning AMR, but not using opencore-amr - either explicitly disabling it, or using another implmentation audio/fdk-aac: part of the opencore-amr project, but not using amr multimedia/avidemux: looks for amrnb/interf_dec.h, not by opencore-amr multimedia/gstreamer-0.10: looks for libvo_amrwbenc, not opencore-amr multimedia/gstreamer-0.10/plugins-ugly: --disable-amrnb --disable-amrwb multimedia/gstreamer1/plugins-bad: --disable-voamrwbenc multimedia/gstreamer1/plugins-ugly: --disable-amrnb --disable-amrwb telephony/baresip: lib/baresip/modules/amr.so is their own telephony/pjsua: --disable-opencore-amr (pending) /x11/mplayer: --disable-libopencore_amrnb --disable-libopencore_amrwb Jan
Re: drop opencore-amr
On 2018/03/18 17:08, Jan Stary wrote: > audio/opencore-amr is no longer used by sox or imagination. > The only remaining use is by telephony/pjsua (no maintainer) > - do other pjsua users actually use AMR? I have never seen it used. > > If we drop opencore-amr from pjsua (pending), we can drop opencore-amr > altogether. I originally imported it to have it in SoX, because > my android recorded AMR by default back then. Tha't no longer true, > and the whole codec is imho outdated by now, beside being > encumbered by patents. I don't see any reason to remove this.
Re: drop opencore-amr
On Mar 18 21:00:19, s...@spacehopper.org wrote: > On 2018/03/18 17:08, Jan Stary wrote: > > audio/opencore-amr is no longer used by sox or imagination. > > The only remaining use is by telephony/pjsua (no maintainer) > > - do other pjsua users actually use AMR? I have never seen it used. > > > > If we drop opencore-amr from pjsua (pending), we can drop opencore-amr > > altogether. I originally imported it to have it in SoX, because > > my android recorded AMR by default back then. Tha't no longer true, > > and the whole codec is imho outdated by now, beside being > > encumbered by patents. > > I don't see any reason to remove this. If people want it to stay, I would just like to remove myself as the maintainer. Index: Makefile === RCS file: /cvs/ports/audio/opencore-amr/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile16 Mar 2015 18:07:36 - 1.6 +++ Makefile5 Apr 2018 08:07:50 - @@ -12,8 +12,6 @@ CATEGORIES= audio HOMEPAGE= http://opencore-amr.sourceforge.net/ -MAINTAINER=Jan Stary - # Apache 2.0 PERMIT_PACKAGE_CDROM= http://www.voiceage.com/amr_licterms.php PERMIT_PACKAGE_FTP=Yes
Re: drop opencore-amr
On Thu, Apr 05 2018, Jan Stary wrote: > On Mar 18 21:00:19, s...@spacehopper.org wrote: >> On 2018/03/18 17:08, Jan Stary wrote: >> > audio/opencore-amr is no longer used by sox or imagination. >> > The only remaining use is by telephony/pjsua (no maintainer) >> > - do other pjsua users actually use AMR? I have never seen it used. >> > >> > If we drop opencore-amr from pjsua (pending), we can drop opencore-amr >> > altogether. I originally imported it to have it in SoX, because >> > my android recorded AMR by default back then. Tha't no longer true, >> > and the whole codec is imho outdated by now, beside being >> > encumbered by patents. >> >> I don't see any reason to remove this. > > If people want it to stay, > I would just like to remove myself as the maintainer. Done (with a REVISION bump). > Index: Makefile > === > RCS file: /cvs/ports/audio/opencore-amr/Makefile,v > retrieving revision 1.6 > diff -u -p -r1.6 Makefile > --- Makefile 16 Mar 2015 18:07:36 - 1.6 > +++ Makefile 5 Apr 2018 08:07:50 - > @@ -12,8 +12,6 @@ CATEGORIES= audio > > HOMEPAGE=http://opencore-amr.sourceforge.net/ > > -MAINTAINER= Jan Stary > - > # Apache 2.0 > PERMIT_PACKAGE_CDROM=http://www.voiceage.com/amr_licterms.php > PERMIT_PACKAGE_FTP= Yes > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
drop opencore-amr from SoX
OK, I'll try again.
> > On 2017/09/15 07:56, Jan Stary wrote:
> > > A new version of opencore-amr is out since January.
> > > Before I upgrade the port, shouldn't we rather drop it?
> > >
> > > Originaly, I added the opencore-amr port to have AMR in SoX,
> > > because AMR is what Android recorded by default in its voice recorder.
> > > That's no longer true ("normal quality" is m4a, "high quality" is wav),
> > > and I have no other use of the amr codec.
> > >
> > > Also, it is encumbered with patents.
> > >
> > > Does anyone need audio/opencore-amr?
The diff below removes opencore-amr from SoX.
Tested on current/amd64 and current/macppc.
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile22 Sep 2016 19:58:22 - 1.68
+++ Makefile17 Mar 2018 14:50:54 -
@@ -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
-# 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 \
drop opencore-amr from imagination
This accompanies the removal of AMR from SoX: multimedia/imagination pulls the WANTLIB through the SoX dependency. Tested on current/amd64. Jan Index: Makefile === RCS file: /cvs/ports/multimedia/imagination/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile23 Oct 2017 17:10:52 - 1.13 +++ Makefile17 Mar 2018 15:36:33 - @@ -2,7 +2,7 @@ COMMENT = lightweight and simple DVD slide show maker DISTNAME = imagination-3.0 -REVISION = 6 +REVISION = 7 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 WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile WANTLIB += wavpack xcb xcb-render xcb-shm z
drop opencore-amr from pjsua
Tested on current/amd64 and current/macppc.
Jan
Index: Makefile
===
RCS file: /cvs/ports/telephony/pjsua/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile5 Aug 2017 12:31:01 - 1.43
+++ Makefile17 Mar 2018 16:39:56 -
@@ -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 \
Re: drop opencore-amr from SoX
On Mar 17 16:15:36, s...@spacehopper.org wrote: > done sox/imagination. Thanks. > it might still be useful for pjsua though > so i'd be inclined to keep that. My real goal is to drop opencore-amr altogether, these are the individual steps to not use it. pjsua has no maintainer - do pjsua users have an opinion on this? I have never seen the AMR codec used in an actual pjsua conversation. Jan
