gentoo resync : 28.07.2021

8 files changed, 37 insertions, 22 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index c5526d23a6e0..4fe9f513d2af 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index dd4d085c3146..e7e07e87047c 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,7 +1,6 @@
 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
 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 1305 BLAKE2B 2cbd067909e479f4057925a176e554118731455728092c0ebe8f9dc998fab2ebfcb1e2dc3269ef97724e1ee95a22bea3955f677493b66c31c785ce78910c4113 SHA512 4c1befd3e9db1fd0b657fdf47f25da8065459c56f329ba64fc449bf4fb95c2719d553e611a05c319245e15868bf1a782e75dbcf7a6d8b87607b637f699492e6b
+EBUILD gst-plugins-opus-1.18.4-r1.ebuild 752 BLAKE2B 12995f5d2e62d3d1b15ca140c4cf94e1cc8725b9607a31fc5e0a807865e8606399cf4c63689db029938da59aec6c24ca88d4b4e44c9408788825851c2a2729f4 SHA512 b0d2fb7dd6d1c78e25badec5255a9784edce493a7a5c045658882c7f0f5da4efaa4a3713d32b115fb475a5309b0ab6d8e07289a4e84dcf26620308cd00189933
 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-r1.ebuild
index 2ea2e910ff33..e4dd16864734 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-r1.ebuild
@@ -13,31 +13,14 @@ IUSE=""
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
 
 RDEPEND="${COMMON_DEPEND}
+	>=media-plugins/gst-plugins-opusparse-${PV}:${SLOT}[${MULTILIB_USEDEP}]
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
 "
 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
-}
-
-multilib_src_compile() {
-	gstreamer_multilib_src_compile
-	S="${WORKDIR}/gst-plugins-bad-${PV}" gstreamer_multilib_src_compile
-}
-
-multilib_src_install() {
-	gstreamer_multilib_src_install
-	S="${WORKDIR}/gst-plugins-bad-${PV}" gstreamer_multilib_src_install
-}
diff --git a/media-plugins/gst-plugins-opusparse/Manifest b/media-plugins/gst-plugins-opusparse/Manifest
new file mode 100644
index 000000000000..8675610bb8c2
--- /dev/null
+++ b/media-plugins/gst-plugins-opusparse/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125
+EBUILD gst-plugins-opusparse-1.18.4-r1.ebuild 595 BLAKE2B f8a841be7ddaabc0bf104000594370758e03484ad9d2d94e11f2f7b22c10d052c36f221e69c35fcf3e903c74f3ef939d98918485a7e435ab8969a8a458223e6b SHA512 cf233840e4488dc2fd6d118e2bc0ef442ba2ce0fed05a509dda24838b2574ce357c92e89963af06f4a3bac0dbc57f77337e5b09894a4159121cc5bb1d6570e57
+MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild b/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild
new file mode 100644
index 000000000000..030563ac4049
--- /dev/null
+++ b/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="Opus audio parser plugin for GStreamer"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg]
+	!<media-plugins/gst-plugins-opus-1.18.4-r1
+"
+DEPEND="${COMMON_DEPEND}"
+
+GST_PLUGINS_ENABLED="opus"
+GST_PLUGINS_BUILD_DIR="opus"
diff --git a/media-plugins/gst-plugins-opusparse/metadata.xml b/media-plugins/gst-plugins-opusparse/metadata.xml
new file mode 100644
index 000000000000..fb1ea7216a80
--- /dev/null
+++ b/media-plugins/gst-plugins-opusparse/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
index fd765853b2be..cbb211039770 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/Manifest
@@ -5,6 +5,6 @@ DIST kodi-inputstream-ffmpegdirect-1.21.6.tar.gz 274580 BLAKE2B 202743bab99de5eb
 EBUILD kodi-inputstream-ffmpegdirect-1.21.3.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
 EBUILD kodi-inputstream-ffmpegdirect-1.21.4.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
 EBUILD kodi-inputstream-ffmpegdirect-1.21.5.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
-EBUILD kodi-inputstream-ffmpegdirect-1.21.6.ebuild 956 BLAKE2B 6cbc3ca17b1e5e8a10deac2d087debe80c6232d3e8ca3eff3c4717ac3f57547f545b5ff8070d22697ebf1b2bed478b28f921c9db494e6b3af16def26be2b81c7 SHA512 07f4a9d60b27c40b74e09c972934b0503ba4c32edfcb4bdba3ca3b0db57dc0eefcc96af6884a31f0054de3d22aeb42b82df72f6ea3c1d3b8cb71911e25181e1d
+EBUILD kodi-inputstream-ffmpegdirect-1.21.6.ebuild 961 BLAKE2B abe3ade3e876897a679d89685a4e05a50f1a2dc2301155a4fb29fa5832d8ad32e9b0352a5beaac8a262fa9a60436515fa1baecbd9b267f991dd10c2e26fa17b9 SHA512 375ae15cfa72ea18f5ad1dc8f2363800cc3eb1d4adfe76f330354aaba57c63c544b8acc1c56ba5d7e14f5c1650c46f32f524fd0f7c8ba4755a3a883c11a61d04
 EBUILD kodi-inputstream-ffmpegdirect-9999.ebuild 949 BLAKE2B b3455c47c5ba05ceed17ec36b9ad7dd2945e5f8a1eb1e3483081ad85ae118ccc8dd6a124eb3676aceb993a24e4191b1cd4361c4d51086f8ad683f9d8c7158498 SHA512 b4dc908c9c95f9ac46ca1d3637fb9243d50654d99e8d08d36ee05431902f4011efe909ef339a43aa542250e73e91568de8c38230869d9ee9ed0d5b033bcda0ff
 MISC metadata.xml 504 BLAKE2B c76c1e4a42638c9bdefd5c505de0a5fe31994d7a25ec2ee7e35af14c5c5ad4ad393a3d70e14275cd89a1286d2afcc32b26b659ba64569182a5902c521aef54bf SHA512 93585dda17a5955936376ae86c2f0efd32a9c67d9451321dcb2face19279f47e1190482bc0178524a812fb5647fd7adf97df1b942d289d52788361ef9e6c3e2c
diff --git a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild
index 4ea51e4a1095..26abe6bde540 100644
--- a/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild
+++ b/media-plugins/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect-1.21.6.ebuild
@@ -17,7 +17,7 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	CODENAME="Matrix"
 	SRC_URI="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/inputstream.ffmpegdirect-${PV}-${CODENAME}"