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 6B288138334 for ; Fri, 15 Feb 2019 12:54:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EDAFE08E5; Fri, 15 Feb 2019 12:54:03 +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 62326E08E5 for ; Fri, 15 Feb 2019 12:54:03 +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 98CAE335CCF for ; Fri, 15 Feb 2019 12:54:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E96FC543 for ; Fri, 15 Feb 2019 12:53:59 +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: <1550235198.1ed4107fc8f76bf52a34a3153a44e9c8e6439895.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: 1ed4107fc8f76bf52a34a3153a44e9c8e6439895 X-VCS-Branch: master Date: Fri, 15 Feb 2019 12:53:59 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22529045-9e13-40f4-95d7-39caac96d169 X-Archives-Hash: 74a7c2cd2ce9ddb14a6fcc1a936bbe99 commit: 1ed4107fc8f76bf52a34a3153a44e9c8e6439895 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 15 12:53:18 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 15 12:53:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed4107f media-video/vlc: Drop USE 10bit, update x264 minimum dep Closes: https://bugs.gentoo.org/675536 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-video/vlc/metadata.xml | 1 - media-video/vlc/vlc-3.0.9999.ebuild | 14 +++----------- media-video/vlc/vlc-9999.ebuild | 14 +++----------- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 8a7aef8ab36..2c87fbf1540 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -6,7 +6,6 @@ Gentoo Video project - Enable H264 10-bit encoding support with media-libs/x264 Enable experimental support for AV1 codec Enable support for libarchive stream extractor Enable support for decoding ARIB STD-B24 subtitles diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 6ec92518e38..7ef85d86eb3 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast +IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d 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 linsys lirc live lua @@ -218,10 +218,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( - !10bit? ( >=media-libs/x264-0.0.20160712:= ) - 10bit? ( >=media-libs/x264-9999:= ) - ) + x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) @@ -392,6 +389,7 @@ src_configure() { $(use_enable X xcb) $(use_enable X xvideo) $(use_enable x264) + $(use_enable x264 x26410b) $(use_enable x265) $(use_enable xml libxml2) $(use_enable zeroconf avahi) @@ -424,12 +422,6 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. - if use x264; then - myeconfargs+=( $(use_enable 10bit x26410b) ) - else - myeconfargs+=( --disable-x26410b ) - fi - # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0" diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 622b0d9398f..87447fb8250 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/" LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast +IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua @@ -221,10 +221,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( - !10bit? ( >=media-libs/x264-0.0.20160712:= ) - 10bit? ( >=media-libs/x264-9999:= ) - ) + x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) @@ -393,6 +390,7 @@ src_configure() { $(use_with X x) $(use_enable X xcb) $(use_enable x264) + $(use_enable x264 x26410b) $(use_enable x265) $(use_enable xml libxml2) $(use_enable zeroconf avahi) @@ -425,12 +423,6 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. - if use x264; then - myeconfargs+=( $(use_enable 10bit x26410b) ) - else - myeconfargs+=( --disable-x26410b ) - fi - # Compatibility fix for Samba 4. use samba && append-cppflags "-I/usr/include/samba-4.0"