aballier 15/02/18 10:36:21 Modified: ffmpeg-9999.ebuild metadata.xml ChangeLog Log: Add gpl & postproc useflags so that ffmpeg can be built in LGPL mode. Signed-off-by: aball...@gentoo.org (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.179 media-video/ffmpeg/ffmpeg-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.179&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.179&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.178&r2=1.179 Index: ffmpeg-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- ffmpeg-9999.ebuild 18 Feb 2015 09:58:05 -0000 1.178 +++ ffmpeg-9999.ebuild 18 Feb 2015 10:36:21 -0000 1.179 @@ -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 @@ 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 @@ 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 @@ 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 @@ # 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 @@ 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 @@ # Mandatory configuration myconf=( - --enable-gpl - --enable-postproc --enable-avfilter --enable-avresample --disable-stripping 1.71 media-video/ffmpeg/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.71&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.71&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.70&r2=1.71 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- metadata.xml 31 Jan 2015 23:54:51 -0000 1.70 +++ metadata.xml 18 Feb 2015 10:36:21 -0000 1.71 @@ -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> 1.830 media-video/ffmpeg/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.830&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.830&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.829&r2=1.830 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v retrieving revision 1.829 retrieving revision 1.830 diff -u -r1.829 -r1.830 --- ChangeLog 18 Feb 2015 09:58:05 -0000 1.829 +++ ChangeLog 18 Feb 2015 10:36:21 -0000 1.830 @@ -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 <aball...@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 <aball...@gentoo.org> ffmpeg-9999.ebuild: add required use for x86 cpu flags
