gentoo resync : 18.05.2019

4 files changed, 21 insertions, 19 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 081ec2d64c91..46489cb2a9dc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,6 +8,6 @@ AUX vlc-3.0.6-sftp.patch 979 BLAKE2B b6fd797112363e5fb0f0721eeeb92ee7b5c9a9e1a94
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 EBUILD vlc-3.0.6-r1.ebuild 13301 BLAKE2B 95b183dc8fcc8c0cacd16f9bb6bba7f16663d3a7ffd9dd359d5c8ea3fcc955d550bed2fb7417b5bd688f14c538b5342ff2886f49fb3a241e431d31b53faeb653 SHA512 f96776595823e4b78fed4199db5105855ae501957c555e9521f6d32c2a3bcf9a30019c7b6c9d985a2471ca201522d6ea0b65f5688a7840c7dde93dd0737a58e4
-EBUILD vlc-3.0.9999.ebuild 13014 BLAKE2B cefc6ab4fac4902ee210f26f4b4bd7919c61e1764c25824d20b40b90c46d7ec2e4da4ebc41f41b021f2fdd39488bb129b11c00787e740e4a9a724b8a8bbf23ba SHA512 41bcedf86ca854268e6328afc7532e353b405e7dbff39449ec4558d8755e9c14ed2fb6398c8b393128b9271480ef43559c55258a797a783ad89d76ed551d6064
-EBUILD vlc-9999.ebuild 12998 BLAKE2B 9cc1400f50f3be3f50a45ee6b87a1f4e4f286b52c15e08e34008d8ea05d0eab9b6c12a53ce11559244fe49b51680d2a3af37d32e9b6d02bbb7d704e5bb3045e8 SHA512 dc001948da9bbc1685418c31c8a510a767567a0fb40db76a91f3b532a4e18c3d73542ac07625024d2f73c2abb4113562b8b6f474438985dfefc32fdc711ddf6f
-MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
+EBUILD vlc-3.0.9999.ebuild 13114 BLAKE2B 69b985686f741088f062fe91fdf020006ff19a7972313cba56ff2bcce9d248fd82050dbbd00fa8b67167e587d72e415840c077986e49288ca57cd9550021870b SHA512 3c3ec68976cf4c2a5365f6a88d614b4ffbdd4621f076e9d6caf569315d70a7f848bd5b48edf0dc53be204e60e9c1f64a40ba56143ef48b338e67f0f131fac1bc
+EBUILD vlc-9999.ebuild 12982 BLAKE2B 03b9cf07362f3ec5b144164f870b79f7f20f35dbb396b4d2de738c8a2f9622d3c278b85efc79d13baf0dd6777be8e68430bf6b82314419fbe2b12d2542e8bd5b SHA512 ad5b89f132626ef54c0ee0bd78aeeb0625d3249ea6ebe065ddd5561c187fd812002f969a9c86bf64b995cd66ff42dbcde5dc8984798c753c08ab442c6a431e00
+MISC metadata.xml 5087 BLAKE2B 57254aa856882b33eb97358623d2600cb07e30d1554316de645d808f1bb6a7442cfb3b3fe6422f5de72dcadab06fbae28aa2c7b1d88d8fa588472de76d20fa23 SHA512 eb14beac4431445a8920190edac1a2a0b818565dc352b5df1e05dcddd4ff15a817e2624bce66a6aea431fa17b2203732bb9165396528e9a13c5dafacfce39274
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 2c87fbf15408..f9ee39a780e3 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag>
 		<flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag>
 		<flag name="kms">Enable kernel mode setting video output plugin via <pkg>x11-libs/libdrm</pkg></flag>
+		<flag name="libplacebo">Enable support for GPU accelerated video rendering with <pkg>media-libs/libplacebo</pkg></flag>
 		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag>
 		<flag name="libtiger">Enable Ogg Kate subtitles rendering using libtiger</flag>
 		<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index d76f7c6455ad..0409bef20e62 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -32,12 +32,12 @@ SLOT="0/5-9" # vlc - vlccore
 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
-	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
+	libass libav libcaca libnotify libplacebo +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
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -130,6 +130,7 @@ RDEPEND="
 		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
+	libplacebo? ( media-libs/libplacebo )
 	libsamplerate? ( media-libs/libsamplerate )
 	libtar? ( dev-libs/libtar )
 	libtiger? ( media-libs/libtiger )
@@ -231,6 +232,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -328,6 +330,7 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libcaca caca)
 		$(use_enable libnotify notify)
+		$(use_enable libplacebo)
 		$(use_enable libsamplerate samplerate)
 		$(use_enable libtar)
 		$(use_enable libtiger tiger)
@@ -384,7 +387,6 @@ src_configure() {
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
-		$(use_enable wma-fixed)
 		$(use_with X x)
 		$(use_enable X xcb)
 		$(use_enable X xvideo)
@@ -405,7 +407,6 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
-		--disable-libplacebo
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx
@@ -419,6 +420,7 @@ src_configure() {
 		--disable-spatialaudio
 		--disable-vsxu
 		--disable-wasapi
+		--disable-wma-fixed
 	)
 	# ^ We don't have these disabled libraries in the Portage tree yet.
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a3d4b0a05170..092e9f812b31 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -32,12 +32,12 @@ SLOT="0/12-9" # vlc - vlccore
 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
-	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
+	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications 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
 	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -131,6 +131,7 @@ RDEPEND="
 		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
+	libplacebo? ( media-libs/libplacebo )
 	libsamplerate? ( media-libs/libsamplerate )
 	libtar? ( dev-libs/libtar )
 	libtiger? ( media-libs/libtiger )
@@ -186,7 +187,7 @@ RDEPEND="
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
 	)
-	srt? ( net-libs/srt )
+	srt? ( >=net-libs/srt-1.3.0 )
 	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
@@ -331,6 +332,7 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libcaca caca)
 		$(use_enable libnotify notify)
+		$(use_enable libplacebo)
 		$(use_enable libsamplerate samplerate)
 		$(use_enable libtar)
 		$(use_enable libtiger tiger)
@@ -339,7 +341,6 @@ src_configure() {
 		$(use_enable live live555)
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable macosx-qtkit)
 		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
@@ -386,7 +387,6 @@ src_configure() {
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
-		$(use_enable wma-fixed)
 		$(use_with X x)
 		$(use_enable X xcb)
 		$(use_enable x264)
@@ -406,7 +406,6 @@ src_configure() {
 		--disable-goom
 		--disable-kai
 		--disable-kva
-		--disable-libplacebo
 		--disable-maintainer-mode
 		--disable-merge-ffmpeg
 		--disable-mfx