diff options
author | Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> | 2021-11-19 10:01:47 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-12-01 19:49:40 +0000 |
commit | 3162c02c529bd8055e686e6f45cb7a6ef0b36151 (patch) | |
tree | 1ac5d9471bb7919c545c5855b9ab8d7cc459ddff /media-video/wireplumber | |
parent | sci-libs/lapack: Stabilize 3.10.0 ppc64, #733580 (diff) | |
download | gentoo-3162c02c529bd8055e686e6f45cb7a6ef0b36151.tar.gz gentoo-3162c02c529bd8055e686e6f45cb7a6ef0b36151.tar.bz2 gentoo-3162c02c529bd8055e686e6f45cb7a6ef0b36151.zip |
media-video/wireplumber: clean up the old 0.4.2-r1 ebuild
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video/wireplumber')
7 files changed, 0 insertions, 343 deletions
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 16e6431c7e3a..7e7ad56f15da 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,2 +1 @@ -DIST wireplumber-0.4.2.tar.gz 332499 BLAKE2B 4747ae405a824b019415188ff1a586d32fc2e97aba6777cd1e403aadf0e44458156d1f8b6dbc706b812a7ea8c873d0f506f2b42817d1bc5312874530edaf7234 SHA512 8ded43fba5de58068516558918d49c86be7d67330e8a14e735561fefadba5e27952d556987b7304dead52b4e2f72a7d9626da0170e768c4702dd164840b08e3c DIST wireplumber-0.4.5.tar.gz 345035 BLAKE2B 177984901790228d8ddeb8ee2a548eb53db07c8077734590c3f964df36cfa47a4099e049ae9a19a136f4147c75b7122359a73b8387a641768f71484b9c4ab119 SHA512 b0d5962e7a83709cc3115fbf0a04b63660085aeea2ebda6d78d692065ccb193cea8b44bb506fa440cf0b88bfae71a4f69a192cd6cba885ebf3c9270bea50c67a 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 deleted file mode 100644 index a519e4212828..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.2-bluez-add-basic-check-for-nil-monitor.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 32d96189b807ab53317a33217c661ce4b1ac8e49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= - <89q1r14hd@relay.firefox.com> -Date: Wed, 15 Sep 2021 12:21:40 +0300 -Subject: [PATCH 3/5] bluez: add basic check for nil monitor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If PipeWire is built without Bluetooth support, then - -`monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props)` - -will result in a nil monitor. This commit adds a basic sanity check -to avoid further using the nil variable. - -Thanks-to: Pascal Flöschel (initial bug report) -Thanks-to: George Kiagiadakis <george.kiagiadakis@collabora.com> -Bug: https://bugs.gentoo.org/813043 ---- - src/scripts/monitors/bluez.lua | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/scripts/monitors/bluez.lua b/src/scripts/monitors/bluez.lua -index fc229fa..4066536 100644 ---- a/src/scripts/monitors/bluez.lua -+++ b/src/scripts/monitors/bluez.lua -@@ -129,5 +129,9 @@ local monitor_props = config.properties or {} - monitor_props["api.bluez5.connection-info"] = true - - monitor = SpaDevice("api.bluez5.enum.dbus", monitor_props) --monitor:connect("create-object", createDevice) --monitor:activate(Feature.SpaDevice.ENABLED) -+if monitor then -+ monitor:connect("create-object", createDevice) -+ monitor:activate(Feature.SpaDevice.ENABLED) -+else -+ Log.message("PipeWire's BlueZ SPA missing or broken. Bluetooth not supported.") -+end --- -2.33.0 - 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 deleted file mode 100644 index 7653de28bbbb..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 05334c1ec72af68f915ea18e32b230857918f600 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= - <89q1r14hd@relay.firefox.com> -Date: Wed, 15 Sep 2021 13:23:45 +0300 -Subject: [PATCH 5/5] lib/wp/device: demote missing SPA warning to message - -Warnings can be scary, so best not to scare users with what's likely -intentional omission of a particular SPA plugin (currently V4L & BlueZ). ---- - lib/wp/device.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/wp/device.c b/lib/wp/device.c -index f0c32af..9a0b995 100644 ---- a/lib/wp/device.c -+++ b/lib/wp/device.c -@@ -617,7 +617,7 @@ wp_spa_device_new_from_spa_factory (WpCore * core, - handle = pw_context_load_spa_handle (pw_context, factory_name, - props ? wp_properties_peek_dict (props) : NULL); - if (!handle) { -- wp_warning ("SPA handle '%s' could not be loaded; is it installed?", -+ wp_message ("SPA handle '%s' could not be loaded; is it installed?", - factory_name); - return NULL; - } --- -2.33.0 - 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 deleted file mode 100644 index 2bb3a8d653e8..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 2a5f9c51f2f8dd29cd19a14f165ca2b425a172fc Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis <george.kiagiadakis@collabora.com> -Date: Wed, 15 Sep 2021 12:51:47 +0300 -Subject: [PATCH 2/5] lua/api: fix object constructors to fail gracefully - ---- - modules/module-lua-scripting/api.c | 35 ++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 14 deletions(-) - -diff --git a/modules/module-lua-scripting/api.c b/modules/module-lua-scripting/api.c -index 5691b63..2830477 100644 ---- a/modules/module-lua-scripting/api.c -+++ b/modules/module-lua-scripting/api.c -@@ -836,8 +836,9 @@ device_new (lua_State *L) - - WpDevice *d = wp_device_new_from_factory (get_wp_export_core (L), - factory, properties); -- wplua_pushobject (L, d); -- return 1; -+ if (d) -+ wplua_pushobject (L, d); -+ return d ? 1 : 0; - } - - /* WpSpaDevice */ -@@ -855,8 +856,9 @@ spa_device_new (lua_State *L) - - WpSpaDevice *d = wp_spa_device_new_from_spa_factory (get_wp_export_core (L), - factory, properties); -- wplua_pushobject (L, d); -- return 1; -+ if (d) -+ wplua_pushobject (L, d); -+ return d ? 1 : 0; - } - - static int -@@ -903,8 +905,9 @@ node_new (lua_State *L) - - WpNode *d = wp_node_new_from_factory (get_wp_export_core (L), - factory, properties); -- wplua_pushobject (L, d); -- return 1; -+ if (d) -+ wplua_pushobject (L, d); -+ return d ? 1 : 0; - } - - static int -@@ -1011,8 +1014,9 @@ impl_node_new (lua_State *L) - - WpImplNode *d = wp_impl_node_new_from_pw_factory (get_wp_export_core (L), - factory, properties); -- wplua_pushobject (L, d); -- return 1; -+ if (d) -+ wplua_pushobject (L, d); -+ return d ? 1 : 0; - } - - /* Port */ -@@ -1045,8 +1049,9 @@ link_new (lua_State *L) - } - - WpLink *l = wp_link_new_from_factory (get_wp_core (L), factory, properties); -- wplua_pushobject (L, l); -- return 1; -+ if (l) -+ wplua_pushobject (L, l); -+ return l ? 1 : 0; - } - - /* Client */ -@@ -1124,8 +1129,9 @@ session_item_new (lua_State *L) - { - const char *type = luaL_checkstring (L, 1); - WpSessionItem *si = wp_session_item_make (get_wp_core (L), type); -- wplua_pushobject (L, si); -- return 1; -+ if (si) -+ wplua_pushobject (L, si); -+ return si ? 1 : 0; - } - - static int -@@ -1135,8 +1141,9 @@ session_item_get_associated_proxy (lua_State *L) - const char *typestr = luaL_checkstring (L, 2); - WpProxy *proxy = wp_session_item_get_associated_proxy (si, - parse_gtype (typestr)); -- wplua_pushobject (L, proxy); -- return 1; -+ if (proxy) -+ wplua_pushobject (L, proxy); -+ return proxy ? 1 : 0; - } - - static int --- -2.33.0 - 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 deleted file mode 100644 index dab53c71bf4a..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.2-meson-Build-tests-conditionally.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3b24c419b497c283e64df23b3b5eecd4c3d51927 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Tue, 14 Sep 2021 05:07:41 +0100 -Subject: [PATCH 1/5] meson: Build tests conditionally - -It's useful downstream to be able to control building -tests, as there's not much use building them if we're -not going to run them. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - meson.build | 5 ++++- - meson_options.txt | 2 ++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3712a82..5f87ade 100644 ---- a/meson.build -+++ b/meson.build -@@ -109,4 +109,7 @@ subdir('lib') - subdir('docs') - subdir('modules') - subdir('src') --subdir('tests') -+ -+if get_option('tests') -+ subdir('tests') -+endif -diff --git a/meson_options.txt b/meson_options.txt -index a7a0a89..4008864 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -24,3 +24,5 @@ option('systemd-user-unit-dir', - description : 'Directory for user systemd units') - option('glib-supp', type : 'string', value : '', - description: 'The glib.supp valgrind suppressions file to be used when running valgrind') -+option('tests', type : 'boolean', value : 'true', -+ description : 'Build the test suite') --- -2.33.0 - 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 deleted file mode 100644 index f7fee3d11e4a..000000000000 --- a/media-video/wireplumber/files/wireplumber-0.4.2-v4l-add-basic-check-for-nil-monitor.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3b41df35a885b4db04528d839b87e88bf1345240 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= - <89q1r14hd@relay.firefox.com> -Date: Wed, 15 Sep 2021 13:08:04 +0300 -Subject: [PATCH 4/5] v4l: add basic check for nil monitor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If PipeWire is built without V4L support, then - -`monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {})` - -will result in a nil monitor. This commit adds a basic sanity check -to avoid further using the nil variable. - -Thanks-to: Pascal Flöschel (initial bug report) -Thanks-to: George Kiagiadakis <george.kiagiadakis@collabora.com> -Bug: https://bugs.gentoo.org/813043 ---- - src/scripts/monitors/v4l2.lua | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/scripts/monitors/v4l2.lua b/src/scripts/monitors/v4l2.lua -index e698cd7..fd9a20d 100644 ---- a/src/scripts/monitors/v4l2.lua -+++ b/src/scripts/monitors/v4l2.lua -@@ -131,5 +131,9 @@ function createDevice(parent, id, type, factory, properties) - end - - monitor = SpaDevice("api.v4l2.enum.udev", config.properties or {}) --monitor:connect("create-object", createDevice) --monitor:activate(Feature.SpaDevice.ENABLED) -+if monitor then -+ monitor:connect("create-object", createDevice) -+ monitor:activate(Feature.SpaDevice.ENABLED) -+else -+ Log.message("PipeWire's V4L SPA missing or broken. Video4Linux not supported.") -+end --- -2.33.0 - diff --git a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild deleted file mode 100644 index dbee3e92073a..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.2-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson systemd - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" - EGIT_BRANCH="master" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~riscv" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="systemd test" - -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -BDEPEND=" - dev-libs/glib - dev-util/gdbus-codegen - dev-util/glib-utils -" - -DEPEND=" - ${LUA_DEPS} - >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.32 - virtual/libc - systemd? ( sys-apps/systemd ) -" - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/<NAME>[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND}" - -DOCS=( {NEWS,README}.rst ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.2-meson-Build-tests-conditionally.patch - "${FILESDIR}"/${PN}-0.4.2-lua-api-fix-object-constructors-to-fail-gracefully.patch - "${FILESDIR}"/${PN}-0.4.2-bluez-add-basic-check-for-nil-monitor.patch - "${FILESDIR}"/${PN}-0.4.2-v4l-add-basic-check-for-nil-monitor.patch - "${FILESDIR}"/${PN}-0.4.2-lib-wp-device-demote-missing-SPA-warning-to-message.patch -) - -src_configure() { - local emesonargs=( - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature systemd) - -Dsystemd-system-service=false # Matches upstream - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - ) - - meson_src_configure -} - -pkg_postinst() { - if systemd_is_booted ; then - elog "To replace media-session with WirePlumber immediately:" - elog "systemctl --user disable --now pipewire-media-session.service" - elog "systemctl --user enable --now wireplumber.service" - else - elog "OpenRC users need to copy ${EROOT}/usr/share/pipewire/pipewire.conf" - elog "to ${EROOT}/etc/pipewire/pipewire.conf and in it replace" - elog "${EROOT}/usr/bin/pipewire-media-session with ${EROOT}/usr/bin/wireplumber" - elog "The switch to WirePlumber will happen the next time pipewire is started." - fi - elog -} |