[96093] trunk/dports/multimedia
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jul 31 09:53:19 PDT 2012
Revision: 96093
https://trac.macports.org/changeset/96093
Author: jeremyhu at macports.org
Date: 2012-07-31 09:53:17 -0700 (Tue, 31 Jul 2012)
Log Message:
-----------
ffmpeg*: Eliminate no_ variants, add gpl3 variant for opencore-amr. Closes #33503.
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-07-31 15:49:58 UTC (rev 96092)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2012-07-31 16:53:17 UTC (rev 96093)
@@ -9,8 +9,9 @@
conflicts ffmpeg-devel
epoch 1
version 0.7.13
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
-license GPL-2+
+license LGPL-2.1+
categories multimedia
maintainers devans openmaintainer
@@ -66,8 +67,6 @@
port:schroedinger \
port:openjpeg \
path:lib/libspeex.dylib:speex \
- port:XviD \
- port:x264 \
port:libvpx \
path:lib/pkgconfig/sdl.pc:libsdl \
port:bzip2 \
@@ -109,16 +108,12 @@
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args \
- --enable-gpl \
- --enable-postproc \
--enable-swscale --enable-avfilter \
--enable-libmp3lame \
--enable-libvorbis \
--enable-libtheora \
--enable-libdirac --enable-libschroedinger \
--enable-libopenjpeg \
- --enable-libxvid \
- --enable-libx264 \
--enable-libvpx \
--enable-libspeex \
--disable-libopencore-amrnb \
@@ -181,25 +176,35 @@
configure.args-delete --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
}
-variant no_gpl conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
- configure.args-delete --enable-gpl \
+variant gpl2 description {Enable GPL code, license will be GPL-2+} {
+ configure.args-append --enable-gpl \
--enable-postproc \
--enable-libx264 \
--enable-libxvid
- depends_lib-delete port:XviD \
+ depends_lib-append port:XviD \
port:x264
- license-delete GPL-2+
- license-append LGPL-2.1+
+ license-delete LGPL-2.1+
+ license-append GPL-2+
}
+variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
+ configure.args-append --enable-version3 \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb
+ depends_lib-append port:opencore-amr
+ license-delete LGPL-2.1+
+ license-append GPL-3+
+}
+
+
# 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} {
+variant nonfree description {enable nonfree code, libraries and binaries will not be redistributable} {
configure.args-append --enable-nonfree \
--enable-libfaac
depends_lib-append port:faac
- license-delete GPL-2+
+ license-delete LGPL-2.1+
license-append Restrictive
}
@@ -222,10 +227,28 @@
******* To remove this restriction remove the variant +nonfree
*******
"
-} elseif {![variant_isset no_gpl]} {
+} elseif {[variant_isset gpl3]} {
notes "
*******
******* This build of ${name} includes GPLed code and
+******* is therefore licensed under GPL v3 or later.
+*******
+******* The following modules are GPLed:
+*******
+******* postproc
+******* libx264
+******* libxvid
+******* opencore-amr
+*******
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
+******* To remove nonfree and GPLed code leaving only LGPL code remove the
+******* +gpl2 and +gpl3 variants.
+*******
+"
+} elseif {[variant_isset gpl2]} {
+notes "
+*******
+******* This build of ${name} includes GPLed code and
******* is therefore licensed under GPL v2 or later.
*******
******* The following modules are GPLed:
@@ -234,8 +257,9 @@
******* libx264
******* libxvid
*******
-******* 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
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
+******* To remove nonfree and GPLed code leaving only LGPL code remove the
+******* +gpl2 variant.
*******
"
} else {
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-07-31 15:49:58 UTC (rev 96092)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-07-31 16:53:17 UTC (rev 96093)
@@ -8,8 +8,9 @@
name ffmpeg-devel
conflicts ffmpeg
version 20120718
+revision 1
set git_branch 56ae5926f739bd26a5aa4add98604b7cd3c2d6ca
-license GPL-2+
+license LGPL-2.1+
categories multimedia
maintainers devans jeremyhu openmaintainer
@@ -62,8 +63,6 @@
port:schroedinger \
port:openjpeg \
path:lib/libspeex.dylib:speex \
- port:XviD \
- port:x264 \
port:libvpx \
path:lib/pkgconfig/sdl.pc:libsdl \
port:bzip2 \
@@ -100,8 +99,6 @@
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
configure.args \
- --enable-gpl \
- --enable-postproc \
--enable-swscale --enable-avfilter \
--enable-libmp3lame \
--enable-libvorbis \
@@ -109,8 +106,6 @@
--enable-libschroedinger \
--enable-libopenjpeg \
--enable-libmodplug \
- --enable-libxvid \
- --enable-libx264 \
--enable-libvpx \
--enable-libspeex \
--disable-mmx \
@@ -177,25 +172,35 @@
configure.args-delete --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
}
-variant no_gpl conflicts nonfree description {disallow use of GPL code, license will be LGPL} {
- configure.args-delete --enable-gpl \
+variant gpl2 description {Enable GPL code, license will be GPL-2+} {
+ configure.args-append --enable-gpl \
--enable-postproc \
--enable-libx264 \
--enable-libxvid
- depends_lib-delete port:XviD \
+ depends_lib-append port:XviD \
port:x264
- license-delete GPL-2+
- license-append LGPL-2.1+
+ license-delete LGPL-2.1+
+ license-append GPL-2+
}
+variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
+ configure.args-append --enable-version3 \
+ --enable-libopencore-amrnb \
+ --enable-libopencore-amrwb
+ depends_lib-append port:opencore-amr
+ license-delete LGPL-2.1+
+ license-append GPL-3+
+}
+
+
# 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} {
+variant nonfree description {enable nonfree code, libraries and binaries will not be redistributable} {
configure.args-append --enable-nonfree \
--enable-libfaac
depends_lib-append port:faac
- license-delete GPL-2+
+ license-delete LGPL-2.1+
license-append Restrictive
}
@@ -218,10 +223,28 @@
******* To remove this restriction remove the variant +nonfree
*******
"
-} elseif {![variant_isset no_gpl]} {
+} elseif {[variant_isset gpl3]} {
notes "
*******
******* This build of ${name} includes GPLed code and
+******* is therefore licensed under GPL v3 or later.
+*******
+******* The following modules are GPLed:
+*******
+******* postproc
+******* libx264
+******* libxvid
+******* opencore-amr
+*******
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
+******* To remove nonfree and GPLed code leaving only LGPL code remove the
+******* +gpl2 and +gpl3 variants.
+*******
+"
+} elseif {[variant_isset gpl2]} {
+notes "
+*******
+******* This build of ${name} includes GPLed code and
******* is therefore licensed under GPL v2 or later.
*******
******* The following modules are GPLed:
@@ -230,8 +253,9 @@
******* libx264
******* libxvid
*******
-******* 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
+******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
+******* To remove nonfree and GPLed code leaving only LGPL code remove the
+******* +gpl2 variant.
*******
"
} else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120731/6544db62/attachment-0001.html>
More information about the macports-changes
mailing list