| 1 |
commit: fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 18 19:02:37 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 18 20:25:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8295b7 |
| 7 |
|
| 8 |
media-video/vlc: Merge USE=xcb,xv into X |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
media-video/vlc/vlc-3.0.9999.ebuild | 21 ++++++++++----------- |
| 13 |
media-video/vlc/vlc-9999.ebuild | 21 ++++++++++----------- |
| 14 |
2 files changed, 20 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 17 |
index 681a018df7a..9555ba1a840 100644 |
| 18 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 19 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 20 |
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast |
| 21 |
opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 22 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 23 |
truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X |
| 24 |
- x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 25 |
+ x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 26 |
" |
| 27 |
REQUIRED_USE=" |
| 28 |
aalib? ( X ) |
| 29 |
@@ -51,7 +51,6 @@ REQUIRED_USE=" |
| 30 |
ssl? ( gcrypt ) |
| 31 |
vaapi? ( ffmpeg X ) |
| 32 |
vdpau? ( ffmpeg X ) |
| 33 |
- xv? ( xcb ) |
| 34 |
" |
| 35 |
RDEPEND=" |
| 36 |
net-dns/libidn:0 |
| 37 |
@@ -200,14 +199,14 @@ RDEPEND=" |
| 38 |
dev-libs/wayland |
| 39 |
dev-libs/wayland-protocols |
| 40 |
) |
| 41 |
- X? ( x11-libs/libX11:0 ) |
| 42 |
+ X? ( |
| 43 |
+ x11-libs/libX11 |
| 44 |
+ x11-libs/libxcb |
| 45 |
+ x11-libs/xcb-util |
| 46 |
+ x11-libs/xcb-util-keysyms |
| 47 |
+ ) |
| 48 |
x264? ( media-libs/x264:0= ) |
| 49 |
x265? ( media-libs/x265:0= ) |
| 50 |
- xcb? ( |
| 51 |
- x11-libs/libxcb:0 |
| 52 |
- x11-libs/xcb-util:0 |
| 53 |
- x11-libs/xcb-util-keysyms:0 |
| 54 |
- ) |
| 55 |
xml? ( dev-libs/libxml2:2 ) |
| 56 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 57 |
zvbi? ( media-libs/zvbi:0 ) |
| 58 |
@@ -217,7 +216,7 @@ DEPEND="${RDEPEND} |
| 59 |
virtual/pkgconfig:* |
| 60 |
amd64? ( dev-lang/yasm:* ) |
| 61 |
x86? ( dev-lang/yasm:* ) |
| 62 |
- xcb? ( x11-proto/xproto:0 ) |
| 63 |
+ X? ( x11-proto/xproto ) |
| 64 |
" |
| 65 |
|
| 66 |
PATCHES=( |
| 67 |
@@ -373,11 +372,11 @@ src_configure() { |
| 68 |
$(use_enable wayland) |
| 69 |
$(use_enable wma-fixed) |
| 70 |
$(use_with X x) |
| 71 |
+ $(use_enable X xcb) |
| 72 |
+ $(use_enable X xvideo) |
| 73 |
$(use_enable x264) |
| 74 |
$(use_enable x265) |
| 75 |
- $(use_enable xcb) |
| 76 |
$(use_enable xml libxml2) |
| 77 |
- $(use_enable xv xvideo) |
| 78 |
$(use_enable zeroconf avahi) |
| 79 |
$(use_enable zvbi) |
| 80 |
$(use_enable zvbi linsys) |
| 81 |
|
| 82 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 83 |
index 8617ea9e2a9..7b20cf9fba1 100644 |
| 84 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 85 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 86 |
@@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast |
| 87 |
opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root |
| 88 |
samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor |
| 89 |
truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X |
| 90 |
- x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 91 |
+ x264 x265 +xcb xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
| 92 |
" |
| 93 |
REQUIRED_USE=" |
| 94 |
aalib? ( X ) |
| 95 |
@@ -51,7 +51,6 @@ REQUIRED_USE=" |
| 96 |
ssl? ( gcrypt ) |
| 97 |
vaapi? ( ffmpeg X ) |
| 98 |
vdpau? ( ffmpeg X ) |
| 99 |
- xv? ( xcb ) |
| 100 |
" |
| 101 |
RDEPEND=" |
| 102 |
net-dns/libidn:0 |
| 103 |
@@ -200,14 +199,14 @@ RDEPEND=" |
| 104 |
dev-libs/wayland |
| 105 |
dev-libs/wayland-protocols |
| 106 |
) |
| 107 |
- X? ( x11-libs/libX11:0 ) |
| 108 |
+ X? ( |
| 109 |
+ x11-libs/libX11 |
| 110 |
+ x11-libs/libxcb |
| 111 |
+ x11-libs/xcb-util |
| 112 |
+ x11-libs/xcb-util-keysyms |
| 113 |
+ ) |
| 114 |
x264? ( media-libs/x264:0= ) |
| 115 |
x265? ( media-libs/x265:0= ) |
| 116 |
- xcb? ( |
| 117 |
- x11-libs/libxcb:0 |
| 118 |
- x11-libs/xcb-util:0 |
| 119 |
- x11-libs/xcb-util-keysyms:0 |
| 120 |
- ) |
| 121 |
xml? ( dev-libs/libxml2:2 ) |
| 122 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 123 |
zvbi? ( media-libs/zvbi:0 ) |
| 124 |
@@ -217,7 +216,7 @@ DEPEND="${RDEPEND} |
| 125 |
virtual/pkgconfig:* |
| 126 |
amd64? ( dev-lang/yasm:* ) |
| 127 |
x86? ( dev-lang/yasm:* ) |
| 128 |
- xcb? ( x11-proto/xproto:0 ) |
| 129 |
+ X? ( x11-proto/xproto ) |
| 130 |
" |
| 131 |
|
| 132 |
PATCHES=( |
| 133 |
@@ -373,11 +372,11 @@ src_configure() { |
| 134 |
$(use_enable wayland) |
| 135 |
$(use_enable wma-fixed) |
| 136 |
$(use_with X x) |
| 137 |
+ $(use_enable X xcb) |
| 138 |
+ $(use_enable X xvideo) |
| 139 |
$(use_enable x264) |
| 140 |
$(use_enable x265) |
| 141 |
- $(use_enable xcb) |
| 142 |
$(use_enable xml libxml2) |
| 143 |
- $(use_enable xv xvideo) |
| 144 |
$(use_enable zeroconf avahi) |
| 145 |
$(use_enable zvbi) |
| 146 |
$(use_enable zvbi linsys) |
Archives