[35073] trunk/dports/multimedia/ffmpeg

[reiffert at macports.org]

Revision: 35073
          http://trac.macosforge.org/projects/macports/changeset/35073
Author:   reiffert at macports.org
Date:     2008-03-16 07:42:39 -0700 (Sun, 16 Mar 2008)

Log Message:
-----------
Update ffmpeg to svn.tag 12276. Fixes #14492 (destroot stageing error)
#12193 (--enable-gpl)
#13984 (Build problems on Leopard)
#14234 (Adds variant avfilter together with vhook)
#14524 (configure error when building universal variant)

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2008-03-16 14:20:45 UTC (rev 35072)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2008-03-16 14:42:39 UTC (rev 35073)
@@ -33,10 +33,10 @@
 			libavformat is a library containing parsers and \
 			generators for all common audio/video formats.
 homepage        http://ffmpeg.sourceforge.net/
-
+master_sites	{}
 fetch.type     svn
 svn.url        svn://svn.mplayerhq.hu/ffmpeg/trunk
-svn.tag        11532
+svn.tag        12276
 worksrcdir     trunk
 depends_build  bin:svn:subversion
 
@@ -45,7 +45,11 @@
 configure.args	--prefix=${prefix} --disable-vhook \
 		--mandir=${prefix}/share/man \
 		--enable-shared --enable-pthreads
-
+pre-configure {
+	if {[variant_isset universal]} {
+		configure.args-delete --disable-dependency-tracking --enable-faad
+	}
+}
 post-destroot {
 	file mkdir ${destroot}${prefix}/share/doc/${name}
 	file copy ${worksrcpath}/doc/TODO ${destroot}${prefix}/share/doc/${name}
@@ -54,58 +58,64 @@
 	}
 }
 
-platform darwin 9 {
+platform darwin i386 {
 	# Fix Leopard problems by disabling assembly for now; see #13019.
 	configure.args-append --disable-mmx
 }
 
-variant gpl {
+variant gpl description {allow use of GPL code, the resulting libav* and ffmpeg will be under GPL} {
 	configure.args-append --enable-gpl
 }
 
-variant postproc requires gpl {
+variant postproc requires gpl description {enable GPLed postprocessing support} {
 	configure.args-append --enable-pp
 }
 
 # Adds MP3 support
-variant lame {
+variant lame description {enable MP3 encoding via libmp3lame} {
 	depends_lib-append port:lame
 	configure.args-append --enable-libmp3lame
 }
 
-variant extvorbis {
+variant extvorbis description {enable Vorbis encoding via libvorbis, native implementation exists} {
 	depends_lib-append port:libvorbis port:libogg
 	configure.args-append --enable-libvorbis
 }
 
-variant theora {
+variant theora description {enable Theora encoding via libtheora} {
 	depends_lib-append port:libtheora port:libogg
 	configure.args-append --enable-libtheora
 }
 
-variant faac requires gpl {
+variant faac requires gpl description {enable FAAC support via libfaac} {
 	depends_lib-append port:faac
 	configure.args-append --enable-libfaac
 }
 
-variant faad requires gpl {
+variant faad requires gpl description {enable FAAD support via libfaad} {
 	depends_lib-append port:faad2
 	configure.args-append --enable-libfaad
 }
 
-variant xvid requires gpl {
+variant xvid requires gpl description {enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists} {
 	depends_lib-append port:XviD
 	configure.args-append --enable-libxvid
 }
 
 # depends build until x264 port supports shared libraries
-variant x264 requires gpl {
+variant x264 requires gpl description {enable H.264 encoding via x264} {
 	depends_build-append port:x264
 	configure.args-append --enable-libx264
 }
 
-variant a52 {
+variant a52 description {enable GPLed liba52 support} {
 	depends_lib-append port:a52dec
 	configure.args-append --enable-liba52
 }
+variant avfilter description {video filter support (replaces vhook)} {
+	patchfiles-append patch-libswscale-Makefile.diff
+	configure.args-append --enable-swscaler --enable-avfilter
 
+	# keep vhook as long as avfilter isnt working fully
+	configure.args-delete --disable-vhook
+}

Added: trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libswscale-Makefile.diff	2008-03-16 14:42:39 UTC (rev 35073)
@@ -0,0 +1,9 @@
+--- libswscale/Makefile.orig	2008-03-16 15:10:09.000000000 +0100
++++ libswscale/Makefile	2008-03-16 15:10:34.000000000 +0100
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-
++EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+ NAME = swscale
+ FFLIBS = avutil
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080316/c1677458/attachment.html