| 1 |
aballier 15/03/05 13:57:08 |
| 2 |
|
| 3 |
Modified: ffmpeg-1.2.12.ebuild ffmpeg-2.2.13.ebuild |
| 4 |
ffmpeg-1.2.6-r1.ebuild ffmpeg-0.10.15.ebuild |
| 5 |
ffmpeg-2.5.4.ebuild metadata.xml |
| 6 |
ffmpeg-1.0.10.ebuild ChangeLog |
| 7 |
Log: |
| 8 |
convert to RESTRICT=bindist, bug #541588 |
| 9 |
|
| 10 |
Signed-off-by: aballier@g.o |
| 11 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.2 media-video/ffmpeg/ffmpeg-1.2.12.ebuild |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.2&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?rev=1.2&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild?r1=1.1&r2=1.2 |
| 19 |
|
| 20 |
Index: ffmpeg-1.2.12.ebuild |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v |
| 23 |
retrieving revision 1.1 |
| 24 |
retrieving revision 1.2 |
| 25 |
diff -u -r1.1 -r1.2 |
| 26 |
--- ffmpeg-1.2.12.ebuild 14 Feb 2015 20:50:06 -0000 1.1 |
| 27 |
+++ ffmpeg-1.2.12.ebuild 5 Mar 2015 13:57:08 -0000 1.2 |
| 28 |
@@ -1,6 +1,6 @@ |
| 29 |
# Copyright 1999-2015 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.1 2015/02/14 20:50:06 aballier Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $ |
| 33 |
|
| 34 |
EAPI="4" |
| 35 |
|
| 36 |
@@ -29,7 +29,7 @@ |
| 37 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 38 |
fi |
| 39 |
IUSE=" |
| 40 |
- aac aacplus alsa amr bindist bluray +bzip2 cdio celt |
| 41 |
+ aac aacplus alsa amr bluray +bzip2 cdio celt |
| 42 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 43 |
gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass |
| 44 |
libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic |
| 45 |
@@ -145,11 +145,12 @@ |
| 46 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 |
| 47 |
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 48 |
|
| 49 |
-# faac is license-incompatible with ffmpeg |
| 50 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 51 |
+REQUIRED_USE=" |
| 52 |
libv4l? ( v4l ) |
| 53 |
fftools_cws2fws? ( zlib ) |
| 54 |
test? ( encode )" |
| 55 |
+# faac is license-incompatible with ffmpeg |
| 56 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 57 |
|
| 58 |
S=${WORKDIR}/${P/_/-} |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.2 media-video/ffmpeg/ffmpeg-2.2.13.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.2&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?rev=1.2&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild?r1=1.1&r2=1.2 |
| 68 |
|
| 69 |
Index: ffmpeg-2.2.13.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v |
| 72 |
retrieving revision 1.1 |
| 73 |
retrieving revision 1.2 |
| 74 |
diff -u -r1.1 -r1.2 |
| 75 |
--- ffmpeg-2.2.13.ebuild 20 Feb 2015 11:17:36 -0000 1.1 |
| 76 |
+++ ffmpeg-2.2.13.ebuild 5 Mar 2015 13:57:08 -0000 1.2 |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
# Copyright 1999-2015 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.1 2015/02/20 11:17:36 aballier Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $ |
| 82 |
|
| 83 |
EAPI="5" |
| 84 |
|
| 85 |
@@ -40,7 +40,7 @@ |
| 86 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 87 |
fi |
| 88 |
IUSE=" |
| 89 |
- aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt |
| 90 |
+ aac aacplus alsa amr amrenc bluray +bzip2 cdio celt |
| 91 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 92 |
gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k |
| 93 |
ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl |
| 94 |
@@ -177,11 +177,12 @@ |
| 95 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 |
| 96 |
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 97 |
|
| 98 |
-# faac is license-incompatible with ffmpeg |
| 99 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 100 |
+REQUIRED_USE=" |
| 101 |
libv4l? ( v4l ) |
| 102 |
fftools_cws2fws? ( zlib ) |
| 103 |
test? ( encode )" |
| 104 |
+# faac is license-incompatible with ffmpeg |
| 105 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 106 |
|
| 107 |
S=${WORKDIR}/${P/_/-} |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
1.16 media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild |
| 113 |
|
| 114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?rev=1.16&view=markup |
| 115 |
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 |
| 116 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild?r1=1.15&r2=1.16 |
| 117 |
|
| 118 |
Index: ffmpeg-1.2.6-r1.ebuild |
| 119 |
=================================================================== |
| 120 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v |
| 121 |
retrieving revision 1.15 |
| 122 |
retrieving revision 1.16 |
| 123 |
diff -u -r1.15 -r1.16 |
| 124 |
--- ffmpeg-1.2.6-r1.ebuild 30 Jan 2015 16:40:48 -0000 1.15 |
| 125 |
+++ ffmpeg-1.2.6-r1.ebuild 5 Mar 2015 13:57:08 -0000 1.16 |
| 126 |
@@ -1,6 +1,6 @@ |
| 127 |
# Copyright 1999-2015 Gentoo Foundation |
| 128 |
# Distributed under the terms of the GNU General Public License v2 |
| 129 |
-# $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 $ |
| 130 |
+# $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 $ |
| 131 |
|
| 132 |
EAPI="4" |
| 133 |
|
| 134 |
@@ -29,7 +29,7 @@ |
| 135 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 136 |
fi |
| 137 |
IUSE=" |
| 138 |
- aac aacplus alsa amr bindist bluray +bzip2 cdio celt |
| 139 |
+ aac aacplus alsa amr bluray +bzip2 cdio celt |
| 140 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 141 |
gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass |
| 142 |
libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic |
| 143 |
@@ -145,11 +145,12 @@ |
| 144 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 |
| 145 |
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 146 |
|
| 147 |
-# faac is license-incompatible with ffmpeg |
| 148 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 149 |
+REQUIRED_USE=" |
| 150 |
libv4l? ( v4l ) |
| 151 |
fftools_cws2fws? ( zlib ) |
| 152 |
test? ( encode )" |
| 153 |
+# faac is license-incompatible with ffmpeg |
| 154 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 155 |
|
| 156 |
S=${WORKDIR}/${P/_/-} |
| 157 |
|
| 158 |
|
| 159 |
|
| 160 |
|
| 161 |
1.3 media-video/ffmpeg/ffmpeg-0.10.15.ebuild |
| 162 |
|
| 163 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?rev=1.3&view=markup |
| 164 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?rev=1.3&content-type=text/plain |
| 165 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild?r1=1.2&r2=1.3 |
| 166 |
|
| 167 |
Index: ffmpeg-0.10.15.ebuild |
| 168 |
=================================================================== |
| 169 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v |
| 170 |
retrieving revision 1.2 |
| 171 |
retrieving revision 1.3 |
| 172 |
diff -u -r1.2 -r1.3 |
| 173 |
--- ffmpeg-0.10.15.ebuild 30 Jan 2015 16:40:48 -0000 1.2 |
| 174 |
+++ ffmpeg-0.10.15.ebuild 5 Mar 2015 13:57:08 -0000 1.3 |
| 175 |
@@ -1,6 +1,6 @@ |
| 176 |
# Copyright 1999-2015 Gentoo Foundation |
| 177 |
# Distributed under the terms of the GNU General Public License v2 |
| 178 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v 1.2 2015/01/30 16:40:48 mgorny Exp $ |
| 179 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v 1.3 2015/03/05 13:57:08 aballier Exp $ |
| 180 |
|
| 181 |
EAPI="5" |
| 182 |
|
| 183 |
@@ -29,7 +29,7 @@ |
| 184 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 185 |
fi |
| 186 |
IUSE=" |
| 187 |
- aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug |
| 188 |
+ aac aacplus alsa amr +bzip2 cdio celt cpudetection debug |
| 189 |
dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack |
| 190 |
jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic pulseaudio |
| 191 |
rtmp schroedinger sdl speex static-libs test theora threads |
| 192 |
@@ -107,9 +107,10 @@ |
| 193 |
v4l? ( sys-kernel/linux-headers ) |
| 194 |
" |
| 195 |
# faac is license-incompatible with ffmpeg |
| 196 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 197 |
+REQUIRED_USE=" |
| 198 |
libv4l? ( v4l ) |
| 199 |
test? ( encode zlib )" |
| 200 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 201 |
|
| 202 |
S=${WORKDIR}/${P/_/-} |
| 203 |
|
| 204 |
|
| 205 |
|
| 206 |
|
| 207 |
1.2 media-video/ffmpeg/ffmpeg-2.5.4.ebuild |
| 208 |
|
| 209 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?rev=1.2&view=markup |
| 210 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?rev=1.2&content-type=text/plain |
| 211 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild?r1=1.1&r2=1.2 |
| 212 |
|
| 213 |
Index: ffmpeg-2.5.4.ebuild |
| 214 |
=================================================================== |
| 215 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v |
| 216 |
retrieving revision 1.1 |
| 217 |
retrieving revision 1.2 |
| 218 |
diff -u -r1.1 -r1.2 |
| 219 |
--- ffmpeg-2.5.4.ebuild 14 Feb 2015 20:58:53 -0000 1.1 |
| 220 |
+++ ffmpeg-2.5.4.ebuild 5 Mar 2015 13:57:08 -0000 1.2 |
| 221 |
@@ -1,6 +1,6 @@ |
| 222 |
# Copyright 1999-2015 Gentoo Foundation |
| 223 |
# Distributed under the terms of the GNU General Public License v2 |
| 224 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v 1.1 2015/02/14 20:58:53 aballier Exp $ |
| 225 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $ |
| 226 |
|
| 227 |
EAPI="5" |
| 228 |
|
| 229 |
@@ -40,7 +40,7 @@ |
| 230 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 231 |
fi |
| 232 |
IUSE=" |
| 233 |
- aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt |
| 234 |
+ aac aacplus alsa amr amrenc bluray bs2b +bzip2 cdio celt |
| 235 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 236 |
fribidi gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack |
| 237 |
jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network |
| 238 |
@@ -177,11 +177,12 @@ |
| 239 |
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 |
| 240 |
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 241 |
|
| 242 |
-# faac is license-incompatible with ffmpeg |
| 243 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 244 |
+REQUIRED_USE=" |
| 245 |
libv4l? ( v4l ) |
| 246 |
fftools_cws2fws? ( zlib ) |
| 247 |
test? ( encode )" |
| 248 |
+# faac is license-incompatible with ffmpeg |
| 249 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 250 |
|
| 251 |
S=${WORKDIR}/${P/_/-} |
| 252 |
|
| 253 |
|
| 254 |
|
| 255 |
|
| 256 |
1.72 media-video/ffmpeg/metadata.xml |
| 257 |
|
| 258 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.72&view=markup |
| 259 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?rev=1.72&content-type=text/plain |
| 260 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/metadata.xml?r1=1.71&r2=1.72 |
| 261 |
|
| 262 |
Index: metadata.xml |
| 263 |
=================================================================== |
| 264 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/metadata.xml,v |
| 265 |
retrieving revision 1.71 |
| 266 |
retrieving revision 1.72 |
| 267 |
diff -u -r1.71 -r1.72 |
| 268 |
--- metadata.xml 18 Feb 2015 10:36:21 -0000 1.71 |
| 269 |
+++ metadata.xml 5 Mar 2015 13:57:08 -0000 1.72 |
| 270 |
@@ -13,7 +13,6 @@ |
| 271 |
<flag name="armv6">Enables optimizations for armv6 processors.</flag> |
| 272 |
<flag name="armv6t2">Enables optimizations for armv6t2 processors.</flag> |
| 273 |
<flag name="armvfp">Enables VFP optimizations for ARM processors.</flag> |
| 274 |
- <flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag> |
| 275 |
<flag name="bluray">Enable playback of Blu-ray filesystems</flag> |
| 276 |
<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag> |
| 277 |
<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag> |
| 278 |
|
| 279 |
|
| 280 |
|
| 281 |
1.4 media-video/ffmpeg/ffmpeg-1.0.10.ebuild |
| 282 |
|
| 283 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.4&view=markup |
| 284 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?rev=1.4&content-type=text/plain |
| 285 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild?r1=1.3&r2=1.4 |
| 286 |
|
| 287 |
Index: ffmpeg-1.0.10.ebuild |
| 288 |
=================================================================== |
| 289 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v |
| 290 |
retrieving revision 1.3 |
| 291 |
retrieving revision 1.4 |
| 292 |
diff -u -r1.3 -r1.4 |
| 293 |
--- ffmpeg-1.0.10.ebuild 30 Jan 2015 16:40:48 -0000 1.3 |
| 294 |
+++ ffmpeg-1.0.10.ebuild 5 Mar 2015 13:57:08 -0000 1.4 |
| 295 |
@@ -1,6 +1,6 @@ |
| 296 |
# Copyright 1999-2015 Gentoo Foundation |
| 297 |
# Distributed under the terms of the GNU General Public License v2 |
| 298 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.3 2015/01/30 16:40:48 mgorny Exp $ |
| 299 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.4 2015/03/05 13:57:08 aballier Exp $ |
| 300 |
|
| 301 |
EAPI="4" |
| 302 |
|
| 303 |
@@ -29,7 +29,7 @@ |
| 304 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 305 |
fi |
| 306 |
IUSE=" |
| 307 |
- aac aacplus alsa amr bindist bluray +bzip2 cdio celt |
| 308 |
+ aac aacplus alsa amr bluray +bzip2 cdio celt |
| 309 |
cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r |
| 310 |
gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca |
| 311 |
libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp |
| 312 |
@@ -116,11 +116,12 @@ |
| 313 |
truetype? ( virtual/pkgconfig ) |
| 314 |
v4l? ( sys-kernel/linux-headers ) |
| 315 |
" |
| 316 |
-# faac is license-incompatible with ffmpeg |
| 317 |
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) |
| 318 |
+REQUIRED_USE=" |
| 319 |
libv4l? ( v4l ) |
| 320 |
fftools_cws2fws? ( zlib ) |
| 321 |
test? ( encode )" |
| 322 |
+# faac is license-incompatible with ffmpeg |
| 323 |
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )" |
| 324 |
|
| 325 |
S=${WORKDIR}/${P/_/-} |
| 326 |
|
| 327 |
|
| 328 |
|
| 329 |
|
| 330 |
1.840 media-video/ffmpeg/ChangeLog |
| 331 |
|
| 332 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.840&view=markup |
| 333 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?rev=1.840&content-type=text/plain |
| 334 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ChangeLog?r1=1.839&r2=1.840 |
| 335 |
|
| 336 |
Index: ChangeLog |
| 337 |
=================================================================== |
| 338 |
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v |
| 339 |
retrieving revision 1.839 |
| 340 |
retrieving revision 1.840 |
| 341 |
diff -u -r1.839 -r1.840 |
| 342 |
--- ChangeLog 5 Mar 2015 13:52:08 -0000 1.839 |
| 343 |
+++ ChangeLog 5 Mar 2015 13:57:08 -0000 1.840 |
| 344 |
@@ -1,6 +1,11 @@ |
| 345 |
# ChangeLog for media-video/ffmpeg |
| 346 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 347 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.839 2015/03/05 13:52:08 aballier Exp $ |
| 348 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.840 2015/03/05 13:57:08 aballier Exp $ |
| 349 |
+ |
| 350 |
+ 05 Mar 2015; Alexis Ballier <aballier@g.o> ffmpeg-0.10.15.ebuild, |
| 351 |
+ ffmpeg-1.0.10.ebuild, ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild, |
| 352 |
+ ffmpeg-2.2.13.ebuild, ffmpeg-2.5.4.ebuild, metadata.xml: |
| 353 |
+ convert to RESTRICT=bindist, bug #541588 |
| 354 |
|
| 355 |
05 Mar 2015; Alexis Ballier <aballier@g.o> -ffmpeg-1.2.11.ebuild, |
| 356 |
-ffmpeg-2.2.12.ebuild, -ffmpeg-2.5.3.ebuild: |
Archives