From 9859c59ade32712168e15b7ab4b19eaa387e6ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Tue, 15 Jun 2021 12:31:08 -0300 Subject: [PATCH] wireplumber: update to 0.4.0, 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' Remove reallocarray patch because we backported the functionality into musl. Add changelog. --- srcpkgs/wireplumber-devel | 1 + .../wireplumber/patches/reallocarray.patch | 15 -------------- srcpkgs/wireplumber/template | 20 ++++++++++++++++--- 3 files changed, 18 insertions(+), 18 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/template b/srcpkgs/wireplumber/template index 9c8d44ab18e7..ca5a667359ca 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.0 revision=1 build_style=meson build_helper=gir configure_args="-Dintrospection=enabled -Dsystem-lua=true -Dwpipc=enabled" -hostmakedepends="pkg-config glib-devel" +hostmakedepends="pkg-config glib-devel python3-lxml doxygen" makedepends="libglib-devel pipewire-devel lua53-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 " 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=55f7846fcf4197528b2021e93f10c09887b8156b00d0417f01e9f442e9a6a841 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 + } +}