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 C68BC138331 for ; Sun, 18 Feb 2018 20:28:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D446E0D17; Sun, 18 Feb 2018 20:28:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4A056E0D17 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 A5C4C335C4C 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 DA8611C5 for ; Sun, 18 Feb 2018 20:28:29 +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.63138dbd5b44df097d6a3ebbb217e2887a9652c3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/metadata.xml 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: 63138dbd5b44df097d6a3ebbb217e2887a9652c3 X-VCS-Branch: master Date: Sun, 18 Feb 2018 20:28:29 +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: ea0fc137-008a-4cab-93a9-a2e86c5adf75 X-Archives-Hash: 180ed8554229513d74853ef44cd013cb commit: 63138dbd5b44df097d6a3ebbb217e2887a9652c3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 18 18:12:58 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=63138dbd media-video/vlc: Merge USE=vlm into encode Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/vlc/metadata.xml | 1 + media-video/vlc/vlc-3.0.9999.ebuild | 5 ++--- media-video/vlc/vlc-9999.ebuild | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index d3e880287a2..36f275345fd 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -19,6 +19,7 @@ Enable Win32 DirectX support. Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via media-libs/libdvbpsi. Enables Win32 DxVA2 support. + Enable streaming-output support and videolan manager to control multiple streams from within one instance Enable AAC audio decoding library support via media-libs/faad2. Enables the Fraunhofer AAC codec library. Enables Fluidsynth MIDI software synthesis (with external sound fonts). diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index ed51905a841..681a018df7a 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv 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 vlm vnc vorbis vpx wayland wma-fixed +X + 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 " REQUIRED_USE=" @@ -51,7 +51,6 @@ REQUIRED_USE=" ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) - vlm? ( encode ) xv? ( xcb ) " RDEPEND=" @@ -297,6 +296,7 @@ src_configure() { $(use_enable dvd dvdnav) $(use_enable dvd dvdread) $(use_enable encode sout) + $(use_enable encode vlm) $(use_enable faad) $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) @@ -367,7 +367,6 @@ src_configure() { $(use_enable vaapi libva) $(use_enable vcd) $(use_enable vdpau) - $(use_enable vlm) $(use_enable vnc) $(use_enable vorbis) $(use_enable vpx) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 7e218689a97..8617ea9e2a9 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -36,7 +36,7 @@ IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv 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 vlm vnc vorbis vpx wayland wma-fixed +X + 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 " REQUIRED_USE=" @@ -51,7 +51,6 @@ REQUIRED_USE=" ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X ) - vlm? ( encode ) xv? ( xcb ) " RDEPEND=" @@ -297,6 +296,7 @@ src_configure() { $(use_enable dvd dvdnav) $(use_enable dvd dvdread) $(use_enable encode sout) + $(use_enable encode vlm) $(use_enable faad) $(use_enable fdk fdkaac) $(use_enable ffmpeg avcodec) @@ -367,7 +367,6 @@ src_configure() { $(use_enable vaapi libva) $(use_enable vcd) $(use_enable vdpau) - $(use_enable vlm) $(use_enable vnc) $(use_enable vorbis) $(use_enable vpx)