On Wed, 09 Jun 2010, Jacob Meuser wrote:
> please update the license marker as well if you're going to do this.
Updated diff following. I don't understand why ffmpeg needs gplv3
since opencore-amr has an Apache 2.0 license..
Index: graphics/ffmpeg/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- graphics/ffmpeg/Makefile 26 May 2010 21:38:52 -0000 1.52
+++ graphics/ffmpeg/Makefile 9 Jun 2010 16:13:40 -0000
@@ -4,7 +4,7 @@ COMMENT= audio/video converter and strea
V= 20100512
DISTNAME= ffmpeg-svn-${V}
-PKGNAME= ffmpeg-${V}
+PKGNAME= ffmpeg-${V}p0
CATEGORIES= graphics multimedia
MASTER_SITES= http://comstyle.com/source/
@@ -20,7 +20,7 @@ HOMEPAGE= http://ffmpeg.mplayerhq.hu/
MAINTAINER= Brad Smith <[email protected]>
-# LGPLv2.1 / GPLv2
+# LGPLv2.1 / GPLv3
PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -37,12 +37,13 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
speex::audio/speex \
gsm::audio/gsm \
x264.>=4::multimedia/x264 \
+ opencore-amrnb,opencore-amrwb::audio/opencore-amr \
theora,theoradec,theoraenc::multimedia/libtheora \
schroedinger-1.0::multimedia/schroedinger \
bz2.>=10::archivers/bzip2
# inter-library dependencies for the current configuration
-LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lgsm -lm -lmp3lame
-logg -loil-0.3 -lschroedinger-1.0 -lspeex -ltheora -lvorbis -lvorbisenc -lx264
-lz -pthread -Wl,-rpath,${LOCALBASE}/lib
+LIBavcodec_EXTRALIBS=-L${LOCALBASE}/lib -lfaac -lfaad -lgsm -lm -lmp3lame
-logg -loil-0.3 -lopencore-amrnb -lopencore-amrwb -lschroedinger-1.0 -lspeex
-ltheora -lvorbis -lvorbisenc -lx264 -lz -pthread -Wl,-rpath,${LOCALBASE}/lib
LIBavdevice_EXTRALIBS=-L${X11BASE}/lib -lX11 -lXext -lXfixes -lm -lsndio
-Wl,-rpath,${LOCALBASE}/lib -Wl,-rpath,${X11BASE}/lib
LIBavfilter_EXTRALIBS=-lm
LIBavformat_EXTRALIBS=-L${LOCALBASE}/lib -lbz2 -lm -Wl,-rpath,${LOCALBASE}/lib
@@ -71,10 +72,13 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-optimizations \
--disable-outdev=oss \
--enable-gpl \
+ --enable-version3 \
--enable-libfaac \
--enable-libfaad \
--enable-libgsm \
--enable-libmp3lame \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb \
--enable-libschroedinger \
--enable-libspeex \
--enable-libtheora \
Index: x11/mplayer/Makefile
===================================================================
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- x11/mplayer/Makefile 26 May 2010 21:29:56 -0000 1.165
+++ x11/mplayer/Makefile 9 Jun 2010 16:14:50 -0000
@@ -12,7 +12,7 @@ SUBST_VARS+= PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
-PKGNAME= ${N}-${V}
+PKGNAME= ${N}-${V}p0
CATEGORIES= x11 multimedia
EXTRACT_SUFX= .tar.bz2
@@ -64,7 +64,8 @@ LIB_DEPENDS= png::graphics/png \
faac::audio/faad \
faad::audio/faac \
a52::audio/liba52 \
- x264.>=3::multimedia/x264
+ x264.>=3::multimedia/x264 \
+ opencore-amrnb,opencore-amrwb::audio/opencore-amr
BUILD_DEPENDS= ::net/livemedia \
:rtunes->=0.8:audio/rtunes \
