1 |
commit: 3162c02c529bd8055e686e6f45cb7a6ef0b36151 |
2 |
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com> |
3 |
AuthorDate: Fri Nov 19 08:01:47 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 1 19:49:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3162c02c |
7 |
|
8 |
media-video/wireplumber: clean up the old 0.4.2-r1 ebuild |
9 |
|
10 |
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com> |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
media-video/wireplumber/Manifest | 1 - |
14 |
...4.2-bluez-add-basic-check-for-nil-monitor.patch | 42 --------- |
15 |
...ice-demote-missing-SPA-warning-to-message.patch | 28 ------ |
16 |
...ix-object-constructors-to-fail-gracefully.patch | 100 --------------------- |
17 |
...ber-0.4.2-meson-Build-tests-conditionally.patch | 41 --------- |
18 |
...0.4.2-v4l-add-basic-check-for-nil-monitor.patch | 42 --------- |
19 |
.../wireplumber/wireplumber-0.4.2-r1.ebuild | 89 ------------------ |
20 |
7 files changed, 343 deletions(-) |
21 |
|
22 |
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest |
23 |
index 16e6431c7e3a..7e7ad56f15da 100644 |
24 |
--- a/media-video/wireplumber/Manifest |
25 |
+++ b/media-video/wireplumber/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c |
28 |
DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a |
29 |
|
30 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch b/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch |
31 |
deleted file mode 100644 |
32 |
index a519e4212828..000000000000 |
33 |
--- a/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch |
34 |
+++ /dev/null |
35 |
@@ -1,42 +0,0 @@ |
36 |
-From 32d96189b807ab53317a33217c661ce4b1ac8e49 Mon Sep 17 00:00:00 2001 |
37 |
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= |
38 |
- <89q1r14hd@×××××××××××××.com> |
39 |
-Date: Wed, 15 Sep 2021 12:21:40 +0300 |
40 |
-Subject: [PATCH 3/5] bluez: add basic check for nil monitor |
41 |
-MIME-Version: 1.0 |
42 |
-Content-Type: text/plain; charset=UTF-8 |
43 |
-Content-Transfer-Encoding: 8bit |
44 |
- |
45 |
-If PipeWire is built without Bluetooth support, then |
46 |
- |
47 |
-`monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props)` |
48 |
- |
49 |
-will result in a nil monitor. This commit adds a basic sanity check |
50 |
-to avoid further using the nil variable. |
51 |
- |
52 |
-Thanks-to: Pascal Flöschel (initial bug report) |
53 |
-Thanks-to: George Kiagiadakis <george.kiagiadakis@×××××××××.com> |
54 |
-Bug: https://bugs.gentoo.org/813043 |
55 |
---- |
56 |
- src/scripts/monitors/bluez.lua | 8 ++++++-- |
57 |
- 1 file changed, 6 insertions(+), 2 deletions(-) |
58 |
- |
59 |
-diff --git a/src/scripts/monitors/bluez.lua b/src/scripts/monitors/bluez.lua |
60 |
-index fc229fa..4066536 100644 |
61 |
---- a/src/scripts/monitors/bluez.lua |
62 |
-+++ b/src/scripts/monitors/bluez.lua |
63 |
-@@ -129,5 +129,9 @@ local monitor_props = config.properties or {} |
64 |
- monitor_props["api.bluez5.connection-info"] = true |
65 |
- |
66 |
- monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props) |
67 |
--monitor:connect("create-object", createDevice) |
68 |
--monitor:activate(Feature.SpaDevice.ENABLED) |
69 |
-+if monitor then |
70 |
-+ monitor:connect("create-object", createDevice) |
71 |
-+ monitor:activate(Feature.SpaDevice.ENABLED) |
72 |
-+else |
73 |
-+ Log.message("PipeWire's BlueZ SPA missing or broken. Bluetooth not supported.") |
74 |
-+end |
75 |
--- |
76 |
-2.33.0 |
77 |
- |
78 |
|
79 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch b/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch |
80 |
deleted file mode 100644 |
81 |
index 7653de28bbbb..000000000000 |
82 |
--- a/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch |
83 |
+++ /dev/null |
84 |
@@ -1,28 +0,0 @@ |
85 |
-From 05334c1ec72af68f915ea18e32b230857918f600 Mon Sep 17 00:00:00 2001 |
86 |
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= |
87 |
- <89q1r14hd@×××××××××××××.com> |
88 |
-Date: Wed, 15 Sep 2021 13:23:45 +0300 |
89 |
-Subject: [PATCH 5/5] lib/wp/device: demote missing SPA warning to message |
90 |
- |
91 |
-Warnings can be scary, so best not to scare users with what's likely |
92 |
-intentional omission of a particular SPA plugin (currently V4L & BlueZ). |
93 |
---- |
94 |
- lib/wp/device.c | 2 +- |
95 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
96 |
- |
97 |
-diff --git a/lib/wp/device.c b/lib/wp/device.c |
98 |
-index f0c32af..9a0b995 100644 |
99 |
---- a/lib/wp/device.c |
100 |
-+++ b/lib/wp/device.c |
101 |
-@@ -617,7 +617,7 @@ wp_spa_device_new_from_spa_factory (WpCore * core, |
102 |
- handle = pw_context_load_spa_handle (pw_context, factory_name, |
103 |
- props ? wp_properties_peek_dict (props) : NULL); |
104 |
- if (!handle) { |
105 |
-- wp_warning ("SPA handle '%s' could not be loaded; is it installed?", |
106 |
-+ wp_message ("SPA handle '%s' could not be loaded; is it installed?", |
107 |
- factory_name); |
108 |
- return NULL; |
109 |
- } |
110 |
--- |
111 |
-2.33.0 |
112 |
- |
113 |
|
114 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch b/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch |
115 |
deleted file mode 100644 |
116 |
index 2bb3a8d653e8..000000000000 |
117 |
--- a/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch |
118 |
+++ /dev/null |
119 |
@@ -1,100 +0,0 @@ |
120 |
-From 2a5f9c51f2f8dd29cd19a14f165ca2b425a172fc Mon Sep 17 00:00:00 2001 |
121 |
-From: George Kiagiadakis <george.kiagiadakis@×××××××××.com> |
122 |
-Date: Wed, 15 Sep 2021 12:51:47 +0300 |
123 |
-Subject: [PATCH 2/5] lua/api: fix object constructors to fail gracefully |
124 |
- |
125 |
---- |
126 |
- modules/module-lua-scripting/api.c | 35 ++++++++++++++++++------------ |
127 |
- 1 file changed, 21 insertions(+), 14 deletions(-) |
128 |
- |
129 |
-diff --git a/modules/module-lua-scripting/api.c b/modules/module-lua-scripting/api.c |
130 |
-index 5691b63..2830477 100644 |
131 |
---- a/modules/module-lua-scripting/api.c |
132 |
-+++ b/modules/module-lua-scripting/api.c |
133 |
-@@ -836,8 +836,9 @@ device_new (lua_State *L) |
134 |
- |
135 |
- WpDevice *d = wp_device_new_from_factory (get_wp_export_core (L), |
136 |
- factory, properties); |
137 |
-- wplua_pushobject (L, d); |
138 |
-- return 1; |
139 |
-+ if (d) |
140 |
-+ wplua_pushobject (L, d); |
141 |
-+ return d ? 1 : 0; |
142 |
- } |
143 |
- |
144 |
- /* WpSpaDevice */ |
145 |
-@@ -855,8 +856,9 @@ spa_device_new (lua_State *L) |
146 |
- |
147 |
- WpSpaDevice *d = wp_spa_device_new_from_spa_factory (get_wp_export_core (L), |
148 |
- factory, properties); |
149 |
-- wplua_pushobject (L, d); |
150 |
-- return 1; |
151 |
-+ if (d) |
152 |
-+ wplua_pushobject (L, d); |
153 |
-+ return d ? 1 : 0; |
154 |
- } |
155 |
- |
156 |
- static int |
157 |
-@@ -903,8 +905,9 @@ node_new (lua_State *L) |
158 |
- |
159 |
- WpNode *d = wp_node_new_from_factory (get_wp_export_core (L), |
160 |
- factory, properties); |
161 |
-- wplua_pushobject (L, d); |
162 |
-- return 1; |
163 |
-+ if (d) |
164 |
-+ wplua_pushobject (L, d); |
165 |
-+ return d ? 1 : 0; |
166 |
- } |
167 |
- |
168 |
- static int |
169 |
-@@ -1011,8 +1014,9 @@ impl_node_new (lua_State *L) |
170 |
- |
171 |
- WpImplNode *d = wp_impl_node_new_from_pw_factory (get_wp_export_core (L), |
172 |
- factory, properties); |
173 |
-- wplua_pushobject (L, d); |
174 |
-- return 1; |
175 |
-+ if (d) |
176 |
-+ wplua_pushobject (L, d); |
177 |
-+ return d ? 1 : 0; |
178 |
- } |
179 |
- |
180 |
- /* Port */ |
181 |
-@@ -1045,8 +1049,9 @@ link_new (lua_State *L) |
182 |
- } |
183 |
- |
184 |
- WpLink *l = wp_link_new_from_factory (get_wp_core (L), factory, properties); |
185 |
-- wplua_pushobject (L, l); |
186 |
-- return 1; |
187 |
-+ if (l) |
188 |
-+ wplua_pushobject (L, l); |
189 |
-+ return l ? 1 : 0; |
190 |
- } |
191 |
- |
192 |
- /* Client */ |
193 |
-@@ -1124,8 +1129,9 @@ session_item_new (lua_State *L) |
194 |
- { |
195 |
- const char *type = luaL_checkstring (L, 1); |
196 |
- WpSessionItem *si = wp_session_item_make (get_wp_core (L), type); |
197 |
-- wplua_pushobject (L, si); |
198 |
-- return 1; |
199 |
-+ if (si) |
200 |
-+ wplua_pushobject (L, si); |
201 |
-+ return si ? 1 : 0; |
202 |
- } |
203 |
- |
204 |
- static int |
205 |
-@@ -1135,8 +1141,9 @@ session_item_get_associated_proxy (lua_State *L) |
206 |
- const char *typestr = luaL_checkstring (L, 2); |
207 |
- WpProxy *proxy = wp_session_item_get_associated_proxy (si, |
208 |
- parse_gtype (typestr)); |
209 |
-- wplua_pushobject (L, proxy); |
210 |
-- return 1; |
211 |
-+ if (proxy) |
212 |
-+ wplua_pushobject (L, proxy); |
213 |
-+ return proxy ? 1 : 0; |
214 |
- } |
215 |
- |
216 |
- static int |
217 |
--- |
218 |
-2.33.0 |
219 |
- |
220 |
|
221 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch b/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch |
222 |
deleted file mode 100644 |
223 |
index dab53c71bf4a..000000000000 |
224 |
--- a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch |
225 |
+++ /dev/null |
226 |
@@ -1,41 +0,0 @@ |
227 |
-From 3b24c419b497c283e64df23b3b5eecd4c3d51927 Mon Sep 17 00:00:00 2001 |
228 |
-From: Sam James <sam@g.o> |
229 |
-Date: Tue, 14 Sep 2021 05:07:41 +0100 |
230 |
-Subject: [PATCH 1/5] meson: Build tests conditionally |
231 |
- |
232 |
-It's useful downstream to be able to control building |
233 |
-tests, as there's not much use building them if we're |
234 |
-not going to run them. |
235 |
- |
236 |
-Signed-off-by: Sam James <sam@g.o> |
237 |
---- |
238 |
- meson.build | 5 ++++- |
239 |
- meson_options.txt | 2 ++ |
240 |
- 2 files changed, 6 insertions(+), 1 deletion(-) |
241 |
- |
242 |
-diff --git a/meson.build b/meson.build |
243 |
-index 3712a82..5f87ade 100644 |
244 |
---- a/meson.build |
245 |
-+++ b/meson.build |
246 |
-@@ -109,4 +109,7 @@ subdir('lib') |
247 |
- subdir('docs') |
248 |
- subdir('modules') |
249 |
- subdir('src') |
250 |
--subdir('tests') |
251 |
-+ |
252 |
-+if get_option('tests') |
253 |
-+ subdir('tests') |
254 |
-+endif |
255 |
-diff --git a/meson_options.txt b/meson_options.txt |
256 |
-index a7a0a89..4008864 100644 |
257 |
---- a/meson_options.txt |
258 |
-+++ b/meson_options.txt |
259 |
-@@ -24,3 +24,5 @@ option('systemd-user-unit-dir', |
260 |
- description : 'Directory for user systemd units') |
261 |
- option('glib-supp', type : 'string', value : '', |
262 |
- description: 'The glib.supp valgrind suppressions file to be used when running valgrind') |
263 |
-+option('tests', type : 'boolean', value : 'true', |
264 |
-+ description : 'Build the test suite') |
265 |
--- |
266 |
-2.33.0 |
267 |
- |
268 |
|
269 |
diff --git a/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch b/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch |
270 |
deleted file mode 100644 |
271 |
index f7fee3d11e4a..000000000000 |
272 |
--- a/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch |
273 |
+++ /dev/null |
274 |
@@ -1,42 +0,0 @@ |
275 |
-From 3b41df35a885b4db04528d839b87e88bf1345240 Mon Sep 17 00:00:00 2001 |
276 |
-From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= |
277 |
- <89q1r14hd@×××××××××××××.com> |
278 |
-Date: Wed, 15 Sep 2021 13:08:04 +0300 |
279 |
-Subject: [PATCH 4/5] v4l: add basic check for nil monitor |
280 |
-MIME-Version: 1.0 |
281 |
-Content-Type: text/plain; charset=UTF-8 |
282 |
-Content-Transfer-Encoding: 8bit |
283 |
- |
284 |
-If PipeWire is built without V4L support, then |
285 |
- |
286 |
-`monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {})` |
287 |
- |
288 |
-will result in a nil monitor. This commit adds a basic sanity check |
289 |
-to avoid further using the nil variable. |
290 |
- |
291 |
-Thanks-to: Pascal Flöschel (initial bug report) |
292 |
-Thanks-to: George Kiagiadakis <george.kiagiadakis@×××××××××.com> |
293 |
-Bug: https://bugs.gentoo.org/813043 |
294 |
---- |
295 |
- src/scripts/monitors/v4l2.lua | 8 ++++++-- |
296 |
- 1 file changed, 6 insertions(+), 2 deletions(-) |
297 |
- |
298 |
-diff --git a/src/scripts/monitors/v4l2.lua b/src/scripts/monitors/v4l2.lua |
299 |
-index e698cd7..fd9a20d 100644 |
300 |
---- a/src/scripts/monitors/v4l2.lua |
301 |
-+++ b/src/scripts/monitors/v4l2.lua |
302 |
-@@ -131,5 +131,9 @@ function createDevice(parent, id, type, factory, properties) |
303 |
- end |
304 |
- |
305 |
- monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {}) |
306 |
--monitor:connect("create-object", createDevice) |
307 |
--monitor:activate(Feature.SpaDevice.ENABLED) |
308 |
-+if monitor then |
309 |
-+ monitor:connect("create-object", createDevice) |
310 |
-+ monitor:activate(Feature.SpaDevice.ENABLED) |
311 |
-+else |
312 |
-+ Log.message("PipeWire's V4L SPA missing or broken. Video4Linux not supported.") |
313 |
-+end |
314 |
--- |
315 |
-2.33.0 |
316 |
- |
317 |
|
318 |
diff --git a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild |
319 |
deleted file mode 100644 |
320 |
index dbee3e92073a..000000000000 |
321 |
--- a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild |
322 |
+++ /dev/null |
323 |
@@ -1,89 +0,0 @@ |
324 |
-# Copyright 1999-2021 Gentoo Authors |
325 |
-# Distributed under the terms of the GNU General Public License v2 |
326 |
- |
327 |
-EAPI=7 |
328 |
- |
329 |
-LUA_COMPAT=( lua5-{3,4} ) |
330 |
- |
331 |
-inherit lua-single meson systemd |
332 |
- |
333 |
-if [[ ${PV} == 9999 ]]; then |
334 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" |
335 |
- EGIT_BRANCH="master" |
336 |
- inherit git-r3 |
337 |
-else |
338 |
- SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" |
339 |
- KEYWORDS="~amd64 ~riscv" |
340 |
-fi |
341 |
- |
342 |
-DESCRIPTION="Replacement for pipewire-media-session" |
343 |
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" |
344 |
- |
345 |
-LICENSE="MIT" |
346 |
-SLOT="0/0.4" |
347 |
-IUSE="systemd test" |
348 |
- |
349 |
-REQUIRED_USE="${LUA_REQUIRED_USE}" |
350 |
- |
351 |
-RESTRICT="!test? ( test )" |
352 |
- |
353 |
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building |
354 |
-BDEPEND=" |
355 |
- dev-libs/glib |
356 |
- dev-util/gdbus-codegen |
357 |
- dev-util/glib-utils |
358 |
-" |
359 |
- |
360 |
-DEPEND=" |
361 |
- ${LUA_DEPS} |
362 |
- >=dev-libs/glib-2.62 |
363 |
- >=media-video/pipewire-0.3.32 |
364 |
- virtual/libc |
365 |
- systemd? ( sys-apps/systemd ) |
366 |
-" |
367 |
- |
368 |
-# Any dev-lua/* deps get declared like this inside RDEPEND: |
369 |
-# $(lua_gen_cond_dep ' |
370 |
-# dev-lua/<NAME>[${LUA_USEDEP}] |
371 |
-# ') |
372 |
-RDEPEND="${DEPEND}" |
373 |
- |
374 |
-DOCS=( {NEWS,README}.rst ) |
375 |
- |
376 |
-PATCHES=( |
377 |
- "${FILESDIR}"/${PN}-0.4.2-meson-Build-tests-conditionally.patch |
378 |
- "${FILESDIR}"/${PN}-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch |
379 |
- "${FILESDIR}"/${PN}-0.4.2-bluez-add-basic-check-for-nil-monitor.patch |
380 |
- "${FILESDIR}"/${PN}-0.4.2-v4l-add-basic-check-for-nil-monitor.patch |
381 |
- "${FILESDIR}"/${PN}-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch |
382 |
-) |
383 |
- |
384 |
-src_configure() { |
385 |
- local emesonargs=( |
386 |
- -Dintrospection=disabled # Only used for Sphinx doc generation |
387 |
- -Dsystem-lua=true # We always unbundle everything we can |
388 |
- -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) |
389 |
- $(meson_feature systemd) |
390 |
- -Dsystemd-system-service=false # Matches upstream |
391 |
- $(meson_use systemd systemd-user-service) |
392 |
- -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) |
393 |
- -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) |
394 |
- $(meson_use test tests) |
395 |
- ) |
396 |
- |
397 |
- meson_src_configure |
398 |
-} |
399 |
- |
400 |
-pkg_postinst() { |
401 |
- if systemd_is_booted ; then |
402 |
- elog "To replace media-session with WirePlumber immediately:" |
403 |
- elog "systemctl --user disable --now pipewire-media-session.service" |
404 |
- elog "systemctl --user enable --now wireplumber.service" |
405 |
- else |
406 |
- elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf" |
407 |
- elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace" |
408 |
- elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber" |
409 |
- elog "The switch to WirePlumber will happen the next time pipewire is started." |
410 |
- fi |
411 |
- elog |
412 |
-} |