[83708] trunk/dports/multimedia

devans at macports.org devans at macports.org
Fri Sep 9 10:23:40 PDT 2011


Revision: 83708
          http://trac.macports.org/changeset/83708
Author:   devans at macports.org
Date:     2011-09-09 10:23:37 -0700 (Fri, 09 Sep 2011)
Log Message:
-----------
ffmpeg, ffmpeg-devel: 
    * remove confusing default variant +no_nonfree
    * default build without any variants builds a distributable binary by disabling nonfree code
    * add a new +nonfree variant to enable nonfree code (libfaac support) if desired
    * update notes to reflect change
    * minor fix to x264 dependency
    * addresses issue raised in #31185

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2011-09-09 15:21:09 UTC (rev 83707)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2011-09-09 17:23:37 UTC (rev 83708)
@@ -10,7 +10,7 @@
 epoch           1
 version         0.7.4
 set branch      [join [lrange [split ${version} .] 0 1] .]
-license         nonfree GPL-2+ LGPL-2.1+
+license         GPL-2+ LGPL-2.1+
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -64,7 +64,6 @@
                 port:libtheora \
                 port:dirac \
                 port:schroedinger \
-                port:faac \
                 path:lib/libspeex.dylib:speex \
                 port:XviD \
                 port:x264 \
@@ -103,7 +102,6 @@
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
-        --enable-nonfree \
         --enable-gpl \
         --enable-postproc \
         --enable-swscale --enable-avfilter \
@@ -111,7 +109,6 @@
         --enable-libvorbis \
         --enable-libtheora \
         --enable-libdirac --enable-libschroedinger \
-        --enable-libfaac \
         --enable-libxvid \
         --enable-libx264 \
         --enable-libvpx \
@@ -170,27 +167,26 @@
     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 conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
     configure.args-delete   --enable-gpl \
                             --enable-postproc \
                             --enable-libx264 \
                             --enable-libxvid
-    depends_lib-delete      port:XviD
-    depends_build-delete    port:x264
+    depends_lib-delete      port:XviD \
+                            port:x264
     license-delete          GPL-2+
 }
 
-variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
-    configure.args-delete   --enable-nonfree \
+# the build server uses the default variants, and we want distributable binaries
+# nonfree code is disabled by default but can be enabled using the +nonfree variant
+
+variant nonfree conflicts no_gpl description {enable nonfree code, libraries and binaries will not be redistributable} {
+    configure.args-append   --enable-nonfree \
                             --enable-libfaac
-    depends_lib-delete      port:faac
-    license-delete          nonfree
+    depends_lib-append      port:faac
+    license-append          nonfree
 }
 
-# the build server uses the default variants, and we want distributable binaries
-
-default_variants    +no_nonfree
-
 #
 # jack indev support is currently broken
 # since Darwin doesn't support memory based POSIX semaphores
@@ -202,7 +198,7 @@
     depends_lib-append port:jack
 }
 
-if {![variant_isset no_nonfree]} {
+if {[variant_isset nonfree]} {
 notes "
 *******
 ******* This build of ${name} includes nonfree code as follows:
@@ -218,7 +214,7 @@
 *******     libavformat
 *******     libavutil
 *******
-******* To remove this restriction use variant +no_nonfree
+******* To remove this restriction remove the variant +nonfree
 *******
 "
 } elseif {![variant_isset no_gpl]} {
@@ -233,7 +229,8 @@
 *******      libx264
 *******      libxvid
 *******
-******* To include only LGPLed code use variant +no_gpl +no_nonfree
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree
+******* To remove nonfree and GPLed code leaving only LGPL code use variant +no_gpl
 *******
 "
 } else {

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2011-09-09 15:21:09 UTC (rev 83707)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2011-09-09 17:23:37 UTC (rev 83708)
@@ -8,7 +8,7 @@
 name            ffmpeg-devel
 conflicts       ffmpeg
 version         20110903
-license         nonfree GPL-2+ LGPL-2.1+
+license         GPL-2+ LGPL-2.1+
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -60,7 +60,6 @@
                 port:libtheora \
                 port:dirac \
                 port:schroedinger \
-                port:faac \
                 path:lib/libspeex.dylib:speex \
                 port:XviD \
                 port:x264 \
@@ -99,7 +98,6 @@
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
-        --enable-nonfree \
         --enable-gpl \
         --enable-postproc \
         --enable-swscale --enable-avfilter \
@@ -107,7 +105,6 @@
         --enable-libvorbis \
         --enable-libtheora \
         --enable-libdirac --enable-libschroedinger \
-        --enable-libfaac \
         --enable-libxvid \
         --enable-libx264 \
         --enable-libvpx \
@@ -166,27 +163,26 @@
     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 conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
     configure.args-delete   --enable-gpl \
                             --enable-postproc \
                             --enable-libx264 \
                             --enable-libxvid
-    depends_lib-delete      port:XviD
-    depends_build-delete    port:x264
+    depends_lib-delete      port:XviD \
+                            port:x264
     license-delete          GPL-2+
 }
 
-variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
-    configure.args-delete   --enable-nonfree \
+# the build server uses the default variants, and we want distributable binaries
+# nonfree code is disabled by default but can be enabled using the +nonfree variant
+
+variant nonfree conflicts no_gpl description {enable nonfree code, libraries and binaries will not be redistributable} {
+    configure.args-append   --enable-nonfree \
                             --enable-libfaac
-    depends_lib-delete      port:faac
-    license-delete          nonfree
+    depends_lib-append      port:faac
+    license-append          nonfree
 }
 
-# the build server uses the default variants, and we want distributable binaries
-
-default_variants    +no_nonfree
-
 #
 # jack indev support is currently broken
 # since Darwin doesn't support memory based POSIX semaphores
@@ -198,7 +194,7 @@
     depends_lib-append port:jack
 }
 
-if {![variant_isset no_nonfree]} {
+if {[variant_isset nonfree]} {
 notes "
 *******
 ******* This build of ${name} includes nonfree code as follows:
@@ -214,7 +210,7 @@
 *******     libavformat
 *******     libavutil
 *******
-******* To remove this restriction use variant +no_nonfree
+******* To remove this restriction remove the variant +nonfree
 *******
 "
 } elseif {![variant_isset no_gpl]} {
@@ -229,7 +225,8 @@
 *******      libx264
 *******      libxvid
 *******
-******* To include only LGPLed code use variant +no_gpl +no_nonfree
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree
+******* To remove nonfree and GPLed code leaving only LGPL code use variant +no_gpl
 *******
 "
 } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110909/ee51f7a3/attachment-0001.html>


More information about the macports-changes mailing list