| 1 |
commit: 1ed4107fc8f76bf52a34a3153a44e9c8e6439895 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 15 12:53:18 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 15 12:53:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed4107f |
| 7 |
|
| 8 |
media-video/vlc: Drop USE 10bit, update x264 minimum dep |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/675536 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
media-video/vlc/metadata.xml | 1 - |
| 15 |
media-video/vlc/vlc-3.0.9999.ebuild | 14 +++----------- |
| 16 |
media-video/vlc/vlc-9999.ebuild | 14 +++----------- |
| 17 |
3 files changed, 6 insertions(+), 23 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
| 20 |
index 8a7aef8ab36..2c87fbf1540 100644 |
| 21 |
--- a/media-video/vlc/metadata.xml |
| 22 |
+++ b/media-video/vlc/metadata.xml |
| 23 |
@@ -6,7 +6,6 @@ |
| 24 |
<name>Gentoo Video project</name> |
| 25 |
</maintainer> |
| 26 |
<use> |
| 27 |
- <flag name="10bit">Enable H264 10-bit encoding support with <pkg>media-libs/x264</pkg></flag> |
| 28 |
<flag name="aom">Enable experimental support for AV1 codec</flag> |
| 29 |
<flag name="archive">Enable support for libarchive stream extractor</flag> |
| 30 |
<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag> |
| 31 |
|
| 32 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 33 |
index 6ec92518e38..7ef85d86eb3 100644 |
| 34 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 35 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 36 |
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 37 |
LICENSE="LGPL-2.1 GPL-2" |
| 38 |
SLOT="0/5-9" # vlc - vlccore |
| 39 |
|
| 40 |
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 41 |
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 42 |
dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
| 43 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 44 |
libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 45 |
@@ -218,10 +218,7 @@ RDEPEND=" |
| 46 |
x11-libs/xcb-util |
| 47 |
x11-libs/xcb-util-keysyms |
| 48 |
) |
| 49 |
- x264? ( |
| 50 |
- !10bit? ( >=media-libs/x264-0.0.20160712:= ) |
| 51 |
- 10bit? ( >=media-libs/x264-9999:= ) |
| 52 |
- ) |
| 53 |
+ x264? ( >=media-libs/x264-0.0.20190214:= ) |
| 54 |
x265? ( media-libs/x265:= ) |
| 55 |
xml? ( dev-libs/libxml2:2 ) |
| 56 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 57 |
@@ -392,6 +389,7 @@ src_configure() { |
| 58 |
$(use_enable X xcb) |
| 59 |
$(use_enable X xvideo) |
| 60 |
$(use_enable x264) |
| 61 |
+ $(use_enable x264 x26410b) |
| 62 |
$(use_enable x265) |
| 63 |
$(use_enable xml libxml2) |
| 64 |
$(use_enable zeroconf avahi) |
| 65 |
@@ -424,12 +422,6 @@ src_configure() { |
| 66 |
) |
| 67 |
# ^ We don't have these disabled libraries in the Portage tree yet. |
| 68 |
|
| 69 |
- if use x264; then |
| 70 |
- myeconfargs+=( $(use_enable 10bit x26410b) ) |
| 71 |
- else |
| 72 |
- myeconfargs+=( --disable-x26410b ) |
| 73 |
- fi |
| 74 |
- |
| 75 |
# Compatibility fix for Samba 4. |
| 76 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 80 |
index 622b0d9398f..87447fb8250 100644 |
| 81 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 82 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 83 |
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 84 |
LICENSE="LGPL-2.1 GPL-2" |
| 85 |
SLOT="0/5-9" # vlc - vlccore |
| 86 |
|
| 87 |
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 88 |
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 89 |
dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
| 90 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms |
| 91 |
libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 92 |
@@ -221,10 +221,7 @@ RDEPEND=" |
| 93 |
x11-libs/xcb-util |
| 94 |
x11-libs/xcb-util-keysyms |
| 95 |
) |
| 96 |
- x264? ( |
| 97 |
- !10bit? ( >=media-libs/x264-0.0.20160712:= ) |
| 98 |
- 10bit? ( >=media-libs/x264-9999:= ) |
| 99 |
- ) |
| 100 |
+ x264? ( >=media-libs/x264-0.0.20190214:= ) |
| 101 |
x265? ( media-libs/x265:= ) |
| 102 |
xml? ( dev-libs/libxml2:2 ) |
| 103 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 104 |
@@ -393,6 +390,7 @@ src_configure() { |
| 105 |
$(use_with X x) |
| 106 |
$(use_enable X xcb) |
| 107 |
$(use_enable x264) |
| 108 |
+ $(use_enable x264 x26410b) |
| 109 |
$(use_enable x265) |
| 110 |
$(use_enable xml libxml2) |
| 111 |
$(use_enable zeroconf avahi) |
| 112 |
@@ -425,12 +423,6 @@ src_configure() { |
| 113 |
) |
| 114 |
# ^ We don't have these disabled libraries in the Portage tree yet. |
| 115 |
|
| 116 |
- if use x264; then |
| 117 |
- myeconfargs+=( $(use_enable 10bit x26410b) ) |
| 118 |
- else |
| 119 |
- myeconfargs+=( --disable-x26410b ) |
| 120 |
- fi |
| 121 |
- |
| 122 |
# Compatibility fix for Samba 4. |
| 123 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
Archives