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 401DE1382C5 for ; Mon, 19 Feb 2018 06:44:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E393E0B19; Mon, 19 Feb 2018 06:44:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E3335E0B14 for ; Mon, 19 Feb 2018 06:44:29 +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 778F2335C0C for ; Mon, 19 Feb 2018 06:44:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 929F3215 for ; Mon, 19 Feb 2018 06:44:26 +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: <1519022632.e61257df8c74213cdb9cb10594d605cae71c4899.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: e61257df8c74213cdb9cb10594d605cae71c4899 X-VCS-Branch: master Date: Mon, 19 Feb 2018 06:44:26 +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: 0eb35621-e1d3-4d63-8d70-037a57f4e40f X-Archives-Hash: 830f986b4e66754b15b4022f27836690 commit: e61257df8c74213cdb9cb10594d605cae71c4899 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 19 00:51:10 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 19 06:43:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61257df media-video/vlc: Revert drop USE=linsys, merge with USE=zvbi Let's keep the hardware support independent, as it can be used without USE=zvbi which selects between two different vlc modules. media-video/vlc/vlc-3.0.9999.ebuild | 11 ++++++----- media-video/vlc/vlc-9999.ebuild | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index b2011356705..74239039af5 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -30,9 +30,9 @@ LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus - dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth - fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav - libcaca libnotify +libsamplerate libtar libtiger lirc live lua macosx-notifications + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig + +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv 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 @@ -119,6 +119,7 @@ RDEPEND=" libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) + linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) @@ -206,7 +207,7 @@ RDEPEND=" x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) - zvbi? ( media-libs/zvbi:0 ) + zvbi? ( media-libs/zvbi ) " DEPEND="${RDEPEND} >=sys-devel/gettext-0.19.8:* @@ -315,6 +316,7 @@ src_configure() { $(use_enable libsamplerate samplerate) $(use_enable libtar) $(use_enable libtiger tiger) + $(use_enable linsys) $(use_enable lirc) $(use_enable live live555) $(use_enable lua) @@ -376,7 +378,6 @@ src_configure() { $(use_enable xml libxml2) $(use_enable zeroconf avahi) $(use_enable zvbi) - $(use_enable zvbi linsys) $(use_enable !zvbi telx) --disable-asdcp --disable-coverage diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index bfe872bbf4b..5ba1166a4d5 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -30,14 +30,14 @@ LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus - dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth - fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav - libcaca libnotify +libsamplerate libtar libtiger lirc live lua macosx-notifications + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig + +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca + libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv 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 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 ) @@ -119,6 +119,7 @@ RDEPEND=" libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) + linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) @@ -206,7 +207,7 @@ RDEPEND=" x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) - zvbi? ( media-libs/zvbi:0 ) + zvbi? ( media-libs/zvbi ) " DEPEND="${RDEPEND} >=sys-devel/gettext-0.19.8:* @@ -315,6 +316,7 @@ src_configure() { $(use_enable libsamplerate samplerate) $(use_enable libtar) $(use_enable libtiger tiger) + $(use_enable linsys) $(use_enable lirc) $(use_enable live live555) $(use_enable lua) @@ -376,7 +378,6 @@ src_configure() { $(use_enable xml libxml2) $(use_enable zeroconf avahi) $(use_enable zvbi) - $(use_enable zvbi linsys) $(use_enable !zvbi telx) --disable-asdcp --disable-coverage