gentoo resync : 03.03.2019

5 files changed, 210 insertions, 73 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0cfaeca08ef9..548f80cd957e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,11 +2,14 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
+AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
+AUX vlc-3.0.6-libav.patch 547 BLAKE2B bff54855b61b7bc29fe50203a08c19b04d037e21f8ef337e6ea78eaad8a655e5e2f8fc38278536335e52adc8d8017ea4b2e9ab1fb716ff58c58e972dfac5b45e SHA512 2b5fb815e3d91971a3566830d24abcab27d7aed9b176212166e7806b99c4387727ae912707ad2d21346c90e84b1d489b0e458c7c3053f8dc40f5f4a55e563be9
+AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa521b51a85b8d9a8288c46d059d79f6656cd7958c3003662a9c90599812dc7320781589c554ce2bf44c93c665297f6955 SHA512 bb57ec249174af38b657e2d48728de32998b74a58df3bbcaa17bf5c48338256370066247b278341e92a3116d0f56310cdea6d521c11c3380d39827449056ade3
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 EBUILD vlc-3.0.4.ebuild 13153 BLAKE2B 19afd631bdbc5ec35e6a3684fd767e3530c598da299a08826c4502956b093d38b49dba2b9667095a108044501967708e0e28939750a940e31f9b6878e3f208da SHA512 990a9bad72762e3f692901f3729df394473392d0929f23f5914838863fa096cfbf8ca48e9c2e57a9df708f11c5954be6ed1d799a5d729ca2333d19ea135515c2
-EBUILD vlc-3.0.6.ebuild 13326 BLAKE2B 31af51a630d141bec92c6feb0276973e3fd957c2bacc290099ece72a447ed465701f7de533dbe0736e61e599e0e63166b5c7c902f3ac2fe7bf22e55d9f3a5ecf SHA512 77bd3bc9830877f93593ebd186511d12ca65eab98b1576b991d74cf0e3a8fb451d2e332697e8551e2e48c2bfa99fd41a667d0cbc2cc6ca593d68ae233cc3da5e
+EBUILD vlc-3.0.6-r1.ebuild 13329 BLAKE2B aed7c68f1192ecbce79c08a2baae396c66388ca839679db47b47785d357eb028b7f6e55ca93099a626d31375852b315d9ac91e93e9fbf0bae4de7ff0bde58823 SHA512 2ad9048a04e93f0043530daefc4a6f63ad2de92eae4c5afcb10d6f489b3731af76b0553c8778766cb6a7f7757c1ddcea14ba014a69e7f795ede5f761a3805fac
 EBUILD vlc-3.0.9999.ebuild 13072 BLAKE2B c4c50147f95acfa560900430bd8bd044830bc65807084a44224b9523a79aa33078f80f9eadb34ab55d77f25f94da39b11426b81c834f4137633053d8bd0fa0b6 SHA512 6c6ea778f55099774d5013d5f049b15c0eaf0c3adf42a065bcd38e87d12f783f566b41e4f3a2344a13a9008fb2a40742ce446f25714dd20f3e54b31135c8779a
 EBUILD vlc-9999.ebuild 13055 BLAKE2B 06d65e18aff729d603e062339034f07baff1c50947abb91de8ca1c26642e0a93adb28cf827b7f3d0ad43248b0990528b21fe9e0ec7fc5e2c81b35c0ed1a64e20 SHA512 0564d67413b5b99477379017d8384e3b44b67d7d63719c430843d9cd09eaa0f882c7c4923a8530628bb856e339f9633f11c54485e45c47323ab054686b4c6654
 MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
diff --git a/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
new file mode 100644
index 000000000000..a5104d1df6d1
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
@@ -0,0 +1,84 @@
+From 6ea9b13fe82fae2b25b7371c6c36d6296db28ccb Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <antonio.larrosa@gmail.com>
+Date: Thu, 14 Feb 2019 10:09:30 +0100
+Subject: [PATCH] Fix building vlc with libfdk-aac v2
+
+When flushing the encoder, we now need to provide non-null buffer
+parameters for everything, even if they are unused.
+
+The encoderDelay parameter has been replaced by two, nDelay and
+nDelayCore.
+
+This is based on:
+https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=141c960e21d2860e354f9b90df136184dd00a9a8;hp=c8bca9fe466f810fd484e2c6db7ef7bc83b5a943
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/codec/fdkaac.c | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/modules/codec/fdkaac.c b/modules/codec/fdkaac.c
+index e0b3088c4a..3ac7b756a3 100644
+--- a/modules/codec/fdkaac.c
++++ b/modules/codec/fdkaac.c
+@@ -92,6 +92,11 @@ static void CloseEncoder(vlc_object_t *);
+ #define SIGNALING_COMPATIBLE 1
+ #define SIGNALING_HIERARCHICAL 2
+ 
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++    (defined(AACENCODER_LIB_VL0) && \
++        ((AACENCODER_LIB_VL0 > vl0) || \
++         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++
+ static const int pi_aot_values[] = { PROFILE_AAC_LC, PROFILE_AAC_HE, PROFILE_AAC_HE_v2, PROFILE_AAC_LD, PROFILE_AAC_ELD };
+ static const char *const ppsz_aot_descriptions[] =
+ { N_("AAC-LC"), N_("HE-AAC"), N_("HE-AAC-v2"), N_("AAC-LD"), N_("AAC-ELD") };
+@@ -288,7 +293,11 @@ static int OpenEncoder(vlc_object_t *p_this)
+     p_sys->i_maxoutputsize = 768*p_enc->fmt_in.audio.i_channels;
+     p_enc->fmt_in.audio.i_bitspersample = 16;
+     p_sys->i_frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0)
++    p_sys->i_encoderdelay = info.nDelay;
++#else
+     p_sys->i_encoderdelay = info.encoderDelay;
++#endif
+ 
+     p_enc->fmt_out.i_extra = info.confSize;
+     if (p_enc->fmt_out.i_extra) {
+@@ -351,21 +360,27 @@ static block_t *EncodeAudio(encoder_t *p_enc, block_t *p_aout_buf)
+         int out_identifier = OUT_BITSTREAM_DATA;
+         int out_size, out_elem_size;
+         void *in_ptr, *out_ptr;
++        uint8_t dummy_buf[1];
+ 
+         if (unlikely(i_samples == 0)) {
+             // this forces the encoder to purge whatever is left in the internal buffer
++            /* Must be a non-null pointer, even if it's a dummy. We could use
++             * the address of anything else on the stack as well. */
++            in_ptr        = dummy_buf;
++            in_size       = 0;
++
+             in_args.numInSamples = -1;
+         } else {
+             in_ptr = p_buffer + (i_samples - i_samples_left)*p_enc->fmt_in.audio.i_channels;
+             in_size = 2*p_enc->fmt_in.audio.i_channels*i_samples_left;
+-            in_elem_size = 2;
+             in_args.numInSamples = p_enc->fmt_in.audio.i_channels*i_samples_left;
+-            in_buf.numBufs = 1;
+-            in_buf.bufs = &in_ptr;
+-            in_buf.bufferIdentifiers = &in_identifier;
+-            in_buf.bufSizes = &in_size;
+-            in_buf.bufElSizes = &in_elem_size;
+         }
++        in_elem_size = 2;
++        in_buf.numBufs = 1;
++        in_buf.bufs = &in_ptr;
++        in_buf.bufferIdentifiers = &in_identifier;
++        in_buf.bufSizes = &in_size;
++        in_buf.bufElSizes = &in_elem_size;
+         block_t *p_block;
+         p_block = block_Alloc(p_sys->i_maxoutputsize);
+         p_block->i_buffer = p_sys->i_maxoutputsize;
+-- 
+2.11.0
+
diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch b/media-video/vlc/files/vlc-3.0.6-libav.patch
new file mode 100644
index 000000000000..08e13f15fb6e
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libav.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/fourcc.c      2019-02-27 22:57:55.878463261 +0100
++++ a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.000000000 +0100
+@@ -182,7 +182,9 @@
+     /* AV_CODEC_ID_V210X */
+     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
+     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
++#endif
+     /* AV_CODEC_ID_DPX */
+     { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
+     { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },
diff --git a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
new file mode 100644
index 000000000000..1b58a03cc8cd
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
@@ -0,0 +1,35 @@
+From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Mon, 11 Feb 2019 16:07:12 +0100
+Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer
+ frame formats in the chroma_table
+
+Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
+---
+ modules/codec/vpx.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
+index f03c7fae62..59b3acdef7 100644
+--- a/modules/codec/vpx.c
++++ b/modules/codec/vpx.c
+@@ -117,6 +117,7 @@ static const struct
+     { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 },
+ 
+     { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 },
++#if VPX_IMAGE_ABI_VERSION < 5
+     { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 },
+     { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 },
+     { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 },
+@@ -129,7 +130,7 @@ static const struct
+ 
+     { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 },
+     { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 },
+-
++#endif
+     { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 },
+ 
+-- 
+2.11.0
+
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 63a6fda40894..61aba8e45383 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -60,105 +60,105 @@ BDEPEND="
 "
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	aribsub? ( media-libs/aribb24 )
 	bidi? (
-		dev-libs/fribidi:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
 	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( <media-libs/fdk-aac-2.0.0:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
 		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
 	)
 	flac? (
-		media-libs/flac:0
-		media-libs/libogg:0
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	gme? ( media-libs/game-music-emu )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
-		sys-libs/libavc1394:0
-		sys-libs/libraw1394:0
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg:0 )
-	opencv? ( media-libs/opencv:0= )
-	opus? ( >=media-libs/opus-1.0.3:0 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -169,45 +169,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( net-libs/libvncserver:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( <media-libs/libvpx-1.8:0= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
@@ -219,9 +219,9 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 	)
 	x264? ( >=media-libs/x264-0.0.20160712:0= )
-	x265? ( media-libs/x265:0= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[dbus] )
 	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
@@ -232,6 +232,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
+	"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${P}-libav.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )