gentoo resync : 12.07.2021

28 files changed, 201 insertions, 15 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 3d362ae82f9c..e1240d0d2b66 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 1c341a95a6c9..90c1d3d67124 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
 EBUILD gst-plugins-cdparanoia-1.16.3.ebuild 475 BLAKE2B da0d62c41361adc6cc1a4bf3252010ef73f9aed43433658e1e9a5a68c34970a616fdd494244552f8dfb9f9d904011808ae6e791fbee783d253265952c99368b1 SHA512 4ec89ae001784d63b9b7fcbcd06cfb1968c89906f517fc8477042a0dd82e361b55539bd25a343c73512c2b542211401e4eba9b5c1adac71249ba2232a7568644
-EBUILD gst-plugins-cdparanoia-1.18.4.ebuild 401 BLAKE2B d98dad6a07b01042e212935d36f9616001054091078d5e0c6d986984eb8f5432daee242db63735e5193eebc7242b6721ab4cf8dd9f4ce225b1c335d0c10141f4 SHA512 a0a3eec874e182e4bdcb8cd5945c52292e92d25acfe39df2d19d4eb3c268412e0186510df3cb0229d39e8e952e3327e06b3886d929accabf253cc530738291f0
+EBUILD gst-plugins-cdparanoia-1.18.4.ebuild 481 BLAKE2B 48c296077dd1092d2d65096667f3ad38fb335ba4bc6d5651e469f690566e16bca6885b181a0b14fea16071c8ab040b408d8f1b9bc1308819cea398f9687207e4 SHA512 7945e4e3ea4f036b0e8c0e8906c00b23ddc45bdbfb3f15e34f250f0bceb93a2297e54fdcfe757bab126f46fd2a9fa7c2d602ffd5caede269cd244350198b26c1
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.4.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.4.ebuild
index 49f7e04097f6..12a4baabf48b 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.4.ebuild
@@ -12,3 +12,8 @@ IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio
+}
diff --git a/media-plugins/gst-plugins-dash/Manifest b/media-plugins/gst-plugins-dash/Manifest
index e0a8785f8e59..08c610ce940a 100644
--- a/media-plugins/gst-plugins-dash/Manifest
+++ b/media-plugins/gst-plugins-dash/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-dash-1.16.3.ebuild 1265 BLAKE2B 6b22336bf23b8fa6dcd60f46330024e26efa74e1296dcd8fb75c3e3ca6792564d116928f816af0c4246c3702fc7f37ef31600e4fbc2b8eeb018eb24112f56ed9 SHA512 aca70b191cf8a59905f94b1cad88631a41c6de66fb9f7f62ce25c148d5bfc0d648766214c8a673cc9d61a275803f764f9481e4e62ce824024c1c998a63561f8d
-EBUILD gst-plugins-dash-1.18.4.ebuild 324 BLAKE2B ae8021aeba093ad263d5ae52ef3aa23097efbbdcb0e03fd962961fcfc8575382ddce2eebbccad6f3abb3da71abdedf7e988365009c52fd96aeb53fe1e9a8b1f2 SHA512 9a0d21c5a0c90b82437cbcd49b7e9278698b5c802923e86c02ca59a87b6c1f9add7f3ef65d197b952823d8df705d573668e2d0be716e1bf02653f9068bf5dd9c
+EBUILD gst-plugins-dash-1.18.4.ebuild 632 BLAKE2B f197b8dc818ddfa96fb11566408b2f909ccafcda5e335e9c0f4b910cb8efbd92f23446777302bdebb9f8a44f41fe0a984057d7bceb0291aecf1730cb4c49cdba SHA512 1c0f9b7a3ea0d945c2abf9fbf8839d8e6a3a6717d5625ec7cc71423248edd4a01f2bdaea6ad8e494d87c5aa5ecaaad4df99afe37afbfd5417d0e03be1c543a26
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild
index 9b96117e5101..d67bfead4102 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.18.4.ebuild
@@ -12,3 +12,12 @@ IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library gstadaptivedemux_dep:gstadaptivedemux
+	gstreamer_system_library gstisoff_dep:gstisoff
+	gstreamer_system_package pbutils_dep:gstreamer-pbutils
+	gstreamer_system_package tag_dep:gstreamer-tag
+	gstreamer_system_library gsturidownloader_dep:gsturidownloader
+}
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index ea336c4cc3bd..2b7183825344 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-dvb-1.16.3.ebuild 411 BLAKE2B 2cab809327175e643982d0158505a63cbfa0c512ba289dd55fb3a5e140ef3fdbb19621f57602de64f563c02b141e7ace2bfdc271214694bad726040b6a33640f SHA512 6e40d3a2392be6dc67325581a95bcb25ab8529beccf80d4c940fac9f178a04fc00aa3e3b6c52b1a8931045ec2a32cd4477da36f9207b1ac6d8b90125d2d92106
-EBUILD gst-plugins-dvb-1.18.4.ebuild 330 BLAKE2B bfffc361b557f2a9af060c4537f7fba4e57b2174d432a613f056268f9bf81537d6dbf2e60f50ed8a5b905eba78d422ad9105df332981207f75de49b02e0bccb5 SHA512 787c84f9078f7065743d5113f2e9cce205e1501bb3960a3bbc4467b6348054575801ca4340aec908c83e96fae13bb6892ea7d18f813453917fa55d498d7cb5f1
+EBUILD gst-plugins-dvb-1.18.4.ebuild 415 BLAKE2B f7a6aa5c164a07cb8963c2ff6efef836c12640d8b338f62c5584a3be01e2abadbb7f6f57a06d82c615e761659304f3857ddb6a3388c59c52f1cbb376c96fd414 SHA512 eb01ff231dd65634fb3d8a3dc65ace4feecca724f377ab4f19b4ca2adf719eabda7fb8cea95521929d56af0f95d34a50cde38449decc6ae92705222aa86312fc
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.4.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.4.ebuild
index b0f553b117e7..b631125f1743 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.4.ebuild
@@ -12,3 +12,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstmpegts_dep:gstreamer-mpegts
+}
diff --git a/media-plugins/gst-plugins-hls/Manifest b/media-plugins/gst-plugins-hls/Manifest
index 95f32b768021..dc27918f81b0 100644
--- a/media-plugins/gst-plugins-hls/Manifest
+++ b/media-plugins/gst-plugins-hls/Manifest
@@ -1,5 +1,6 @@
+AUX gst-plugins-bad-1.18.4-use-system-libs-hls.patch 1000 BLAKE2B 6e992199308ff8afdebc47dd5fc0902495ff095f8e87cea96b0a3f9d7dd6644bd677a7d1753fa9c7b1a2dd5cefe5585b23029367535e8ad7df44dcd527774ded SHA512 4e7ec1a36c158334ffdb0f9e1db7b67cfbf71932aa08748e6d33b3d576b1cd58ff7c889c6b092e12dadff2755045f852e1477409801d499a5eb87afd66056cbd
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-hls-1.16.3.ebuild 1120 BLAKE2B 45e152ae24380ec9b4664fb87e7abe72051017264c3237e49e52d5b6afca7700e51c448f5c7acabc5f66ccaeb19f444593fc56a7d6083959fbf580b4078c2fd0 SHA512 84e0d86e5dfd528bb3976289ff7b045d0b056724b93286ac1dd49acfd58b7ec31beb9c31e43c2c978f579e681ee88e5419950df80dfddb27a891234804332a18
-EBUILD gst-plugins-hls-1.18.4.ebuild 438 BLAKE2B c1b809631dd673b4b71a7ea122ee63fdd2dbd3f5a9b75e07da9ddbb91781845b73e0e9a723bd9e4ff669c19952805542c7767d79984a7e240a10f6416ab61c83 SHA512 0530396585b232eff7b295273c2e66b2e02abb40d025a38dbda04f19ebd93a86d02a76c392425ed9535b483dc309c482c9ae6489b51adcd6d80492c11986a274
+EBUILD gst-plugins-hls-1.18.4.ebuild 826 BLAKE2B d1ee4d0d15375b78d35599c40b27de47e91832900a22345dc1191dbcb7162446209069e6f3ac5cf3b26ce9d6a49d0979b6e01927d05bb0825133ee52900f29f3 SHA512 e573c18e88fa70883fe6118e2b0bec5c734ec39331529d49b9ad0aa2d7d8979e18ef6ed5fa23bfd2f4c6e637564e18ba7fe079b42c3e0ce785360d8c7bc4c175
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch b/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch
new file mode 100644
index 000000000000..f1c1b7fb5fcc
--- /dev/null
+++ b/media-plugins/gst-plugins-hls/files/gst-plugins-bad-1.18.4-use-system-libs-hls.patch
@@ -0,0 +1,24 @@
+commit 761c367338adbd004f763c404e6e5d2aed90ecd7
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sat Jul 3 19:10:06 2021 +0300
+
+    Patch gst-plugins-bad 1.18.4 to build hls plugin using installed libs
+    
+    Header gst/adaptivedemux/gstadaptivedemux.h is not installed by gst-plugins-bad,
+    fix include_directories to find it in gst-libs/gst/adaptivedemux via libsinc.
+    
+    Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+diff --git a/ext/hls/meson.build b/ext/hls/meson.build
+index 3ef45ee03..98205e4b8 100644
+--- a/ext/hls/meson.build
++++ b/ext/hls/meson.build
+@@ -55,7 +55,7 @@ gsthls = library('gsthls',
+   hls_sources,
+   c_args : gst_plugins_bad_args + hls_cargs,
+   link_args : noseh_link_args,
+-  include_directories : [configinc],
++  include_directories : [configinc, libsinc],
+   dependencies : [gstpbutils_dep, gsttag_dep, gstvideo_dep,
+                   gstadaptivedemux_dep, gsturidownloader_dep,
+                   hls_crypto_dep, gio_dep, libm],
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild
index 71d8100cac5e..65695b4d3027 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild
@@ -15,6 +15,19 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-hls.patch
+)
+
+src_prepare() {
+	default
+	gstreamer_system_library gstadaptivedemux_dep:gstadaptivedemux
+	gstreamer_system_package pbutils_dep:gstreamer-pbutils
+	gstreamer_system_package tag_dep:gstreamer-tag
+	gstreamer_system_package video_dep:gstreamer-video
+	gstreamer_system_library gsturidownloader_dep:gsturidownloader
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Dhls-crypto=nettle
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 74e2bd48c5e8..e7831e8c4df4 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
 EBUILD gst-plugins-libvisual-1.16.3.ebuild 615 BLAKE2B a216cc64f7e2937f6f3dc4db8873db7799a5134c051ecfed600288a07e6654125461c615e80f281b31c527bd362d587821129b2a5063732cf2f22255ac9453dd SHA512 a25a9b6b0eaf496a57a945ff5cc7c8af8664cda0ef5e56fe53d788c44b72f1fecbb74ffd5deb483b5374bcaed3c698062f5bab77197ad203e26ed06d654ae144
-EBUILD gst-plugins-libvisual-1.18.4.ebuild 453 BLAKE2B 455f7a864c2bc240f6a1c28892fec8fcfa577596720a141889b8ecbf1d7f663a028dc071b0d0657b3bad90080ec14ddb09d9f2311ae52a877d59cc21341d99d9 SHA512 7f21929b3de4df5fefc96d9d83fedda20266dc6b9c3248313179ad36940d10dd31baca178b1f412dc0e7c7e44bed9fd2e8598702c3ce3e6173d5d51ec11bd975
+EBUILD gst-plugins-libvisual-1.18.4.ebuild 641 BLAKE2B f04e03f805753da6b6710d46127c6868a1acff74a2bb85fa077f3849be0b46f7beacd7898dd454542275d6ccc1f42cc3313698e81818bc0bce2d7bdfd94afa70 SHA512 24455c0ee4618ca1847e26bb5ce2e83ce858c0b9fc553905a10bb6a1e601d3e5ad27e7d66ef8f81aeb9eaeab6210c7b6a736495aaea903e5bdf03e1a196ad046
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.4.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.4.ebuild
index daee59fad439..b60bf79c2efe 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.4.ebuild
@@ -15,3 +15,10 @@ RDEPEND="
 	>=media-plugins/libvisual-plugins-0.4.0-r3[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio
+	gstreamer_system_package pbutils_dep:gstreamer-pbutils
+	gstreamer_system_package video_dep:gstreamer-video
+}
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index 092f8f2bdf30..c5684915a3e7 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -1,5 +1,6 @@
+AUX gst-plugins-bad-1.18.4-use-system-libs-opencv.patch 2030 BLAKE2B 16b83f0a34878a523e65ebe862e9100be969a318a9dfcac64b742eca68c017cdab3d6e44b3091c683842da79384f23a320bf777711818f63688b293c8521b38f SHA512 58cfb2dc849ec18f413f642b5125a920ec8c98c628bcf1b568b73a7f2681e921dd9a77832b4186f9abb4a60c689f17d249339cf82fd38f78d626b4b4cef9f8c7
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-opencv-1.16.3.ebuild 719 BLAKE2B a4e976bec3993a280be39f01ebbc3f638c30ea480c5b2f8b2a30db8a5737524ebbafd7c52d6978210d89b4c4623c844a239f2148e82d900d87894f106b6adb21 SHA512 e8177d5e96db887ece39786677a92733096ee0c17c0452e621331a5c01187275b1a4a77896f81e24befe7f4ed6bf2d8db55dedaa5a0cabd167616a6a6b4cd7a1
-EBUILD gst-plugins-opencv-1.18.4.ebuild 425 BLAKE2B 714ecde4d63a2902cd8a9daa397df53734430a49e8425d25f3469dd25db3412dc853bdfd4729032db26ea83f826603e532f99dee8432a4515a659bdeeb51b19a SHA512 2c1c6516e3e5c9e63e71280778c252e9a9d548009f26918ddab5ac2dff4484ab72212e6977593653b0d611299cac7eff773591d4b5b48bb4aa0667ab8fb4c153
+EBUILD gst-plugins-opencv-1.18.4-r1.ebuild 645 BLAKE2B 4e24ee84062d3c7595860ae766a9b52b8c726c1c3d93a514b971cf3ff3b8359b9a6bd595cbeb3372ff29fd82d70e1b338978de70db08f2f78c11d8d7345db081 SHA512 0c99cd471d2052331121b543e4a2fc022ae6dc0dbf60545dd146f532b8dccb35ac72dba35ceaa57de7fdc8dc58075bfd2f5993baaba49d7bf68cd4db446bd9fd
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
new file mode 100644
index 000000000000..721ea3830932
--- /dev/null
+++ b/media-plugins/gst-plugins-opencv/files/gst-plugins-bad-1.18.4-use-system-libs-opencv.patch
@@ -0,0 +1,81 @@
+commit 245245841d3117d81cff1b560b7ac4b1aad1aa78
+Author: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+Date:   Sat Jul 3 19:29:01 2021 +0300
+
+    Patch gst-plugins-bad 1.18.4 to also install opencv integration libs
+    
+    Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
+
+diff --git a/ext/meson.build b/ext/meson.build
+index 2cbddbf82..c70a07bbe 100644
+--- a/ext/meson.build
++++ b/ext/meson.build
+@@ -58,7 +58,6 @@ subdir('ttml')
+ subdir('voaacenc')
+ subdir('voamrwbenc')
+ subdir('vulkan')
+-subdir('wayland')
+ subdir('webrtc')
+ subdir('webrtcdsp')
+ subdir('webp')
+diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build
+index 6cbed6c6c..d44943189 100644
+--- a/gst-libs/gst/meson.build
++++ b/gst-libs/gst/meson.build
+@@ -1,18 +1 @@
+-subdir('uridownloader')
+-
+-subdir('adaptivedemux')
+-subdir('audio')
+-subdir('basecamerabinsrc')
+-subdir('codecparsers')
+-subdir('codecs')
+-subdir('insertbin')
+-subdir('interfaces')
+-subdir('isoff')
+-subdir('mpegts')
+ subdir('opencv')
+-subdir('player')
+-subdir('sctp')
+-subdir('transcoder')
+-subdir('vulkan')
+-subdir('wayland')
+-subdir('webrtc')
+diff --git a/meson.build b/meson.build
+index e456c32da..cfa265061 100644
+--- a/meson.build
++++ b/meson.build
+@@ -462,13 +462,8 @@ if get_option('default_library') == 'shared'
+ endif
+ 
+ subdir('gst-libs')
+-subdir('gst')
+ subdir('sys')
+ subdir('ext')
+-subdir('tests')
+-subdir('data')
+-subdir('tools')
+-subdir('pkgconfig')
+ 
+ if have_orcc
+   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
+@@ -496,7 +491,6 @@ endif
+ # xgettext is optional (on Windows for instance)
+ if find_program('xgettext', required : get_option('nls')).found()
+   cdata.set('ENABLE_NLS', 1)
+-  subdir('po')
+ endif
+ 
+ subdir('scripts')
+diff --git a/sys/meson.build b/sys/meson.build
+index cf39e5770..31d943d4b 100644
+--- a/sys/meson.build
++++ b/sys/meson.build
+@@ -17,7 +17,6 @@ subdir('mediafoundation')
+ subdir('msdk')
+ subdir('nvcodec')
+ subdir('opensles')
+-subdir('shm')
+ subdir('tinyalsa')
+ subdir('uvch264')
+ subdir('v4l2codecs')
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild
index fcda9c53d9c7..3b2c04d59fab 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.18.4-r1.ebuild
@@ -13,6 +13,19 @@ IUSE=""
 # >=opencv-4.1.2-r3 to help testing removal of older being fine
 RDEPEND="
 	>=media-libs/opencv-4.1.2-r3:=[contrib,${MULTILIB_USEDEP}]
-	<media-libs/opencv-4.2
+	<media-libs/opencv-4.6.0
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/gst-plugins-bad-${PV}-use-system-libs-opencv.patch
+)
+
+src_prepare() {
+	default
+	gstreamer_system_package video_dep:gstreamer-video
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 2f37ad2ac9de..dd4d085c3146 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa118
 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
 EBUILD gst-plugins-opus-1.16.3.ebuild 1238 BLAKE2B 7875e4a2ed5aba7fc3b2297ff0224c2844753d1e879442b33f28e7efbf93fda5ffdb43fc6f0bdbfdf17a861d4b0fbf6f1575c943b6cf8212d816447af9f61512 SHA512 1f16371105dbd18d9a06755418e2cd38041211573372c28f702a5d7bf4c4209787682a74ec03f2a4952df3f6dbe9a489dc74e1fce6e2de49f642727bab17d8a6
-EBUILD gst-plugins-opus-1.18.4.ebuild 1121 BLAKE2B 79c2b0a140d1a9fe8bd8c98479c51ab55d1b01bf778b97e40951b59daa237d73e73c608cf4f300e85684442102a44d0de1b0969159ad0aff211a0e55014c07e3 SHA512 45f7abcfb51659c24926dd4e88be1976becbfd5ce99183559f1db7940e5a6db833abd8517fee0e92b1024f0f82ea2d70ca3d05d46a8383ecedf875b203ffbf69
+EBUILD gst-plugins-opus-1.18.4.ebuild 1305 BLAKE2B 2cbd067909e479f4057925a176e554118731455728092c0ebe8f9dc998fab2ebfcb1e2dc3269ef97724e1ee95a22bea3955f677493b66c31c785ce78910c4113 SHA512 4c1befd3e9db1fd0b657fdf47f25da8065459c56f329ba64fc449bf4fb95c2719d553e611a05c319245e15868bf1a782e75dbcf7a6d8b87607b637f699492e6b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild
index 40f23a12e4c1..2ea2e910ff33 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild
@@ -20,6 +20,13 @@ DEPEND="${COMMON_DEPEND}"
 # Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed
 SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}"
 
+src_prepare() {
+	default
+	gstreamer_system_package audio_dep:gstreamer-audio
+	gstreamer_system_package pbutils_dep:gstreamer-pbutils
+	gstreamer_system_package tag_dep:gstreamer-tag
+}
+
 multilib_src_configure() {
 	gstreamer_multilib_src_configure
 	S="${WORKDIR}/gst-plugins-bad-${PV}" gstreamer_multilib_src_configure
diff --git a/media-plugins/gst-plugins-smoothstreaming/Manifest b/media-plugins/gst-plugins-smoothstreaming/Manifest
index ff0d872b1e86..c357d4ed104a 100644
--- a/media-plugins/gst-plugins-smoothstreaming/Manifest
+++ b/media-plugins/gst-plugins-smoothstreaming/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-smoothstreaming-1.16.3.ebuild 1356 BLAKE2B a7c04ac7c20f770fda49aae6d9d1b84cf554e60ecbaaff1a555159466bde35bf7a769e8d751da1be53ceb4ffb814d55512e4b9fdb711be6598126a949b513da7 SHA512 c0653932030893c3c3c725ed07fa7304b205b1b8fce1f8e40cff74748d8c6ebb386ad24198deb82d0ce5978eb620911002348367af47e4d7c11d1940e1205933
-EBUILD gst-plugins-smoothstreaming-1.18.4.ebuild 331 BLAKE2B 8d385e9a640abc6438389e10c0ed939ac56ef8003d7d5482e04fc6b357905c148ad6c9e3172806561e3934f94150cc1fdd6f08d2bab110f40aefce64e7a23a75 SHA512 b2630e6623e8c80fadd0c5702b5c73fd33738a5252bdc2955e00bd51a18ad0d76544db9c11b1cc91d2f86d7c77d1e9ecf6b29563f06af572cab3bdd9f11568cf
+EBUILD gst-plugins-smoothstreaming-1.18.4.ebuild 604 BLAKE2B dfe09401552e29a8bbf9d361b46df656a77cf13477baaae6caafab0b8f4c6cdd433b1bbeb140ab0ba00b1403a808115a223fefa48fc044839fea3ed2f85c1a6b SHA512 ef9aa210cf456eb806a62fb052dbab94e0aab1a14c347b9ef5663c850fd11c245d5001cca09dedc4b50ede6e37bf62674fa7d5e15359f78af4e1a6b7445f91d5
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.18.4.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.18.4.ebuild
index f4a35c81afb5..226dbf39366e 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.18.4.ebuild
@@ -12,3 +12,11 @@ IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library gstadaptivedemux_dep:gstadaptivedemux
+	gstreamer_system_package gstcodecparsers_dep:gstreamer-codecparsers
+	gstreamer_system_library gstisoff_dep:gstisoff
+	gstreamer_system_library gsturidownloader_dep:gsturidownloader
+}
diff --git a/media-plugins/gst-plugins-srt/Manifest b/media-plugins/gst-plugins-srt/Manifest
index 29314acefd56..b1ba590ecb68 100644
--- a/media-plugins/gst-plugins-srt/Manifest
+++ b/media-plugins/gst-plugins-srt/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
-EBUILD gst-plugins-srt-1.16.3.ebuild 334 BLAKE2B e0d306db35f86ff9e9b8c528bbcf811ec6c4417752dfecb8cc5abf5f30b6ebea4c96be9b34ab66714fb16573d03849c4830b3444da31cbf583ec479768b6ee5e SHA512 5577e8d48d479013ba99c0f79cce03f01612f3791a6de2f93b75df6d870c353c5d0e56c3d7659933e60e8ff4d55f89755b773c6c09ee7dc964df45b584d93a54
-EBUILD gst-plugins-srt-1.18.4.ebuild 340 BLAKE2B b2388840fd03e481ffdc92dab9f91e9d99fd2a9bc99ed12324f5d35feccb7f373b4179f5ecedb027211b95985e9e800536f3ff784823d73eb6ce13da90b8f52e SHA512 10463db5c5b1167f5f7ef483f05c9553129628674cd8166b7e43cbf6310c4567527292b3ea6310f670943bc7d402442bd7cfe5e077ecd22f9dd82817f8fe8c4b
+EBUILD gst-plugins-srt-1.16.3-r1.ebuild 334 BLAKE2B e0d306db35f86ff9e9b8c528bbcf811ec6c4417752dfecb8cc5abf5f30b6ebea4c96be9b34ab66714fb16573d03849c4830b3444da31cbf583ec479768b6ee5e SHA512 5577e8d48d479013ba99c0f79cce03f01612f3791a6de2f93b75df6d870c353c5d0e56c3d7659933e60e8ff4d55f89755b773c6c09ee7dc964df45b584d93a54
+EBUILD gst-plugins-srt-1.18.4-r1.ebuild 340 BLAKE2B b2388840fd03e481ffdc92dab9f91e9d99fd2a9bc99ed12324f5d35feccb7f373b4179f5ecedb027211b95985e9e800536f3ff784823d73eb6ce13da90b8f52e SHA512 10463db5c5b1167f5f7ef483f05c9553129628674cd8166b7e43cbf6310c4567527292b3ea6310f670943bc7d402442bd7cfe5e077ecd22f9dd82817f8fe8c4b
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3-r1.ebuild
index 8720e4278f55..8720e4278f55 100644
--- a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3.ebuild
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3-r1.ebuild
diff --git a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.18.4.ebuild b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.18.4-r1.ebuild
index 3c64fe213bb5..3c64fe213bb5 100644
--- a/media-plugins/gst-plugins-srt/gst-plugins-srt-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-srt/gst-plugins-srt-1.18.4-r1.ebuild
diff --git a/media-plugins/gst-plugins-uvch264/Manifest b/media-plugins/gst-plugins-uvch264/Manifest
index 2e395ad0fff4..e7712c6a90bd 100644
--- a/media-plugins/gst-plugins-uvch264/Manifest
+++ b/media-plugins/gst-plugins-uvch264/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-uvch264-1.16.3.ebuild 802 BLAKE2B c9cbcefe1c1a7c44e04ad48095468948114320a18dff43dac5664a493e1c958f5ba4070ec15c38abfe3585dd73e245d7d05e839ee6341ddf36d49a5f4d23c653 SHA512 2365e60566f4bf69dadaa7d4f9b3a016cf6c04deb9406314e34d7b539c9826f4d16a562184fa960dc19e7fb9a11440ab6a12fc8d5b618de68d5c1569709c9234
-EBUILD gst-plugins-uvch264-1.18.4.ebuild 383 BLAKE2B 916f0da6e4ce1c2dfc9b2f6601b83509f1306b4de6f5bfc46770cc5c29a973d5b790dbda353556115ee464455d03738326862e0bdb14eb8045ec5eab7d373b08 SHA512 cc4a47c1e0aa0d6fffbc03a7618c156b718a12e2c4f5e30a0c929c2aec563d27fb86ed0baaa2f8f592c8a4b5ad877b2bcbc9b8ace48287b66767c996e2cb9996
+EBUILD gst-plugins-uvch264-1.18.4.ebuild 481 BLAKE2B b857b2cdb164a8b501d6f580dfacaa4025ad781658090410487e5894a54f27a3131164ad0ba83e85aa2dd5fda704b179028bc8bbd81b7226b2b6e88853220b6c SHA512 1eacd5270b4bf83c67b7c962ee30bd54b91857d9b7be29287ad504047cd64f603be777174e7eb513cc13a281d505aad667be6f8da870bff83cd6189348ea9a6e
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.18.4.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.18.4.ebuild
index 383b40b38ec5..179c5f0cd815 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.18.4.ebuild
@@ -15,3 +15,8 @@ RDEPEND="
 	virtual/libusb:1[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	gstreamer_system_library gstbasecamerabin_dep:libgstbasecamerabinsrc
+}
diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
index 1dab34fc16e4..7505f8aa847a 100644
--- a/media-plugins/gst-plugins-webrtc/Manifest
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04
 DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
 EBUILD gst-plugins-webrtc-1.16.3.ebuild 821 BLAKE2B c031977268b36f8c584cb8ad82ae7acd7d3ca910b51dd81a1d5b1dbbd6459e208e4383282a8688049f924ef74bae0468cb364ed3fbbc872daf65b0cfad71a6e9 SHA512 765f9e6a5f38ea328f463d7e1035965889c037246231b5bd6b363afcfd7a5d19ebbf0f2bcef0fab2efd2852a7d6af578a6f407011f36bb959930cf2e12a51881
-EBUILD gst-plugins-webrtc-1.18.4.ebuild 623 BLAKE2B 45b71f7d6d6bf82050efb8a1a77f20e48e095189894349375b807c5768770c94a328c69b3f3e915986e08d11eda6778be58f6cb06b52bd1b4d896a8e27db28d2 SHA512 3c7aa6fb97c5811aca1093f485bcb8e9408624e8f7c017be467ed0e82d4e07328122ba622c3555492c37d310f16b422344fe48d97254715f3edbd76c4b0bacd9
+EBUILD gst-plugins-webrtc-1.18.4.ebuild 823 BLAKE2B e42e02867051767b8e890d150863ecb896fb0949127141f0c996e9f707904268ace3070916f3c7148d71dc01caec526fef2d01ff726c1061ea1a944b0dd9b789 SHA512 99b33ee397f2084fef4b1187d73a1ca0b6da065506151a5d299888bad5ca78a621c92321795eac37be473b21d31cbf1e62b2b99d2a600de6c0d037cb18c4e4fe
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild
index 47088545a75a..c896bbbdb161 100644
--- a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4.ebuild
@@ -21,3 +21,10 @@ DEPEND="${RDEPEND}"
 
 GST_PLUGINS_ENABLED="webrtc webrtcdsp"
 GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
+
+src_prepare() {
+	default
+	gstreamer_system_package gstwebrtc_dep:gstreamer-webrtc
+	gstreamer_system_package gstsctp_dep:gstreamer-sctp
+	gstreamer_system_package gstbadaudio_dep:gstreamer-bad-audio
+}
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 866abf168bfc..92d41da36661 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,5 @@
 DIST qmmp-plugin-pack-1.4.1.tar.bz2 235757 BLAKE2B 6ce61db9b4af6eaeb182c3bc4fe3965c1b7a6c36fb20c68cf45595af4e60667d4c8c20fb5c80246b3be523bcde8735f6a240853a6869beff0c17e0e4b0a9dc63 SHA512 e050bafb949209c75d1f9406bc2bff4e4372ff709cb9f5564a226784d160fe3732ce5fb058c4d11c92653e7097e121fc2e46fc693c60168e346cc5f645c5bacc
 DIST qmmp-plugin-pack-1.5.0.tar.bz2 227931 BLAKE2B 5d036ed0627f6d42187c9d4055185cae2945f99d835694937e2e32ea00063aeecb4ecb4ab494bea151fa7112cc8f604175129e99fc999b2cba4d0ca95074ab12 SHA512 ccc62290f5ce45e6f6743c495800641865f07b0abbc40f8eb2e50319407c85f088c93f952905356b695b57e3b7341096faeaa3153e0635722d62c32bbd3bf7b3
 EBUILD qmmp-plugin-pack-1.4.1.ebuild 676 BLAKE2B f1e0c6fe8f58c9abb907049b8c4678854f3243a847efcbbf0dac729188a681720b01e545e92fd94c30305e2f18106d9df1ad768e51a6ab6725c9fed9bf7d2de9 SHA512 6ed309664867b86d813b96458c929466ba58c5080e4cb949a9d478a6e9888f466b399ba25aa49a7d739adb30fb10f740258e4a5b4ad2e059a8693d6b07897a79
-EBUILD qmmp-plugin-pack-1.5.0.ebuild 678 BLAKE2B af10407398ab55d4dcc37f6857a299254003e182dae5aa9d5579ac4da0fbb8df0cc5e5730365fe0e0d94a0cb38fff1080626a9bcec7dd8f078315e11e59838ef SHA512 f3471c80d5c00c8eacc4cc9328ddb5769bede0d7b025adfca26b575791fd386320d4af4e29ef2c0c1af0524a07b0e1a080993ef5710f13261a02fb097544b96c
+EBUILD qmmp-plugin-pack-1.5.0.ebuild 677 BLAKE2B 1d9563b330c69bb2e186a60a190c2e317c683fe70aa113eb1f9cdc7c261045a8d4b6a3ab71c081024fb3a459c405cc12e5558250ac4a98771190037a3d794819 SHA512 34a2ccda3eb2e0ebc0c9922b9d729cfebb1170f1dafd7d8106adcb9aa1723ac57055c416f9ea6a01c18c3dc0931710aaa3c2c5169cd800090232bff8430c956d
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
index 72e8e475afd6..db7c51aef33a 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="