[46115] trunk/dports/multimedia
devans at macports.org
devans at macports.org
Thu Jan 29 14:21:59 PST 2009
Revision: 46115
http://trac.macports.org/changeset/46115
Author: devans at macports.org
Date: 2009-01-29 14:21:58 -0800 (Thu, 29 Jan 2009)
Log Message:
-----------
ffmpeg, ffmpeg-devel: build all modules (GPL, LGPL and nonfree) as the default, remove extraneous variants and replace with new variants no_gpl and no_nonfree. Add user message during post-activate explaining the license implications of the chosen variants. See http://lists.macosforge.org/pipermail/macports-dev/2009-January/007102.html, #126, #18256.
Modified Paths:
--------------
trunk/dports/multimedia/XviD/Portfile
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
trunk/dports/multimedia/x264/Portfile
Modified: trunk/dports/multimedia/XviD/Portfile
===================================================================
--- trunk/dports/multimedia/XviD/Portfile 2009-01-29 22:15:56 UTC (rev 46114)
+++ trunk/dports/multimedia/XviD/Portfile 2009-01-29 22:21:58 UTC (rev 46115)
@@ -3,8 +3,7 @@
PortSystem 1.0
name XviD
-version 1.1.3
-revision 1
+version 1.2.0
categories multimedia devel
platforms darwin sunos
maintainers nox
@@ -23,9 +22,9 @@
distname xvidcore-${version}
use_bzip2 yes
-checksums md5 29c60d4d991ac18f687a8fd13cfe64b7 \
- sha1 7a945c245851e115bc107aa621f72d775a5d1adb \
- rmd160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8
+checksums md5 07c31ebf7d4e7aa6fcd17e8e4a0d1aca \
+ sha1 f7f2dbaf7affadf647d2cee46a767c108750fa99 \
+ rmd160 05f7b72aa34ea3b3a3a3dba9caa9ed65e947ea2a
worksrcdir ${distname}/build/generic
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2009-01-29 22:15:56 UTC (rev 46114)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2009-01-29 22:21:58 UTC (rev 46115)
@@ -5,7 +5,7 @@
name ffmpeg
version 15261
-revision 1
+revision 2
categories multimedia
maintainers acho at macports.org openmaintainer
description Digital VCR and streaming server
@@ -43,9 +43,19 @@
use_parallel_build yes
worksrcdir trunk
-depends_build bin:svn:subversion port:gmake
-depends_lib port:libsdl \
+depends_build bin:svn:subversion \
+ port:gmake \
+ port:x264
+
+depends_lib port:lame \
+ port:libvorbis \
+ port:libogg \
+ port:libtheora \
+ port:faac \
+ port:faad2 \
+ port:XviD \
+ port:libsdl \
port:bzip2 \
port:zlib
@@ -77,15 +87,27 @@
}
platforms darwin
+
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args --disable-vhook \
+ --enable-gpl \
+ --enable-nonfree \
+ --enable-swscale --enable-avfilter --enable-avfilter-lavf \
+ --enable-postproc \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libtheora \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libx264 \
+ --enable-libxvid \
--mandir=${prefix}/share/man \
--enable-shared --enable-pthreads \
--disable-mmx --cc=gcc-4.0
test.run yes
-default_variants +a52
+default_variants +a52
# configure isn't autoconf and they do use a dep cache
universal_variant no
@@ -111,52 +133,7 @@
configure.args-append --disable-decoder=cavs
}
-variant gpl description {allow use of GPL code, the resulting libav* and ffmpeg will be under GPL} {
- configure.args-append --enable-gpl
-}
-
-variant postproc requires gpl description {enable GPLed postprocessing support} {
- configure.args-append --enable-postproc
-}
-
-# Adds MP3 support
-variant lame description {enable MP3 encoding via libmp3lame} {
- depends_lib-append port:lame
- configure.args-append --enable-libmp3lame
-}
-
-variant extvorbis description {enable Vorbis encoding via libvorbis, native implementation exists} {
- depends_lib-append port:libvorbis port:libogg
- configure.args-append --enable-libvorbis
-}
-
-variant theora description {enable Theora encoding via libtheora} {
- depends_lib-append port:libtheora port:libogg
- configure.args-append --enable-libtheora
-}
-
-variant faac requires gpl description {enable FAAC support via libfaac} {
- depends_lib-append port:faac
- configure.args-append --enable-libfaac
-}
-
-variant faad requires gpl description {enable FAAD support via libfaad} {
- depends_lib-append port:faad2
- configure.args-append --enable-libfaad
-}
-
-variant xvid requires gpl description {enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists} {
- depends_lib-append port:XviD
- configure.args-append --enable-libxvid
-}
-
-# depends build until x264 port supports shared libraries
-variant x264 requires gpl description {enable H.264 encoding via x264} {
- depends_build-append port:x264
- configure.args-append --enable-libx264
-}
-
-variant a52 requires gpl description {enable GPLed liba52 support} {
+variant a52 description {enable GPLed liba52 support} {
depends_lib-append port:a52dec
configure.args-append --enable-liba52
post-destroot {
@@ -169,12 +146,70 @@
}
}
-variant avfilter requires gpl description {video filter support (replaces vhook)} {
- configure.args-append --enable-swscale --enable-avfilter
+variant no_gpl conflicts a52 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
+ depends_build-delete port:x264
+ configure.args-delete --enable-libxvid
+ depends_lib-delete port:XviD
+}
- # keep vhook as long as avfilter isnt working fully
- configure.args-delete --disable-vhook
+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]} {
+ 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.
+*******
+******* The following modules are GPLed:
+*******
+******* postproc
+******* swscale
+******* liba52
+******* libfaad
+******* libx264
+******* libxvid
+*******
+******* To include only LGPLed code use variants +no_nonfree +no_gpl -a52
+*******
+"
+ } else {
+ ui_msg "
+*******
+******* This build of ${name} includes no GPLed or nonfree
+******* code and is therefore licensed under LGPL.
+*******
+"
+ }
+}
+
+#
#disable livecheck
+#
+
livecheck.check none
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2009-01-29 22:15:56 UTC (rev 46114)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2009-01-29 22:21:58 UTC (rev 46115)
@@ -5,6 +5,7 @@
name ffmpeg-devel
version 15943
+revision 1
categories multimedia
maintainers devans openmaintainer
@@ -29,11 +30,22 @@
patch-libswscale-Makefile.diff \
patch-libswscale-swscale.h.diff
-use_parallel_build yes
worksrcdir trunk
-depends_build bin:svn:subversion port:gmake
-depends_lib port:libsdl \
+use_parallel_build yes
+
+depends_build bin:svn:subversion \
+ port:gmake \
+ port:x264
+
+depends_lib port:lame \
+ port:libvorbis \
+ port:libogg \
+ port:libtheora \
+ port:faac \
+ port:faad2 \
+ port:XviD \
+ port:libsdl \
port:bzip2 \
port:zlib
@@ -69,11 +81,24 @@
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args \
--disable-vhook \
+ --enable-gpl \
+ --enable-nonfree \
+ --enable-swscale --enable-avfilter --enable-avfilter-lavf \
+ --enable-postproc \
+ --enable-libmp3lame \
+ --enable-libvorbis \
+ --enable-libtheora \
+ --enable-libfaac \
+ --enable-libfaad \
+ --enable-libx264 \
+ --enable-libxvid \
--mandir=${prefix}/share/man \
--enable-shared --enable-pthreads \
--disable-mmx \
--cc=gcc-4.0
+#add --enable-libx264 to configure args #18283 is committed
+
test.run yes
#
@@ -103,68 +128,72 @@
variant mmx description {enable mmx optimizations ; may not build in gcc-4.2 or xcode 3.0 gcc-4.0} {
# make no-mmx default and allow mmx enabling for the brave.
- configure.args-delete --disable-mmx
+ configure.args-delete --disable-mmx
# Fix Leopard problems by disabling the cavs decoder for now (is this still required?)
configure.args-append --disable-decoder=cavs
}
-variant gpl description {allow use of GPL code, the resulting libav* and ffmpeg will be under GPL} {
- configure.args-append --enable-gpl
+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
+ depends_build-delete port:x264
+ configure.args-delete --enable-libxvid
+ depends_lib-delete port:XviD
}
-variant nonfree description {allow use of nonfree code, the resulting libs and binaries will be unredistributable} {
- configure.args-append --enable-nonfree
+variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
+ configure.args-delete --enable-nonfree
}
-variant postproc requires gpl description {enable GPLed postprocessing support} {
- configure.args-append --enable-postproc
+post-activate {
+ if {![variant_isset no_nonfree]} {
+ 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.
+*******
+******* The following modules are GPLed:
+*******
+******* postproc
+******* swscale
+******* libfaad
+******* libx264
+******* libxvid
+*******
+******* To include only LGPLed code use variants +no_nonfree +no_gpl
+*******
+"
+ } else {
+ ui_msg "
+*******
+******* This build of ${name} includes no GPLed or nonfree
+******* code and is therefore licensed under LGPL.
+*******
+"
+ }
}
-
-variant faac requires gpl description {enable FAAC support via libfaac} {
- depends_lib-append port:faac
- configure.args-append --enable-libfaac
-}
-
-variant faad requires gpl description {enable FAAD support via libfaad} {
- depends_lib-append port:faad2
- configure.args-append --enable-libfaad
-}
-
-variant lame description {enable MP3 encoding via libmp3lame} {
- depends_lib-append port:lame
- configure.args-append --enable-libmp3lame
-}
-
-variant theora description {enable Theora encoding via libtheora} {
- depends_lib-append port:libtheora port:libogg
- configure.args-append --enable-libtheora
-}
-
-variant extvorbis description {enable Vorbis encoding via libvorbis, native implementation exists} {
- depends_lib-append port:libvorbis port:libogg
- configure.args-append --enable-libvorbis
-}
-
#
-# depends build until x264 port supports shared libraries
-# disabled for now needs x264 > 0.6.5
-#
-
-#variant x264 requires gpl description {enable H.264 encoding via x264} {
-# depends_build-append port:x264
-# configure.args-append --enable-libx264
-#}
-
-variant xvid requires gpl description {enable Xvid encoding via xvidcore, native MPEG-4/Xvid encoder exists} {
- depends_lib-append port:XviD
- configure.args-append --enable-libxvid
-}
-
-variant avfilter requires gpl description {video filter support (replaces vhook)} {
- configure.args-append --enable-swscale --enable-avfilter --enable-avfilter-lavf
-}
-
-#
#disable livecheck
#
Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile 2009-01-29 22:15:56 UTC (rev 46114)
+++ trunk/dports/multimedia/x264/Portfile 2009-01-29 22:21:58 UTC (rev 46115)
@@ -3,8 +3,7 @@
PortSystem 1.0
name x264
-version 20080724
-revision 1
+version 20090126
categories multimedia
platforms darwin
maintainers acho at macports.org
@@ -17,7 +16,7 @@
homepage http://www.videolan.org/x264.html
master_sites ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
distname ${name}-snapshot-${version}-2245
-checksums sha1 8f3023d82d06b34a609e8c67ace8328e6c01aacb
+checksums sha1 5de7aa1739a9bbfcf5beaab806397be3eaf38bc8
use_bzip2 yes
depends_build bin:svn:subversion port:yasm
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090129/811a553f/attachment-0001.html>
More information about the macports-changes
mailing list