[96153] trunk/dports/multimedia

[jeremyhu at macports.org]

Revision: 96153
          https://trac.macports.org/changeset/96153
Author:   jeremyhu at macports.org
Date:     2012-08-01 20:55:28 -0700 (Wed, 01 Aug 2012)
Log Message:
-----------
ffmpeg*: +gpl2 by default (#35473)

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2012-08-02 03:45:57 UTC (rev 96152)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2012-08-02 03:55:28 UTC (rev 96153)
@@ -92,6 +92,10 @@
     }
 }
 
+# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
+# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
+default_variants-append +gpl2
+
 # Under some conditions, llvm-gcc-4.2 drops some "unused" code even though it is used.
 # This is fixed in llvm-gcc trunk, but not in Apple's shipped llvm-gccs.
 if {${configure.compiler} == "llvm-gcc-4.2"} {

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2012-08-02 03:45:57 UTC (rev 96152)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2012-08-02 03:55:28 UTC (rev 96153)
@@ -97,6 +97,10 @@
     }
 } 
 
+# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
+# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
+default_variants-append +gpl2
+
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
         --enable-swscale --enable-avfilter \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120801/017b8604/attachment-0001.html>