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/Makefile        22 Sep 2016 19:58:22 -0000      1.68
+++ sox/Makefile        20 Sep 2017 09:55:31 -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 <h...@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              \

Reply via email to