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

[devans at macports.org]

Revision: 50832
          http://trac.macports.org/changeset/50832
Author:   devans at macports.org
Date:     2009-05-10 13:39:43 -0700 (Sun, 10 May 2009)
Log Message:
-----------
ffmpeg-devel:

  * update to svn 18784 swscale 29288
  * restore +no_nonfree variant and messages as ffmpeg developers have
    reclassified libfaac as nonfree code.
    http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-April/068819.html

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

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-05-10 20:11:50 UTC (rev 50831)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-05-10 20:39:43 UTC (rev 50832)
@@ -4,10 +4,9 @@
 PortSystem 1.0
 
 name            ffmpeg-devel
-set svn_rev     18405
-set swscale_rev 29154
+set svn_rev     18784
+set swscale_rev 29288
 version         ${svn_rev}
-revision        1
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -98,6 +97,7 @@
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
+        --enable-nonfree \
         --enable-gpl \
         --enable-postproc \
         --enable-avfilter --enable-avfilter-lavf \
@@ -137,7 +137,7 @@
     configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
 }
 
-variant no_gpl description {disallow use of GPL code, license will be LGPL} {
+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
@@ -149,6 +149,12 @@
     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
+    configure.args-delete   --enable-libfaac
+    depends_lib-delete      port:faac
+}
+
 #
 # make speex a variant since it requires speex version 1.2
 # which is currently only available via port speex-devel
@@ -187,9 +193,28 @@
 }
 
 post-activate {
-    if {![variant_isset no_gpl]} {
+    if {![variant_isset no_nonfree]} {
         ui_msg "
 *******
+******* This build of ${name} includes nonfree code as follows:
+*******
+*******     libfaac
+*******
+******* 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]} {
+        ui_msg "
+*******
 ******* This build of ${name} includes GPLed code and
 ******* is therefore licensed under GPL.
 *******
@@ -201,13 +226,13 @@
 *******      libx264
 *******      libxvid
 *******
-******* To include only LGPLed code use variant +no_gpl
+******* To include only LGPLed code use variant +no_gpl +no_nonfree
 *******
 "
     } else {
         ui_msg "
 *******
-******* This build of ${name} includes no GPLed
+******* This build of ${name} includes no GPLed or nonfree
 ******* code and is therefore licensed under LGPL.
 *******
 "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090510/2ec7dac3/attachment.html>