[46741] trunk/dports/multimedia/ffmpeg/Portfile

[devans at macports.org]

Revision: 46741
          http://trac.macports.org/changeset/46741
Author:   devans at macports.org
Date:     2009-02-11 13:00:11 -0800 (Wed, 11 Feb 2009)
Log Message:
-----------
ffmpeg: 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.  Disabling x264 support which is broken in this revision.

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2009-02-11 20:52:14 UTC (rev 46740)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2009-02-11 21:00:11 UTC (rev 46741)
@@ -5,7 +5,7 @@
 
 name		ffmpeg
 version		15261
-revision        3
+revision        4
 categories	multimedia
 maintainers	acho at macports.org openmaintainer
 description	Digital VCR and streaming server
@@ -44,14 +44,8 @@
 use_parallel_build  yes
 worksrcdir     trunk
 
-#
-# x264 is build dependency because it currently does not build a shared library
-# and links statically
-#
-
 depends_build   bin:svn:subversion \
-                port:gmake \
-                port:x264
+                port:gmake 
 
 depends_lib     port:lame \
                 port:libvorbis \
@@ -99,7 +93,6 @@
 configure.args \
                 --disable-vhook \
                 --enable-gpl \
-                --enable-nonfree \
                 --enable-swscale --enable-avfilter --enable-avfilter-lavf \
                 --enable-postproc \
                 --enable-libmp3lame \
@@ -108,7 +101,6 @@
                 --enable-libdirac --enable-libschroedinger \
                 --enable-libfaac \
                 --enable-libfaad \
-                --enable-libx264 \
                 --enable-libxvid \
                 --mandir=${prefix}/share/man \
                 --enable-shared --enable-pthreads \
@@ -156,43 +148,22 @@
 	}
 }
 
-variant no_gpl conflicts a52 description {disallow use of GPL code, license will be LGPL if +no_nonfree is selected} {
+variant no_gpl conflicts a52 description {disallow use of GPL code, license will be LGPL} {
     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
-    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
-}
-
 post-activate {
-    if {![variant_isset no_nonfree]} {
+    if {![variant_isset no_gpl]} {
         ui_msg "
 *******
-******* This build of ${name} includes nonfree code.
-*******
-******* 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.
 *******
@@ -205,13 +176,13 @@
 *******      libx264
 *******      libxvid
 *******
-******* To include only LGPLed code use variants +no_nonfree +no_gpl -a52
+******* To include only LGPLed code use variants +no_gpl -a52
 *******
 "
     } else {
         ui_msg "
 *******
-******* This build of ${name} includes no GPLed or nonfree
+******* This build of ${name} includes no GPLed 
 ******* code and is therefore licensed under LGPL.
 *******
 "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090211/bdb9f686/attachment.html>