| 1 |
commit: 56bb745a7dfdf4bdbf340164f7bdca573e921b0f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 12 23:42:08 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 13 00:12:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bb745a |
| 7 |
|
| 8 |
media-video/vlc: 3.0.6 version bump, add USE 10bit,dav1d |
| 9 |
|
| 10 |
Fix media-sound/mpg123 automagic |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/669924 |
| 13 |
Closes: https://bugs.gentoo.org/675056 |
| 14 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 16 |
|
| 17 |
media-video/vlc/Manifest | 1 + |
| 18 |
media-video/vlc/metadata.xml | 2 ++ |
| 19 |
.../vlc/{vlc-3.0.9999.ebuild => vlc-3.0.6.ebuild} | 19 +++++++++++++------ |
| 20 |
media-video/vlc/vlc-3.0.9999.ebuild | 19 +++++++++++++------ |
| 21 |
media-video/vlc/vlc-9999.ebuild | 19 +++++++++++++------ |
| 22 |
5 files changed, 42 insertions(+), 18 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest |
| 25 |
index efd915c5fd9..87aa65fe793 100644 |
| 26 |
--- a/media-video/vlc/Manifest |
| 27 |
+++ b/media-video/vlc/Manifest |
| 28 |
@@ -1 +1,2 @@ |
| 29 |
DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 |
| 30 |
+DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 |
| 31 |
|
| 32 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
| 33 |
index 1e1da816671..8a7aef8ab36 100644 |
| 34 |
--- a/media-video/vlc/metadata.xml |
| 35 |
+++ b/media-video/vlc/metadata.xml |
| 36 |
@@ -6,12 +6,14 @@ |
| 37 |
<name>Gentoo Video project</name> |
| 38 |
</maintainer> |
| 39 |
<use> |
| 40 |
+ <flag name="10bit">Enable H264 10-bit encoding support with <pkg>media-libs/x264</pkg></flag> |
| 41 |
<flag name="aom">Enable experimental support for AV1 codec</flag> |
| 42 |
<flag name="archive">Enable support for libarchive stream extractor</flag> |
| 43 |
<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag> |
| 44 |
<flag name="bluray">Enable libbluray for Blu-ray disc support</flag> |
| 45 |
<flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag> |
| 46 |
<flag name="chromecast">Enable experimental support for Google Chromecast</flag> |
| 47 |
+ <flag name="dav1d">Enable support for <pkg>media-libs/dav1d</pkg> AV1 decoder</flag> |
| 48 |
<flag name="dc1394">Enable IIDC cameras support</flag> |
| 49 |
<flag name="directx">Enable Win32 DirectX, D3D11va and DxVA2 support</flag> |
| 50 |
<flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag> |
| 51 |
|
| 52 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.6.ebuild |
| 53 |
similarity index 95% |
| 54 |
copy from media-video/vlc/vlc-3.0.9999.ebuild |
| 55 |
copy to media-video/vlc/vlc-3.0.6.ebuild |
| 56 |
index 793f7690453..a42a129f841 100644 |
| 57 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 58 |
+++ b/media-video/vlc/vlc-3.0.6.ebuild |
| 59 |
@@ -1,4 +1,4 @@ |
| 60 |
-# Copyright 1999-2018 Gentoo Authors |
| 61 |
+# Copyright 1999-2019 Gentoo Authors |
| 62 |
# Distributed under the terms of the GNU General Public License v2 |
| 63 |
|
| 64 |
EAPI=6 |
| 65 |
@@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 66 |
LICENSE="LGPL-2.1 GPL-2" |
| 67 |
SLOT="0/5-9" # vlc - vlccore |
| 68 |
|
| 69 |
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus |
| 70 |
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
| 71 |
- fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass |
| 72 |
- libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 73 |
+IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 74 |
+ dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
| 75 |
+ fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 76 |
+ libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 77 |
macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 78 |
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 |
| 79 |
rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl |
| 80 |
@@ -75,6 +75,7 @@ RDEPEND=" |
| 81 |
>=dev-libs/protobuf-2.5.0:= |
| 82 |
>=net-libs/libmicrodns-0.0.9:= |
| 83 |
) |
| 84 |
+ dav1d? ( media-libs/dav1d ) |
| 85 |
dbus? ( sys-apps/dbus:0 ) |
| 86 |
dc1394? ( |
| 87 |
media-libs/libdc1394:2 |
| 88 |
@@ -211,7 +212,7 @@ RDEPEND=" |
| 89 |
x11-libs/xcb-util |
| 90 |
x11-libs/xcb-util-keysyms |
| 91 |
) |
| 92 |
- x264? ( media-libs/x264:0= ) |
| 93 |
+ x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) |
| 94 |
x265? ( media-libs/x265:0= ) |
| 95 |
xml? ( dev-libs/libxml2:2 ) |
| 96 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 97 |
@@ -418,6 +419,12 @@ src_configure() { |
| 98 |
) |
| 99 |
# ^ We don't have these disabled libraries in the Portage tree yet. |
| 100 |
|
| 101 |
+ if use x264; then |
| 102 |
+ myeconfargs+=( $(use_enable 10bit x26410b) ) |
| 103 |
+ else |
| 104 |
+ myeconfargs+=( --disable-x26410b ) |
| 105 |
+ fi |
| 106 |
+ |
| 107 |
# Compatibility fix for Samba 4. |
| 108 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
| 109 |
|
| 110 |
|
| 111 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 112 |
index 793f7690453..a42a129f841 100644 |
| 113 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 114 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 115 |
@@ -1,4 +1,4 @@ |
| 116 |
-# Copyright 1999-2018 Gentoo Authors |
| 117 |
+# Copyright 1999-2019 Gentoo Authors |
| 118 |
# Distributed under the terms of the GNU General Public License v2 |
| 119 |
|
| 120 |
EAPI=6 |
| 121 |
@@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 122 |
LICENSE="LGPL-2.1 GPL-2" |
| 123 |
SLOT="0/5-9" # vlc - vlccore |
| 124 |
|
| 125 |
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus |
| 126 |
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
| 127 |
- fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass |
| 128 |
- libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 129 |
+IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 130 |
+ dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
| 131 |
+ fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 132 |
+ libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 133 |
macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 134 |
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 |
| 135 |
rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl |
| 136 |
@@ -75,6 +75,7 @@ RDEPEND=" |
| 137 |
>=dev-libs/protobuf-2.5.0:= |
| 138 |
>=net-libs/libmicrodns-0.0.9:= |
| 139 |
) |
| 140 |
+ dav1d? ( media-libs/dav1d ) |
| 141 |
dbus? ( sys-apps/dbus:0 ) |
| 142 |
dc1394? ( |
| 143 |
media-libs/libdc1394:2 |
| 144 |
@@ -211,7 +212,7 @@ RDEPEND=" |
| 145 |
x11-libs/xcb-util |
| 146 |
x11-libs/xcb-util-keysyms |
| 147 |
) |
| 148 |
- x264? ( media-libs/x264:0= ) |
| 149 |
+ x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) |
| 150 |
x265? ( media-libs/x265:0= ) |
| 151 |
xml? ( dev-libs/libxml2:2 ) |
| 152 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 153 |
@@ -418,6 +419,12 @@ src_configure() { |
| 154 |
) |
| 155 |
# ^ We don't have these disabled libraries in the Portage tree yet. |
| 156 |
|
| 157 |
+ if use x264; then |
| 158 |
+ myeconfargs+=( $(use_enable 10bit x26410b) ) |
| 159 |
+ else |
| 160 |
+ myeconfargs+=( --disable-x26410b ) |
| 161 |
+ fi |
| 162 |
+ |
| 163 |
# Compatibility fix for Samba 4. |
| 164 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
| 165 |
|
| 166 |
|
| 167 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 168 |
index 0f094ec3e45..a2dda47b1dd 100644 |
| 169 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 170 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 171 |
@@ -1,4 +1,4 @@ |
| 172 |
-# Copyright 1999-2018 Gentoo Authors |
| 173 |
+# Copyright 1999-2019 Gentoo Authors |
| 174 |
# Distributed under the terms of the GNU General Public License v2 |
| 175 |
|
| 176 |
EAPI=6 |
| 177 |
@@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/" |
| 178 |
LICENSE="LGPL-2.1 GPL-2" |
| 179 |
SLOT="0/5-9" # vlc - vlccore |
| 180 |
|
| 181 |
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dbus |
| 182 |
- dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
| 183 |
- fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass |
| 184 |
- libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 185 |
+IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 186 |
+ dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac |
| 187 |
+ fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms |
| 188 |
+ libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
| 189 |
macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 190 |
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 |
| 191 |
rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl |
| 192 |
@@ -75,6 +75,7 @@ RDEPEND=" |
| 193 |
>=dev-libs/protobuf-2.5.0:= |
| 194 |
>=net-libs/libmicrodns-0.0.9:= |
| 195 |
) |
| 196 |
+ dav1d? ( media-libs/dav1d ) |
| 197 |
dbus? ( sys-apps/dbus:0 ) |
| 198 |
dc1394? ( |
| 199 |
media-libs/libdc1394:2 |
| 200 |
@@ -214,7 +215,7 @@ RDEPEND=" |
| 201 |
x11-libs/xcb-util |
| 202 |
x11-libs/xcb-util-keysyms |
| 203 |
) |
| 204 |
- x264? ( media-libs/x264:0= ) |
| 205 |
+ x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) |
| 206 |
x265? ( media-libs/x265:0= ) |
| 207 |
xml? ( dev-libs/libxml2:2 ) |
| 208 |
zeroconf? ( net-dns/avahi:0[dbus] ) |
| 209 |
@@ -419,6 +420,12 @@ src_configure() { |
| 210 |
) |
| 211 |
# ^ We don't have these disabled libraries in the Portage tree yet. |
| 212 |
|
| 213 |
+ if use x264; then |
| 214 |
+ myeconfargs+=( $(use_enable 10bit x26410b) ) |
| 215 |
+ else |
| 216 |
+ myeconfargs+=( --disable-x26410b ) |
| 217 |
+ fi |
| 218 |
+ |
| 219 |
# Compatibility fix for Samba 4. |
| 220 |
use samba && append-cppflags "-I/usr/include/samba-4.0" |
Archives