Add gpl & postproc useflags so that ffmpeg can be built in LGPL mode.

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0daf60a53d8a8092895dec7fed954aacf94449d1..4ebe18f9ef9f917b8269fc9e944bf536672b1592 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.829 2015/02/18 09:58:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.830 2015/02/18 10:36:21 aballier Exp $
+
+  18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  Add gpl & postproc useflags so that ffmpeg can be built in LGPL mode.
 
   18 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add required use for x86 cpu flags

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 55ded8e44b2c3956fb85e951e4a29d1c5da122d9..fb7088542df8168deab45f10d5798ed560c0c111 100644 (file)
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -22,14 +22,14 @@ EBUILD ffmpeg-1.2.6-r1.ebuild 11090 SHA256 04e0bd9aac8037358acbcbdfde2f50ec13a3d
 EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab93a7066bf10145b2e0aaf247a SHA512 2b421d0c856c6fcefc5b5be0ec68cc3ea32fb3d85ec1582d047a8a027bd71d903ca689f419e97e42002f8516f97b0c036212a8de18b7cf0c83884a3a2ccbf603 WHIRLPOOL edc9c1f64789606ab09c0e59bcae412568317704c2eb60e60be38eec5f011cb3bbb69849237e5979bc2fd6e30e8646feb76cafde3f0a8daf0ebe8c8c4bd06e97
 EBUILD ffmpeg-2.5.3.ebuild 13170 SHA256 2a15f3059c17573de22426f05d4ac92816f74b58609c015bbe048713bc554a3c SHA512 e2942192a9fc9d9f56f7ee67140b68443fce54897b2a9803953d0754d186a4c743151a9dc6fca2dc829e471061caa6ecd56636e5a104399a327b054e983eef1e WHIRLPOOL b04fcb70986854c6f96c4cef296d207f49a8019c88ab5186db9ea25604c109acc0b3e565adc81a15eac7a0e9c840b15c53fca15709f0ca9991af1b20f379f22e
 EBUILD ffmpeg-2.5.4.ebuild 13172 SHA256 5d21a09da72c7105ca378a41866da07d6d16e0a31b18820c5fb64cec090839a2 SHA512 8e666d2b6c60d5c00c2756b40884212ab4956ef2eb58c52066c4e896abf63d7353ed7002b3bc12319cc1df99fb32011253b80b94209fad05eb613148b68e559d WHIRLPOOL 72bf0020aec52fd1fea88f11505845a6916f8708fbd647782c4df22df4b9d9be9dae40c0b83023aa1f8a17290a4e795d47fe7de0e78d159a48e3fda5fcee3953
-EBUILD ffmpeg-9999.ebuild 13902 SHA256 a2f16933ffe58fd882396afc3a1fc6c790d7198695917adf703070569d875563 SHA512 3cf592d011209264ff93d48d75559fbc8177f0ebb039c57fc1ed46ad2e4b7625a0271e334f05bb4662cfe6cc7b7e53f405f575eaaceedc1e5fd0e6dc933417e0 WHIRLPOOL 06ba74aee25317c262feb26d6365f90787813103ce172957875a276831d19e0275bb259b840bf56fa38dfd0d6a3d1bb309f83ad282ed1e7b8867b07a1a8693a3
-MISC ChangeLog 1748 SHA256 2562e39a4c8c253404286ecb42f68bba83b69746fc0c4cc99bda9b4052b85f26 SHA512 252157912de8e9b734eb6534247d0d98f69ccdba619f68570e8be466beca7b68adcfc9ceab1492bad12cfe0356782f0c4ae17475d0cb8eb65137c18645557947 WHIRLPOOL dd7e12a38aa67234afe6093b9734cb91b98d24e43c72128857e5ca59345ad16f19c989435cb349b256a41778ef77372dcb0d51eb8014ff075b90473fbd80b55d
+EBUILD ffmpeg-9999.ebuild 14347 SHA256 ee198f175980d8bac8de26c6e165c801592d252d6ac5a952685510735e1552d1 SHA512 4ff659da36940038a56e5aa1e13b5fd65b21f58ee4bf76dab7baebecc8b14ce85595f6c4b8d86d8dae10e985eecd72229b3daa0ae02047dcd1c989e98b3702b8 WHIRLPOOL 710776bbf2f6454bfa0c824d2838304d76de25f85ec753209ba1d7b4a0d493dbb682152ebcaa5e3075efa4cc132cc2d8fe80c34fc3ce53d5ac8e1a29e80a3d2c
+MISC ChangeLog 1909 SHA256 7f6c5b346b4fac9a30a771d7286c0f828c6fbdea2f6929b03b73120d7c5453c7 SHA512 96ab9e964445b34c0fadab82db1c532bf6758e7be3287820a5796d6374dccd4dc585a2be0c17b161ec61ebd6b4d5d791eecbc960afe67acf745c47932179d7ef WHIRLPOOL a9197d07da94b05f4e3c7ac226a13c2db2940eae46532dcd00b6238fc05f84506100c6024c0b421665eef99e14d7f81595c4d4565c07dcc2e7289b9458525f9e
 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
-MISC metadata.xml 4268 SHA256 070123d230f117598324822c8530d41b9f5b03afc711c430b0a11355b47af42f SHA512 ba933d5c0acded55f9ca4f54b617b201ac3659bc7daffe7a069d0418c65b9a2648a393d8fd6cafb41f6a80d55d279e58b025b3c91fda41e8ed96d33319c81ee1 WHIRLPOOL 33d8c62f6fa5f90e7157976fb689833a9019bbcffb1ecda47045b537aaa14235c77d2d107ff4c59497b5e9dd70981e77fa4d6b0a266843ca4d2a877ffd863586
+MISC metadata.xml 4422 SHA256 2284bee6bb2e082a84e31f78adc599ecd9bd560476a4d236ad5c3e4b018a0b48 SHA512 e4eab5b9d72b45de9e9d7ff201e38b9177c0ac4bb6862bc9efade3196964c24690279838cfbd7e3df6072bc82d82de262dec6a4228ae0232d79462b9f282ccee WHIRLPOOL df4b8d518bcec2f9de5f65c7e79444edb63ae700b9f36917692c20085c3b326e34d7e50a1fbefc0c0a87412e87cc7a556b3859d6f3817cd6ea1d8bbaed572ff5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTkYi4ACgkQvFcC4BYPU0r47ACfayEc4ZQzYqXekgtaRQcZQ8IK
-K04AoIs9NUCrjdzc/BVS6plf4wa1kP1T
-=XxfR
+iEYEAREIAAYFAlTkayYACgkQvFcC4BYPU0rAiwCfdcPDpk0J/MxO/VYEbgS91yX2
+v+AAoLJPOX3el5Z/uYxg8o49UEz6SrVo
+=4ulh
 -----END PGP SIGNATURE-----

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9ed73a24d04867c3d5322f50bd44984de98b1cf9..9fc0eb827c1c1cd125b6886c2aacc3c2b0589859 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.178 2015/02/18 09:58:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.179 2015/02/18 10:36:21 aballier Exp $
 
 EAPI="5"
 
@@ -34,17 +34,35 @@ else # Release
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) ) samba? ( GPL-3 )"
 SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+       !gpl? ( LGPL-2.1 )
+       gpl? ( GPL-2 )
+       amr? (
+               gpl? ( GPL-3 )
+               !gpl? ( LGPL-3 )
+       )
+       encode? (
+               aac? (
+                       gpl? ( GPL-3 )
+                       !gpl? ( LGPL-3 )
+               )
+               amrenc? (
+                       gpl? ( GPL-3 )
+                       !gpl? ( LGPL-3 )
+               )
+       )
+       samba? ( GPL-3 )
+"
 if [ "${PV#9999}" = "${PV}" ] ; then
        KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
        aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
        cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
-       fribidi gme     gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
+       fribidi gme     gnutls +gpl gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
        jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
-       openal opengl openssl opus oss pic pulseaudio quvi rtmp samba schroedinger
+       openal opengl openssl opus oss pic +postproc pulseaudio quvi rtmp samba schroedinger
        sdl speex ssh static-libs test theora threads truetype twolame v4l vaapi
        vdpau vorbis vpx wavpack webp X x264 x265 xcb xvid +zlib zvbi
        "
@@ -173,7 +191,7 @@ RDEPEND="
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
        zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
        !media-video/qt-faststart
-       !media-libs/libpostproc
+       postproc? ( !media-libs/libpostproc )
 "
 
 DEPEND="${RDEPEND}
@@ -196,11 +214,29 @@ RDEPEND="${RDEPEND}
        abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
                !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+       postproc? ( gpl )
+       frei0r? ( gpl )
+       cdio? ( gpl )
+       samba? ( gpl )
+       encode? (
+               x264? ( gpl )
+               x265? ( gpl )
+               xvid? ( gpl )
+               X? ( gpl )
+       )
+"
 # faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
+       bindist? (
+               encode? ( !faac !aacplus )
+               gpl? ( !openssl !fdk )
+       )
        libv4l? ( v4l )
        fftools_cws2fws? ( zlib )
        test? ( encode )
+       ${GPL_REQUIRED_USE}
        ${CPU_REQUIRED_USE}"
 
 S=${WORKDIR}/${P/_/-}
@@ -224,10 +260,10 @@ multilib_src_configure() {
        # or $(use_enable foo foo) if no :bar is set.
        local ffuse=(
                bzip2:bzlib cpudetection:runtime-cpudetect debug doc
-               gnutls hardcoded-tables iconv lzma network openssl samba:libsmbclient
+               gnutls gpl hardcoded-tables iconv lzma network openssl postproc samba:libsmbclient
                sdl:ffplay vaapi vdpau X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes zlib
        )
-       use openssl && myconf+=( --enable-nonfree )
+       use openssl && use gpl && myconf+=( --enable-nonfree )
        use samba && myconf+=( --enable-version3 )
 
        # Encoders
@@ -279,7 +315,7 @@ multilib_src_configure() {
        for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
                ffuse+=( ${i}:lib${i} )
        done
-       use fdk && myconf+=( --enable-nonfree )
+       use fdk && use gpl && myconf+=( --enable-nonfree )
 
        for i in "${ffuse[@]}" ; do
                myconf+=( $(use_enable ${i%:*} ${i#*:}) )
@@ -317,8 +353,6 @@ multilib_src_configure() {
 
        # Mandatory configuration
        myconf=(
-               --enable-gpl
-               --enable-postproc
                --enable-avfilter
                --enable-avresample
                --disable-stripping

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 1e9132f845e0a5f35d717e2c51c264826011f467..23e69c8617f5b683f1fc56ead7ec1efffe75a68b 100644 (file)
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -26,6 +26,7 @@
        <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
        <flag name="fribidi">Enables fribidi support in the drawtext filter.</flag>
        <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+       <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
        <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
        <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
        <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
@@ -38,6 +39,7 @@
        <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
        <flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
        <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
+       <flag name="postproc">Build and install libpostproc.</flag>
        <flag name="quvi">Adds support for playing media from Internet services using the quvi project.</flag>
        <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
        <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>