1 |
commit: 847021ee7df246dfd53e481f23e9de85fa95f5f2 |
2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
3 |
AuthorDate: Wed Jul 28 05:19:25 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 28 21:14:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847021ee |
7 |
|
8 |
media-plugins/gst-plugins-opus*: Merge -opus and -opusparse again |
9 |
|
10 |
Note: This isn't a revert of aef3b8d2e6366859eb2ff178f40b7c79e41fbb18 |
11 |
|
12 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
media-plugins/gst-plugins-opus/Manifest | 1 + |
16 |
.../gst-plugins-opus-1.18.4-r1.ebuild | 26 ---------- |
17 |
.../gst-plugins-opus-1.18.4-r2.ebuild | 55 ++++++++++++++++++++++ |
18 |
media-plugins/gst-plugins-opusparse/Manifest | 1 - |
19 |
.../gst-plugins-opusparse-1.18.4-r1.ebuild | 22 --------- |
20 |
media-plugins/gst-plugins-opusparse/metadata.xml | 8 ---- |
21 |
6 files changed, 56 insertions(+), 57 deletions(-) |
22 |
|
23 |
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest |
24 |
index 8d570179f07..54add3feb53 100644 |
25 |
--- a/media-plugins/gst-plugins-opus/Manifest |
26 |
+++ b/media-plugins/gst-plugins-opus/Manifest |
27 |
@@ -1,3 +1,4 @@ |
28 |
DIST gst-plugins-bad-1.16.3.tar.xz 4900188 BLAKE2B 7d8280a434adb1cb65b065dcdabdb37aad000802c011bb27779c109978d8b75aa4e2fa47043dde95464bb0c34a0d7466dc1f6216f29f0f4911f7a6fe1fb04b25 SHA512 378d8813ba2fd61ea2cab512d5c1fa81e0a4ac4f4ca756547d9b8742e56024c1bc5d6cd332798de66ecfe2b69485c860e181a6c2090398b0e2ad8c4b3fe95d04 |
29 |
+DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125 |
30 |
DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75 |
31 |
DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a |
32 |
|
33 |
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild |
34 |
deleted file mode 100644 |
35 |
index e4dd1686473..00000000000 |
36 |
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,26 +0,0 @@ |
39 |
-# Copyright 1999-2021 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
-GST_ORG_MODULE=gst-plugins-base |
44 |
- |
45 |
-inherit gstreamer-meson |
46 |
- |
47 |
-DESCRIPTION="Opus audio parser plugin for GStreamer" |
48 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
49 |
-IUSE="" |
50 |
- |
51 |
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]" |
52 |
- |
53 |
-RDEPEND="${COMMON_DEPEND} |
54 |
- >=media-plugins/gst-plugins-opusparse-${PV}:${SLOT}[${MULTILIB_USEDEP}] |
55 |
- >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg] |
56 |
-" |
57 |
-DEPEND="${COMMON_DEPEND}" |
58 |
- |
59 |
-src_prepare() { |
60 |
- default |
61 |
- gstreamer_system_package audio_dep:gstreamer-audio |
62 |
- gstreamer_system_package pbutils_dep:gstreamer-pbutils |
63 |
- gstreamer_system_package tag_dep:gstreamer-tag |
64 |
-} |
65 |
|
66 |
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild |
67 |
new file mode 100644 |
68 |
index 00000000000..4f310032efa |
69 |
--- /dev/null |
70 |
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild |
71 |
@@ -0,0 +1,55 @@ |
72 |
+# Copyright 1999-2021 Gentoo Authors |
73 |
+# Distributed under the terms of the GNU General Public License v2 |
74 |
+ |
75 |
+EAPI=7 |
76 |
+GST_ORG_MODULE=gst-plugins-base |
77 |
+ |
78 |
+inherit gstreamer-meson |
79 |
+ |
80 |
+DESCRIPTION="Opus audio parser plugin for GStreamer" |
81 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
82 |
+IUSE="" |
83 |
+ |
84 |
+COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]" |
85 |
+ |
86 |
+RDEPEND="${COMMON_DEPEND} |
87 |
+ !media-plugins/gst-plugins-opusparse |
88 |
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg] |
89 |
+" |
90 |
+DEPEND="${COMMON_DEPEND}" |
91 |
+ |
92 |
+src_prepare() { |
93 |
+ default |
94 |
+ gstreamer_system_package audio_dep:gstreamer-audio |
95 |
+ gstreamer_system_package pbutils_dep:gstreamer-pbutils |
96 |
+ gstreamer_system_package tag_dep:gstreamer-tag |
97 |
+} |
98 |
+ |
99 |
+# Everything below is for building opusparse from gst-plugins-bad. Once it moves into -base, all below can be removed |
100 |
+SRC_URI+=" https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.${GST_TARBALL_SUFFIX}" |
101 |
+ |
102 |
+in_bdir() { |
103 |
+ pushd "${BUILD_DIR}" || die |
104 |
+ "$@" |
105 |
+ popd || die |
106 |
+} |
107 |
+ |
108 |
+src_configure() { |
109 |
+ S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi gstreamer_multilib_src_configure |
110 |
+ S="${WORKDIR}/gst-plugins-bad-${PV}" multilib_foreach_abi gstreamer_multilib_src_configure |
111 |
+} |
112 |
+ |
113 |
+src_compile() { |
114 |
+ S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_compile |
115 |
+ S="${WORKDIR}/gst-plugins-bad-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_compile |
116 |
+} |
117 |
+ |
118 |
+multilib_src_test() { |
119 |
+ S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_test |
120 |
+ S="${WORKDIR}/gst-plugins-bad-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_test |
121 |
+} |
122 |
+ |
123 |
+src_install() { |
124 |
+ S="${WORKDIR}/gst-plugins-base-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_install |
125 |
+ S="${WORKDIR}/gst-plugins-bad-${PV}" multilib_foreach_abi in_bdir gstreamer_multilib_src_install |
126 |
+} |
127 |
|
128 |
diff --git a/media-plugins/gst-plugins-opusparse/Manifest b/media-plugins/gst-plugins-opusparse/Manifest |
129 |
deleted file mode 100644 |
130 |
index 54abf6962a5..00000000000 |
131 |
--- a/media-plugins/gst-plugins-opusparse/Manifest |
132 |
+++ /dev/null |
133 |
@@ -1 +0,0 @@ |
134 |
-DIST gst-plugins-bad-1.18.4.tar.xz 5640292 BLAKE2B 5385abe635a35f61c6780e6cfa1189835877b8c0a12145de6890708a097fc453b1abfb14a3497cae4e6961f71fc2c6e01759fe19386cd30a64c4069704ddf77a SHA512 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125 |
135 |
|
136 |
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 |
137 |
deleted file mode 100644 |
138 |
index 030563ac404..00000000000 |
139 |
--- a/media-plugins/gst-plugins-opusparse/gst-plugins-opusparse-1.18.4-r1.ebuild |
140 |
+++ /dev/null |
141 |
@@ -1,22 +0,0 @@ |
142 |
-# Copyright 1999-2021 Gentoo Authors |
143 |
-# Distributed under the terms of the GNU General Public License v2 |
144 |
- |
145 |
-EAPI=7 |
146 |
-GST_ORG_MODULE=gst-plugins-bad |
147 |
- |
148 |
-inherit gstreamer-meson |
149 |
- |
150 |
-DESCRIPTION="Opus audio parser plugin for GStreamer" |
151 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
152 |
-IUSE="" |
153 |
- |
154 |
-COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]" |
155 |
- |
156 |
-RDEPEND="${COMMON_DEPEND} |
157 |
- >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},ogg] |
158 |
- !<media-plugins/gst-plugins-opus-1.18.4-r1 |
159 |
-" |
160 |
-DEPEND="${COMMON_DEPEND}" |
161 |
- |
162 |
-GST_PLUGINS_ENABLED="opus" |
163 |
-GST_PLUGINS_BUILD_DIR="opus" |
164 |
|
165 |
diff --git a/media-plugins/gst-plugins-opusparse/metadata.xml b/media-plugins/gst-plugins-opusparse/metadata.xml |
166 |
deleted file mode 100644 |
167 |
index fb1ea7216a8..00000000000 |
168 |
--- a/media-plugins/gst-plugins-opusparse/metadata.xml |
169 |
+++ /dev/null |
170 |
@@ -1,8 +0,0 @@ |
171 |
-<?xml version="1.0" encoding="UTF-8"?> |
172 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
173 |
-<pkgmetadata> |
174 |
-<maintainer type="project"> |
175 |
- <email>gstreamer@g.o</email> |
176 |
- <name>GStreamer package maintainers</name> |
177 |
-</maintainer> |
178 |
-</pkgmetadata> |