commit: 56bb745a7dfdf4bdbf340164f7bdca573e921b0f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 12 23:42:08 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 13 00:12:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bb745a
media-video/vlc: 3.0.6 version bump, add USE 10bit,dav1d Fix media-sound/mpg123 automagic Bug: https://bugs.gentoo.org/669924 Closes: https://bugs.gentoo.org/675056 Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/vlc/Manifest | 1 + media-video/vlc/metadata.xml | 2 ++ .../vlc/{vlc-3.0.9999.ebuild => vlc-3.0.6.ebuild} | 19 +++++++++++++------ media-video/vlc/vlc-3.0.9999.ebuild | 19 +++++++++++++------ media-video/vlc/vlc-9999.ebuild | 19 +++++++++++++------ 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index efd915c5fd9..87aa65fe793 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1 +1,2 @@ DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 +DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml index 1e1da816671..8a7aef8ab36 100644 --- a/media-video/vlc/metadata.xml +++ b/media-video/vlc/metadata.xml @@ -6,12 +6,14 @@ <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> <flag name="bluray">Enable libbluray for Blu-ray disc support</flag> <flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag> <flag name="chromecast">Enable experimental support for Google Chromecast</flag> + <flag name="dav1d">Enable support for <pkg>media-libs/dav1d</pkg> AV1 decoder</flag> <flag name="dc1394">Enable IIDC cameras support</flag> <flag name="directx">Enable Win32 DirectX, D3D11va and DxVA2 support</flag> <flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag> diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.6.ebuild similarity index 95% copy from media-video/vlc/vlc-3.0.9999.ebuild copy to media-video/vlc/vlc-3.0.6.ebuild index 793f7690453..a42a129f841 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast 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 +IUSE="10bit 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 macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl @@ -75,6 +75,7 @@ RDEPEND=" >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) + dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 @@ -211,7 +212,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( media-libs/x264:0= ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) @@ -418,6 +419,12 @@ 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-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 793f7690453..a42a129f841 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast 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 +IUSE="10bit 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 macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl @@ -75,6 +75,7 @@ RDEPEND=" >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) + dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 @@ -211,7 +212,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( media-libs/x264:0= ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) @@ -418,6 +419,12 @@ 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 0f094ec3e45..a2dda47b1dd 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,10 +29,10 @@ HOMEPAGE="https://www.videolan.org/vlc/"; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5-9" # vlc - vlccore -IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast 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 +IUSE="10bit 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 macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl @@ -75,6 +75,7 @@ RDEPEND=" >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) + dav1d? ( media-libs/dav1d ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 @@ -214,7 +215,7 @@ RDEPEND=" x11-libs/xcb-util x11-libs/xcb-util-keysyms ) - x264? ( media-libs/x264:0= ) + x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) @@ -419,6 +420,12 @@ 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"
