| 1 |
commit: 3203560de6b3e2a61baadcb9652a5e2609330dfb |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 15 23:06:30 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 16 00:19:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3203560d |
| 7 |
|
| 8 |
media-video/vlc: Drop superfluous USE: avcodec,avformat,swscale |
| 9 |
|
| 10 |
They do not add any dependencies and only complicate REQUIRED_USE. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 13 |
|
| 14 |
media-video/vlc/vlc-3.0.9999.ebuild | 49 ++++++++++++------------------------- |
| 15 |
media-video/vlc/vlc-9999.ebuild | 49 ++++++++++++------------------------- |
| 16 |
2 files changed, 32 insertions(+), 66 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 19 |
index 03f66537fe2..e356e59f36b 100644 |
| 20 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 21 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 22 |
@@ -29,32 +29,31 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 23 |
LICENSE="LGPL-2.1 GPL-2" |
| 24 |
SLOT="0/5-9" # vlc - vlccore |
| 25 |
|
| 26 |
-IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb |
| 27 |
+IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb |
| 28 |
chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd |
| 29 |
- dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt |
| 30 |
+ dxva2 elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt |
| 31 |
gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca |
| 32 |
libnotify +libsamplerate libtiger linsys libtar lirc live lua |
| 33 |
macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 |
| 34 |
mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus |
| 35 |
png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
| 36 |
schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg |
| 37 |
- +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
| 38 |
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
| 39 |
vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
| 40 |
" |
| 41 |
REQUIRED_USE=" |
| 42 |
aalib? ( X ) |
| 43 |
bidi? ( truetype ) |
| 44 |
dvb? ( dvbpsi ) |
| 45 |
- dxva2? ( avcodec ) |
| 46 |
- ffmpeg? ( avcodec avformat swscale ) |
| 47 |
+ dxva2? ( ffmpeg ) |
| 48 |
fontconfig? ( truetype ) |
| 49 |
gnutls? ( gcrypt ) |
| 50 |
libcaca? ( X ) |
| 51 |
libtar? ( skins ) |
| 52 |
libtiger? ( kate ) |
| 53 |
skins? ( qt5 truetype X xml ) |
| 54 |
- vaapi? ( avcodec X ) |
| 55 |
- vdpau? ( X ) |
| 56 |
+ vaapi? ( ffmpeg X ) |
| 57 |
+ vdpau? ( ffmpeg X ) |
| 58 |
vlm? ( encode ) |
| 59 |
xv? ( xcb ) |
| 60 |
" |
| 61 |
@@ -68,14 +67,6 @@ RDEPEND=" |
| 62 |
alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
| 63 |
aom? ( media-libs/libaom:= ) |
| 64 |
archive? ( app-arch/libarchive:= ) |
| 65 |
- avcodec? ( |
| 66 |
- !libav? ( media-video/ffmpeg:0= ) |
| 67 |
- libav? ( >=media-video/libav-11.8:0= ) |
| 68 |
- ) |
| 69 |
- avformat? ( |
| 70 |
- !libav? ( media-video/ffmpeg:0= ) |
| 71 |
- libav? ( >=media-video/libav-11.8:0= ) |
| 72 |
- ) |
| 73 |
bidi? ( dev-libs/fribidi:0 ) |
| 74 |
bluray? ( >=media-libs/libbluray-0.6.2:0= ) |
| 75 |
cddb? ( >=media-libs/libcddb-1.2:0 ) |
| 76 |
@@ -95,6 +86,10 @@ RDEPEND=" |
| 77 |
elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
| 78 |
faad? ( >=media-libs/faad2-2.6.1:0 ) |
| 79 |
fdk? ( media-libs/fdk-aac:0 ) |
| 80 |
+ ffmpeg? ( |
| 81 |
+ !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?] ) |
| 82 |
+ libav? ( >=media-video/libav-11.8:0=[vaapi?] ) |
| 83 |
+ ) |
| 84 |
flac? ( |
| 85 |
>=media-libs/flac-1.1.2:0 |
| 86 |
>=media-libs/libogg-1:0 |
| 87 |
@@ -186,10 +181,6 @@ RDEPEND=" |
| 88 |
>=gnome-base/librsvg-2.9:2 |
| 89 |
>=x11-libs/cairo-1.13.1:0 |
| 90 |
) |
| 91 |
- swscale? ( |
| 92 |
- !libav? ( media-video/ffmpeg:0= ) |
| 93 |
- libav? ( media-video/libav:0= ) |
| 94 |
- ) |
| 95 |
taglib? ( >=media-libs/taglib-1.9:0 ) |
| 96 |
theora? ( media-libs/libtheora:0 ) |
| 97 |
tremor? ( media-libs/tremor:0 ) |
| 98 |
@@ -202,17 +193,9 @@ RDEPEND=" |
| 99 |
udev? ( virtual/udev:0 ) |
| 100 |
upnp? ( net-libs/libupnp:= ) |
| 101 |
v4l? ( media-libs/libv4l:0 ) |
| 102 |
- vaapi? ( |
| 103 |
- x11-libs/libva:0=[drm,wayland?,X?] |
| 104 |
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
| 105 |
- libav? ( media-video/libav:0=[vaapi] ) |
| 106 |
- ) |
| 107 |
+ vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) |
| 108 |
vcd? ( >=dev-libs/libcdio-0.78.2:0 ) |
| 109 |
- vdpau? ( |
| 110 |
- x11-libs/libvdpau:0 |
| 111 |
- !libav? ( media-video/ffmpeg:0= ) |
| 112 |
- libav? ( >=media-video/libav-10:0= ) |
| 113 |
- ) |
| 114 |
+ vdpau? ( x11-libs/libvdpau:0 ) |
| 115 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
| 116 |
vorbis? ( media-libs/libvorbis:0 ) |
| 117 |
vpx? ( media-libs/libvpx:0= ) |
| 118 |
@@ -298,8 +281,6 @@ src_configure() { |
| 119 |
$(use_enable altivec) |
| 120 |
$(use_enable aom) |
| 121 |
$(use_enable archive) |
| 122 |
- $(use_enable avcodec) |
| 123 |
- $(use_enable avformat) |
| 124 |
$(use_enable bidi fribidi) |
| 125 |
$(use_enable bluray) |
| 126 |
$(use_enable cddb libcddb) |
| 127 |
@@ -307,9 +288,9 @@ src_configure() { |
| 128 |
$(use_enable chromecast) |
| 129 |
$(use_enable dbus) |
| 130 |
$(use_enable dbus kwallet) |
| 131 |
- $(use_enable directx) |
| 132 |
$(use_enable dc1394) |
| 133 |
$(use_enable debug) |
| 134 |
+ $(use_enable directx) |
| 135 |
$(use_enable dts dca) |
| 136 |
$(use_enable dvbpsi) |
| 137 |
$(use_enable dvd dvdnav) |
| 138 |
@@ -318,6 +299,9 @@ src_configure() { |
| 139 |
$(use_enable encode sout) |
| 140 |
$(use_enable faad) |
| 141 |
$(use_enable fdk fdkaac) |
| 142 |
+ $(use_enable ffmpeg avcodec) |
| 143 |
+ $(use_enable ffmpeg avformat) |
| 144 |
+ $(use_enable ffmpeg swscale) |
| 145 |
$(use_enable flac) |
| 146 |
$(use_enable fluidsynth) |
| 147 |
$(use_enable fontconfig) |
| 148 |
@@ -375,7 +359,6 @@ src_configure() { |
| 149 |
$(use_enable cpu_flags_x86_sse sse) |
| 150 |
$(use_enable svg) |
| 151 |
$(use_enable svg svgdec) |
| 152 |
- $(use_enable swscale) |
| 153 |
$(use_enable taglib) |
| 154 |
$(use_enable theora) |
| 155 |
$(use_enable tremor) |
| 156 |
|
| 157 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 158 |
index f9ef2b620b6..1c5dfc061e5 100644 |
| 159 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 160 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 161 |
@@ -29,32 +29,31 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 162 |
LICENSE="LGPL-2.1 GPL-2" |
| 163 |
SLOT="0/5-9" # vlc - vlccore |
| 164 |
|
| 165 |
-IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb |
| 166 |
+IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb |
| 167 |
chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd |
| 168 |
- dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt |
| 169 |
+ dxva2 elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt |
| 170 |
gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca |
| 171 |
libnotify +libsamplerate libtiger linsys libtar lirc live lua |
| 172 |
macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 |
| 173 |
mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus |
| 174 |
png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
| 175 |
schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg |
| 176 |
- +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
| 177 |
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
| 178 |
vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
| 179 |
" |
| 180 |
REQUIRED_USE=" |
| 181 |
aalib? ( X ) |
| 182 |
bidi? ( truetype ) |
| 183 |
dvb? ( dvbpsi ) |
| 184 |
- dxva2? ( avcodec ) |
| 185 |
- ffmpeg? ( avcodec avformat swscale ) |
| 186 |
+ dxva2? ( ffmpeg ) |
| 187 |
fontconfig? ( truetype ) |
| 188 |
gnutls? ( gcrypt ) |
| 189 |
libcaca? ( X ) |
| 190 |
libtar? ( skins ) |
| 191 |
libtiger? ( kate ) |
| 192 |
skins? ( qt5 truetype X xml ) |
| 193 |
- vaapi? ( avcodec X ) |
| 194 |
- vdpau? ( X ) |
| 195 |
+ vaapi? ( ffmpeg X ) |
| 196 |
+ vdpau? ( ffmpeg X ) |
| 197 |
vlm? ( encode ) |
| 198 |
xv? ( xcb ) |
| 199 |
" |
| 200 |
@@ -68,14 +67,6 @@ RDEPEND=" |
| 201 |
alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
| 202 |
aom? ( media-libs/libaom:= ) |
| 203 |
archive? ( app-arch/libarchive:= ) |
| 204 |
- avcodec? ( |
| 205 |
- !libav? ( media-video/ffmpeg:0= ) |
| 206 |
- libav? ( >=media-video/libav-11.8:0= ) |
| 207 |
- ) |
| 208 |
- avformat? ( |
| 209 |
- !libav? ( media-video/ffmpeg:0= ) |
| 210 |
- libav? ( >=media-video/libav-11.8:0= ) |
| 211 |
- ) |
| 212 |
bidi? ( dev-libs/fribidi:0 ) |
| 213 |
bluray? ( >=media-libs/libbluray-0.6.2:0= ) |
| 214 |
cddb? ( >=media-libs/libcddb-1.2:0 ) |
| 215 |
@@ -95,6 +86,10 @@ RDEPEND=" |
| 216 |
elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
| 217 |
faad? ( >=media-libs/faad2-2.6.1:0 ) |
| 218 |
fdk? ( media-libs/fdk-aac:0 ) |
| 219 |
+ ffmpeg? ( |
| 220 |
+ !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?] ) |
| 221 |
+ libav? ( >=media-video/libav-11.8:0=[vaapi?] ) |
| 222 |
+ ) |
| 223 |
flac? ( |
| 224 |
>=media-libs/flac-1.1.2:0 |
| 225 |
>=media-libs/libogg-1:0 |
| 226 |
@@ -186,10 +181,6 @@ RDEPEND=" |
| 227 |
>=gnome-base/librsvg-2.9:2 |
| 228 |
>=x11-libs/cairo-1.13.1:0 |
| 229 |
) |
| 230 |
- swscale? ( |
| 231 |
- !libav? ( media-video/ffmpeg:0= ) |
| 232 |
- libav? ( media-video/libav:0= ) |
| 233 |
- ) |
| 234 |
taglib? ( >=media-libs/taglib-1.9:0 ) |
| 235 |
theora? ( media-libs/libtheora:0 ) |
| 236 |
tremor? ( media-libs/tremor:0 ) |
| 237 |
@@ -202,17 +193,9 @@ RDEPEND=" |
| 238 |
udev? ( virtual/udev:0 ) |
| 239 |
upnp? ( net-libs/libupnp:= ) |
| 240 |
v4l? ( media-libs/libv4l:0 ) |
| 241 |
- vaapi? ( |
| 242 |
- x11-libs/libva:0=[drm,wayland?,X?] |
| 243 |
- !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
| 244 |
- libav? ( media-video/libav:0=[vaapi] ) |
| 245 |
- ) |
| 246 |
+ vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) |
| 247 |
vcd? ( >=dev-libs/libcdio-0.78.2:0 ) |
| 248 |
- vdpau? ( |
| 249 |
- x11-libs/libvdpau:0 |
| 250 |
- !libav? ( media-video/ffmpeg:0= ) |
| 251 |
- libav? ( >=media-video/libav-10:0= ) |
| 252 |
- ) |
| 253 |
+ vdpau? ( x11-libs/libvdpau:0 ) |
| 254 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
| 255 |
vorbis? ( media-libs/libvorbis:0 ) |
| 256 |
vpx? ( media-libs/libvpx:0= ) |
| 257 |
@@ -298,8 +281,6 @@ src_configure() { |
| 258 |
$(use_enable altivec) |
| 259 |
$(use_enable aom) |
| 260 |
$(use_enable archive) |
| 261 |
- $(use_enable avcodec) |
| 262 |
- $(use_enable avformat) |
| 263 |
$(use_enable bidi fribidi) |
| 264 |
$(use_enable bluray) |
| 265 |
$(use_enable cddb libcddb) |
| 266 |
@@ -307,9 +288,9 @@ src_configure() { |
| 267 |
$(use_enable chromecast) |
| 268 |
$(use_enable dbus) |
| 269 |
$(use_enable dbus kwallet) |
| 270 |
- $(use_enable directx) |
| 271 |
$(use_enable dc1394) |
| 272 |
$(use_enable debug) |
| 273 |
+ $(use_enable directx) |
| 274 |
$(use_enable dts dca) |
| 275 |
$(use_enable dvbpsi) |
| 276 |
$(use_enable dvd dvdnav) |
| 277 |
@@ -318,6 +299,9 @@ src_configure() { |
| 278 |
$(use_enable encode sout) |
| 279 |
$(use_enable faad) |
| 280 |
$(use_enable fdk fdkaac) |
| 281 |
+ $(use_enable ffmpeg avcodec) |
| 282 |
+ $(use_enable ffmpeg avformat) |
| 283 |
+ $(use_enable ffmpeg swscale) |
| 284 |
$(use_enable flac) |
| 285 |
$(use_enable fluidsynth) |
| 286 |
$(use_enable fontconfig) |
| 287 |
@@ -375,7 +359,6 @@ src_configure() { |
| 288 |
$(use_enable cpu_flags_x86_sse sse) |
| 289 |
$(use_enable svg) |
| 290 |
$(use_enable svg svgdec) |
| 291 |
- $(use_enable swscale) |
| 292 |
$(use_enable taglib) |
| 293 |
$(use_enable theora) |
| 294 |
$(use_enable tremor) |
Archives