[46742] trunk/dports/multimedia/ffmpeg-devel/Portfile

[devans at macports.org]

Revision: 46742
          http://trac.macports.org/changeset/46742
Author:   devans at macports.org
Date:     2009-02-11 13:12:27 -0800 (Wed, 11 Feb 2009)
Log Message:
-----------
ffmpeg-devel: update to svn 17132, swscale svn 28502, code frozen except for bug fixes for upcoming March release. Enable x264 support and add +speex variant which requires port speex-devel. Remove --enable--nonfree configure option and +no_nonfree variants as nonfree applies only to libamr-nb and libamr-wb which are not provided by MacPorts due to license/patent issues (#16074), default install is now licensed under GPL.

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-02-11 21:00:11 UTC (rev 46741)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-02-11 21:12:27 UTC (rev 46742)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            ffmpeg-devel
-set svn_rev     16844
-set swscale_rev 28362
+set svn_rev     17132
+set swscale_rev 28502
 version         ${svn_rev}
 categories      multimedia
 maintainers     devans openmaintainer
@@ -52,6 +52,7 @@
                 port:faac \
                 port:faad2 \
                 port:XviD \
+                port:x264 \
                 port:libsdl \
                 port:bzip2 \
                 port:zlib
@@ -87,7 +88,6 @@
 configure.args \
         --disable-vhook \
         --enable-gpl \
-        --enable-nonfree \
         --enable-postproc \
         --enable-swscale --enable-avfilter --enable-avfilter-lavf \
         --enable-libmp3lame \
@@ -97,12 +97,13 @@
         --enable-libfaac \
         --enable-libfaad \
         --enable-libxvid \
+        --enable-libx264 \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
         --disable-mmx \
         --cc=gcc-4.0
 
-#add --enable-libx264 to configure args when #18283 is committed
+#add --enable-libopenjpeg when problems with openjpeg.h are resolved
 
 test.run        yes
 
@@ -144,38 +145,40 @@
     configure.args-delete   --enable-swscale
     configure.args-delete   --enable-libfaad
     depends_lib-delete      port:faad2
-#
-# uncomment when x264 is updated to build 65 or better
-#
-#    configure.args-delete   --enable-libx264
-#    depends_build-delete      port:x264
+    configure.args-delete   --enable-libx264
+    depends_build-delete      port:x264
     configure.args-delete   --enable-libxvid
     depends_lib-delete      port:XviD
 }
 
-variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
-    configure.args-delete --enable-nonfree
+#
+# make speex a variant since it requires speex version 1.2
+# which is currently only available via port speex-devel
+# remove variant and make default when 1.2 is available in speex
+#
+
+variant speex description {enable Speex decoding via libspeex} {
+    configure.args-append   --enable-libspeex 
+    depends_lib-append      path:lib/libspeex.dylib:speex-devel
 }
 
-post-activate {
-    if {![variant_isset no_nonfree]} {
-        ui_msg "
+pre-configure {
+    if {[variant_isset speex]} {
+        if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {
+            error "
 *******
-******* This build of ${name} includes nonfree code.
+******* Variant speex requires port speex-devel but
+******* port speex is active.  Please deactivate port speex
+******* and install/activate port speex-devel then try
+******* again.
 *******
-******* The following libraries and binaries may not be redistributed:
-*******
-*******     ffmpeg
-*******     libavcodec
-*******     libavdevice
-*******     libavfilter
-*******     libavformat
-*******     libavutil
-*******
-******* To remove this restriction use variant +no_nonfree
-*******
 "
-    } elseif {![variant_isset no_gpl]} {
+        }
+    }
+}
+
+post-activate {
+    if {![variant_isset no_gpl]} {
         ui_msg "
 *******
 ******* This build of ${name} includes GPLed code and
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090211/e08ffd57/attachment-0001.html>