commit:     aef3b8d2e6366859eb2ff178f40b7c79e41fbb18
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Tue Jul 27 05:10:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 05:13:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef3b8d2

media-plugins/gst-plugins-opus: split opusparse building

- previous autotools somehow was fine with reusing the working directory
- splitting multilib + meson in multiple directories is a mess

So I chose to split the ebuild instead.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 media-plugins/gst-plugins-opus/Manifest               |  1 -
 ....18.4.ebuild => gst-plugins-opus-1.18.4-r1.ebuild} | 19 +------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/media-plugins/gst-plugins-opus/Manifest 
b/media-plugins/gst-plugins-opus/Manifest
index 54add3feb53..8d570179f07 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -1,4 +1,3 @@
 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

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
similarity index 52%
rename from media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4.ebuild
rename to media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild
index 2ea2e910ff3..e4dd1686473 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
-}

Reply via email to