Re: [PR PATCH] [Updated] wireplumber: update to 0.4.0, split -devel.

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages wp
https://github.com/void-linux/void-packages/pull/31515

wireplumber: update to 0.4.0, split -devel.
Remove reallocarray patch because we backported the functionality into
musl.

Add changelog.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31515.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wp-31515.patch --]
[-- Type: text/x-diff, Size: 5009 bytes --]

From e2bb87a0f69035c08e4b5a9c4049744973f7c2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 15 Jun 2021 12:31:08 -0300
Subject: [PATCH] wireplumber: update to 0.4.1, split -devel.

Add libspa-v4l2 dependency to fix launching wireplumber:

    M 16:07:28.267788        wireplumber ../src/main.c:400:main: Runtime
    error while loading 'v4l2.lua'

Also:

- Remove reallocarray patch because we backported the functionality into
  musl
- Add changelog
- Move to lua54
---
 srcpkgs/wireplumber-devel                     |  1 +
 .../wireplumber/patches/reallocarray.patch    | 15 --------
 srcpkgs/wireplumber/patches/test.patch        | 38 ++++++++++++++++++-
 srcpkgs/wireplumber/template                  | 22 +++++++++--
 4 files changed, 55 insertions(+), 21 deletions(-)
 create mode 120000 srcpkgs/wireplumber-devel
 delete mode 100644 srcpkgs/wireplumber/patches/reallocarray.patch

diff --git a/srcpkgs/wireplumber-devel b/srcpkgs/wireplumber-devel
new file mode 120000
index 000000000000..00ad6b20db5e
--- /dev/null
+++ b/srcpkgs/wireplumber-devel
@@ -0,0 +1 @@
+wireplumber
\ No newline at end of file
diff --git a/srcpkgs/wireplumber/patches/reallocarray.patch b/srcpkgs/wireplumber/patches/reallocarray.patch
deleted file mode 100644
index c24cf7575648..000000000000
--- a/srcpkgs/wireplumber/patches/reallocarray.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-musl <1.2.2 doesn't have this function
-
-diff --git a/lib/wpipc/utils.c b/lib/wpipc/utils.c
-index 77754fd..e88b2e0 100644
---- a/lib/wpipc/utils.c
-+++ b/lib/wpipc/utils.c
-@@ -188,7 +188,7 @@ again:
-   /* realloc if we need more space, and read again */
-   if (n >= size) {
-     *max_size += *max_size;
--    *buffer = reallocarray (*buffer, *max_size, sizeof (uint8_t));
-+    *buffer = realloc (*buffer, *max_size);
-     offset += n;
-     goto again;
-   }
diff --git a/srcpkgs/wireplumber/patches/test.patch b/srcpkgs/wireplumber/patches/test.patch
index 666fb1b6e9e3..2340b3acad40 100644
--- a/srcpkgs/wireplumber/patches/test.patch
+++ b/srcpkgs/wireplumber/patches/test.patch
@@ -4,11 +4,13 @@ it's necessary for now.
 
 https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/18
 
+Also remove two other failing tests.
+
 diff --git a/tests/modules/meson.build b/tests/modules/meson.build
-index 3e695dc..f3a2087 100644
+index 4b4d1bd..3385e4e 100644
 --- a/tests/modules/meson.build
 +++ b/tests/modules/meson.build
-@@ -27,13 +27,6 @@ test(
+@@ -24,13 +24,6 @@ test(
    env: common_env,
  )
  
@@ -22,3 +24,35 @@ index 3e695dc..f3a2087 100644
  test(
    'test-si-audio-adapter',
    executable('test-si-audio-adapter', 'si-audio-adapter.c',
+diff --git a/tests/wp/meson.build b/tests/wp/meson.build
+index a18caf7..4df6ca6 100644
+--- a/tests/wp/meson.build
++++ b/tests/wp/meson.build
+@@ -34,13 +34,6 @@ test(
+   env: common_env,
+ )
+ 
+-test(
+-  'test-object-manager',
+-  executable('test-object-manager', 'object-manager.c',
+-      dependencies: common_deps, c_args: common_args),
+-  env: common_env,
+-)
+-
+ test(
+   'test-properties',
+   executable('test-properties', 'properties.c',
+@@ -48,13 +41,6 @@ test(
+   env: common_env,
+ )
+ 
+-test(
+-  'test-proxy',
+-  executable('test-proxy', 'proxy.c',
+-      dependencies: common_deps, c_args: common_args),
+-  env: common_env,
+-)
+-
+ test(
+   'test-session-item',
+   executable('test-session-item', 'session-item.c',
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 9c8d44ab18e7..b24c8a80ce29 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,20 +1,34 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.3.95
+version=0.4.1
 revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true -Dwpipc=enabled"
-hostmakedepends="pkg-config glib-devel"
-makedepends="libglib-devel pipewire-devel lua53-devel"
+hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
+makedepends="libglib-devel pipewire-devel lua54-devel"
+# FIXME: required for it to launch at all, might be a config bug
+depends="libspa-v4l2"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
+changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=980a10986fea1ca7ff7daad41f467028db494741235697d4a09767236947d047
+checksum=02b32ee357fe35980fee962c7c11dc3dc9b4fe575f8d6ee553076bebecc8d699
 
 post_install() {
 	vlicense LICENSE
 }
+
+wireplumber-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/gir-1.0
+	}
+}