From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 215AA138331 for ; Sun, 18 Feb 2018 20:28:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64101E0D60; Sun, 18 Feb 2018 20:28:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37144E0D60 for ; Sun, 18 Feb 2018 20:28:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B4E36335C4D for ; Sun, 18 Feb 2018 20:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E4D421D for ; Sun, 18 Feb 2018 20:28:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518985536.fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-3.0.9999.ebuild media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21 X-VCS-Branch: master Date: Sun, 18 Feb 2018 20:28:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1824c363-e306-4a36-99d4-a3ba7cf61a7d X-Archives-Hash: 9a60f71d181e52854960d988ba22e0fb commit: fb8295b7cb6d3e17d4ee6d1e580fef13a7acec21 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 18 19:02:37 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 18 20:25:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8295b7 media-video/vlc: Merge USE=xcb,xv into X Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/vlc/vlc-3.0.9999.ebuild | 21 ++++++++++----------- 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 681a018df7a..9555ba1a840 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 8617ea9e2a9..7b20cf9fba1 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)