Revision: 70257 http://trac.macports.org/changeset/70257 Author: devans@macports.org Date: 2010-08-03 16:31:38 -0700 (Tue, 03 Aug 2010) Log Message: ----------- ffmpeg-devel: update to svn 24678 swscale 31879, remove outdated/redundant configuration items, dependencies. Modified Paths: -------------- trunk/dports/multimedia/ffmpeg-devel/Portfile trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/Portfile 2010-08-03 21:40:24 UTC (rev 70256) +++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2010-08-03 23:31:38 UTC (rev 70257) @@ -6,10 +6,9 @@ name ffmpeg-devel conflicts ffmpeg -set svn_rev 23429 -set swscale_rev 31301 +set svn_rev 24678 +set swscale_rev 31879 version ${svn_rev} -revision 1 license nonfree GPLv2.1+ LGPLv2.1+ categories multimedia maintainers devans openmaintainer @@ -65,7 +64,6 @@ port:dirac \ port:schroedinger \ port:faac \ - port:faad2 \ path:lib/libspeex.dylib:speex \ port:XviD \ port:x264 \ @@ -111,18 +109,16 @@ --enable-nonfree \ --enable-gpl \ --enable-postproc \ - --enable-swscale --enable-avfilter --enable-avfilter-lavf \ + --enable-swscale --enable-avfilter \ --enable-libmp3lame \ --enable-libvorbis \ --enable-libtheora \ --enable-libdirac --enable-libschroedinger \ --enable-libfaac \ - --enable-libfaad \ --enable-libxvid \ --enable-libx264 \ --enable-libvpx \ --enable-libspeex \ - --enable-nonfree \ --mandir=${prefix}/share/man \ --enable-shared --enable-pthreads \ --disable-indevs \ @@ -176,8 +172,6 @@ variant no_gpl description {disallow use of GPL code, license will be LGPL if +no_nonfree is selected} { configure.args-delete --enable-gpl configure.args-delete --enable-postproc - configure.args-delete --enable-libfaad - depends_lib-delete port:faad2 configure.args-delete --enable-libx264 depends_build-delete port:x264 configure.args-delete --enable-libxvid @@ -230,7 +224,6 @@ ******* The following modules are GPLed: ******* ******* postproc -******* libfaad ******* libx264 ******* libxvid ******* Modified: trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff 2010-08-03 21:40:24 UTC (rev 70256) +++ trunk/dports/multimedia/ffmpeg-devel/files/patch-Makefile.diff 2010-08-03 23:31:38 UTC (rev 70257) @@ -1,6 +1,6 @@ ---- Makefile.orig 2010-04-19 15:05:26.000000000 +0200 -+++ Makefile 2010-07-31 23:15:14.000000000 +0200 -@@ -107,7 +107,7 @@ +--- Makefile.orig 2010-08-03 02:31:29.000000000 -0700 ++++ Makefile 2010-08-03 02:49:32.000000000 -0700 +@@ -121,7 +121,7 @@ doc/%.html: TAG = HTML doc/%.html: doc/%.texi