aballier 15/03/05 13:57:08
Modified: ffmpeg-1.2.12.ebuild ffmpeg-2.2.13.ebuild
ffmpeg-1.2.6-r1.ebuild ffmpeg-0.10.15.ebuild
ffmpeg-2.5.4.ebuild metadata.xml
ffmpeg-1.0.10.ebuild ChangeLog
Log:
convert to RESTRICT=bindist, bug #541588
Signed-off-by: [email protected]
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
160F534A)
Revision Changes Path
1.2 media-video/ffmpeg/ffmpeg-1.2.12.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-1.2.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-1.2.12.ebuild 14 Feb 2015 20:50:06 -0000 1.1
+++ ffmpeg-1.2.12.ebuild 5 Mar 2015 13:57:08 -0000 1.2
@@ -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-1.2.12.ebuild,v
1.1 2015/02/14 20:50:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v
1.2 2015/03/05 13:57:08 aballier Exp $
EAPI="4"
@@ -29,7 +29,7 @@
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 bindist bluray +bzip2 cdio celt
+ aac aacplus alsa amr bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
@@ -145,11 +145,12 @@
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.2 media-video/ffmpeg/ffmpeg-2.2.13.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-2.2.13.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-2.2.13.ebuild 20 Feb 2015 11:17:36 -0000 1.1
+++ ffmpeg-2.2.13.ebuild 5 Mar 2015 13:57:08 -0000 1.2
@@ -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-2.2.13.ebuild,v
1.1 2015/02/20 11:17:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v
1.2 2015/03/05 13:57:08 aballier Exp $
EAPI="5"
@@ -40,7 +40,7 @@
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 +bzip2 cdio celt
+ aac aacplus alsa amr amrenc bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
jpeg2k
ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
@@ -177,11 +177,12 @@
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.16 media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?r1=1.15&r2=1.16
Index: ffmpeg-1.2.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ffmpeg-1.2.6-r1.ebuild 30 Jan 2015 16:40:48 -0000 1.15
+++ ffmpeg-1.2.6-r1.ebuild 5 Mar 2015 13:57:08 -0000 1.16
@@ -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-1.2.6-r1.ebuild,v
1.15 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v
1.16 2015/03/05 13:57:08 aballier Exp $
EAPI="4"
@@ -29,7 +29,7 @@
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 bindist bluray +bzip2 cdio celt
+ aac aacplus alsa amr bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
@@ -145,11 +145,12 @@
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.3 media-video/ffmpeg/ffmpeg-0.10.15.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?r1=1.2&r2=1.3
Index: ffmpeg-0.10.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-0.10.15.ebuild 30 Jan 2015 16:40:48 -0000 1.2
+++ ffmpeg-0.10.15.ebuild 5 Mar 2015 13:57:08 -0000 1.3
@@ -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-0.10.15.ebuild,v
1.2 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v
1.3 2015/03/05 13:57:08 aballier Exp $
EAPI="5"
@@ -29,7 +29,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
IUSE="
- aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
+ aac aacplus alsa amr +bzip2 cdio celt cpudetection debug
dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic
pulseaudio
rtmp schroedinger sdl speex static-libs test theora threads
@@ -107,9 +107,10 @@
v4l? ( sys-kernel/linux-headers )
"
# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
test? ( encode zlib )"
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.2 media-video/ffmpeg/ffmpeg-2.5.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?r1=1.1&r2=1.2
Index: ffmpeg-2.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ffmpeg-2.5.4.ebuild 14 Feb 2015 20:58:53 -0000 1.1
+++ ffmpeg-2.5.4.ebuild 5 Mar 2015 13:57:08 -0000 1.2
@@ -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-2.5.4.ebuild,v
1.1 2015/02/14 20:58:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v
1.2 2015/03/05 13:57:08 aballier Exp $
EAPI="5"
@@ -40,7 +40,7 @@
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
+ aac aacplus alsa amr amrenc 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
jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
@@ -177,11 +177,12 @@
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.72 media-video/ffmpeg/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.72&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.72&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.71&r2=1.72
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- metadata.xml 18 Feb 2015 10:36:21 -0000 1.71
+++ metadata.xml 5 Mar 2015 13:57:08 -0000 1.72
@@ -13,7 +13,6 @@
<flag name="armv6">Enables optimizations for armv6 processors.</flag>
<flag name="armv6t2">Enables optimizations for armv6t2
processors.</flag>
<flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
- <flag name="bindist">Enforces license compatibility constraints via
REQUIRED_USE.</flag>
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer
stereo-to-binaural filter.</flag>
<flag name="cdio">Enables audio CD grabbing with
<pkg>dev-libs/libcdio</pkg>.</flag>
1.4 media-video/ffmpeg/ffmpeg-1.0.10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?r1=1.3&r2=1.4
Index: ffmpeg-1.0.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg-1.0.10.ebuild 30 Jan 2015 16:40:48 -0000 1.3
+++ ffmpeg-1.0.10.ebuild 5 Mar 2015 13:57:08 -0000 1.4
@@ -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-1.0.10.ebuild,v
1.3 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v
1.4 2015/03/05 13:57:08 aballier Exp $
EAPI="4"
@@ -29,7 +29,7 @@
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 bindist bluray +bzip2 cdio celt
+ aac aacplus alsa amr bluray +bzip2 cdio celt
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass
libcaca
libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp
@@ -116,11 +116,12 @@
truetype? ( virtual/pkgconfig )
v4l? ( sys-kernel/linux-headers )
"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? (
bindist )"
S=${WORKDIR}/${P/_/-}
1.840 media-video/ffmpeg/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.840&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.840&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.839&r2=1.840
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- ChangeLog 5 Mar 2015 13:52:08 -0000 1.839
+++ ChangeLog 5 Mar 2015 13:57:08 -0000 1.840
@@ -1,6 +1,11 @@
# 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.839
2015/03/05 13:52:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.840
2015/03/05 13:57:08 aballier Exp $
+
+ 05 Mar 2015; Alexis Ballier <[email protected]> ffmpeg-0.10.15.ebuild,
+ ffmpeg-1.0.10.ebuild, ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild,
+ ffmpeg-2.2.13.ebuild, ffmpeg-2.5.4.ebuild, metadata.xml:
+ convert to RESTRICT=bindist, bug #541588
05 Mar 2015; Alexis Ballier <[email protected]> -ffmpeg-1.2.11.ebuild,
-ffmpeg-2.2.12.ebuild, -ffmpeg-2.5.3.ebuild:
