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

[devans at macports.org]

Revision: 70085
          http://trac.macports.org/changeset/70085
Author:   devans at macports.org
Date:     2010-07-29 09:19:21 -0700 (Thu, 29 Jul 2010)
Log Message:
-----------
ffmpeg-devel: update to svn 23429 swscale 31301
    * add license information
    * add speex support by default
    * update variants to reflect current licensing

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2010-07-29 16:19:19 UTC (rev 70084)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2010-07-29 16:19:21 UTC (rev 70085)
@@ -6,9 +6,10 @@
 
 name            ffmpeg-devel
 conflicts       ffmpeg
-set svn_rev     22866
-set swscale_rev 31034
+set svn_rev     23429
+set swscale_rev 31301
 version         ${svn_rev}
+license         nonfree GPLv2.1+ LGPLv2.1+
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -23,8 +24,7 @@
                 libavcodec version 52. This development release reflects those \
                 changes and may break applications coded to libavcodec version 51. \
                 \
-                For the last valid revision for libavcodec version 51 (r15261) \
-                please use port ffmpeg.
+                For the current stable version of ffmpeg please use port ffmpeg.
 
 homepage        http://www.ffmpeg.org/
 master_sites
@@ -41,6 +41,7 @@
                 port:libvorbis \
                 port:libogg \
                 port:libtheora \
+                port:speex \
                 port:dirac \
                 port:schroedinger \
                 port:faac \
@@ -97,6 +98,7 @@
         --enable-libfaad \
         --enable-libxvid \
         --enable-libx264 \
+        --enable-libspeex \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
         --disable-indevs \
@@ -128,9 +130,8 @@
 platform darwin 10 {
     # ticket #20938 -- disable for 32 bit intel only
     if { $build_arch == "i386" } {
-        if { ![variant_isset no_gpl] } {
-            configure.args-delete --enable-swscale
-        }
+        configure.args-delete --enable-swscale
+
         if { ![variant_isset no_mmx] } {
             configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
         }
@@ -144,7 +145,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-swscale
     configure.args-delete   --enable-libfaad
     depends_lib-delete      port:faad2
     configure.args-delete   --enable-libx264
@@ -160,32 +160,6 @@
 }
 
 #
-# 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
-}
-
-pre-configure {
-    if {[variant_isset speex]} {
-        if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {
-            error "
-*******
-******* Variant speex requires port speex-devel but
-******* port speex is active.  Please deactivate port speex
-******* and install/activate port speex-devel then try
-******* again.
-*******
-"
-        }
-    }
-}
-
-#
 # jack indev support is currently broken
 # since Darwin doesn't support memory based POSIX semaphores
 # only named ones
@@ -220,12 +194,11 @@
         ui_msg "
 *******
 ******* This build of ${name} includes GPLed code and
-******* is therefore licensed under GPL.
+******* is therefore licensed under GPL 2.1 or later.
 *******
 ******* The following modules are GPLed:
 *******
 *******      postproc
-*******      swscale
 *******      libfaad
 *******      libx264
 *******      libxvid
@@ -237,7 +210,7 @@
         ui_msg "
 *******
 ******* This build of ${name} includes no GPLed or nonfree
-******* code and is therefore licensed under LGPL.
+******* code and is therefore licensed under LGPL 2.1 or later.
 *******
 "
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100729/a11bcf01/attachment-0001.html>