media-video/vlc: Drop USE 10bit, update x264 minimum dep

Closes: https://bugs.gentoo.org/675536
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

3 files changed, 6 insertions, 23 deletions

diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 8a7aef8ab363..2c87fbf15408 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="10bit">Enable H264 10-bit encoding support with <pkg>media-libs/x264</pkg></flag>
 		<flag name="aom">Enable experimental support for AV1 codec</flag>
 		<flag name="archive">Enable support for libarchive stream extractor</flag>
 		<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 6ec92518e38f..7ef85d86eb35 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 622b0d9398ff..87447fb82505 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"