diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-02-18 20:02:37 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-02-18 21:25:36 +0100 |
| commit | fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21 (patch) | |
| tree | 047bf2cc0e4c7a0f00964a8bbd94a500e0b27d2d /media-video | |
| parent | media-video/vlc: Cleanup metadata.xml (diff) | |
| download | gentoo-fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21.tar.gz gentoo-fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21.tar.bz2 gentoo-fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21.zip | |
media-video/vlc: Merge USE=xcb,xv into X
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/vlc-3.0.9999.ebuild | 21 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 21 |
2 files changed, 20 insertions, 22 deletions
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 681a018df7a7..9555ba1a8401 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X - x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse + x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" aalib? ( X ) @@ -51,7 +51,6 @@ REQUIRED_USE=" ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) - xv? ( xcb ) " RDEPEND=" net-dns/libidn:0 @@ -200,14 +199,14 @@ RDEPEND=" dev-libs/wayland dev-libs/wayland-protocols ) - X? ( x11-libs/libX11:0 ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) - xcb? ( - x11-libs/libxcb:0 - x11-libs/xcb-util:0 - x11-libs/xcb-util-keysyms:0 - ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) @@ -217,7 +216,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - xcb? ( x11-proto/xproto:0 ) + X? ( x11-proto/xproto ) " PATCHES=( @@ -373,11 +372,11 @@ src_configure() { $(use_enable wayland) $(use_enable wma-fixed) $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) $(use_enable x264) $(use_enable x265) - $(use_enable xcb) $(use_enable xml libxml2) - $(use_enable xv xvideo) $(use_enable zeroconf avahi) $(use_enable zvbi) $(use_enable zvbi linsys) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 8617ea9e2a90..7b20cf9fba18 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -37,7 +37,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X - x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse + x264 x265 +xcb xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse " REQUIRED_USE=" aalib? ( X ) @@ -51,7 +51,6 @@ REQUIRED_USE=" ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) - xv? ( xcb ) " RDEPEND=" net-dns/libidn:0 @@ -200,14 +199,14 @@ RDEPEND=" dev-libs/wayland dev-libs/wayland-protocols ) - X? ( x11-libs/libX11:0 ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) - xcb? ( - x11-libs/libxcb:0 - x11-libs/xcb-util:0 - x11-libs/xcb-util-keysyms:0 - ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi:0 ) @@ -217,7 +216,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) - xcb? ( x11-proto/xproto:0 ) + X? ( x11-proto/xproto ) " PATCHES=( @@ -373,11 +372,11 @@ src_configure() { $(use_enable wayland) $(use_enable wma-fixed) $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) $(use_enable x264) $(use_enable x265) - $(use_enable xcb) $(use_enable xml libxml2) - $(use_enable xv xvideo) $(use_enable zeroconf avahi) $(use_enable zvbi) $(use_enable zvbi linsys) |