From 05336c554d1babc27c119256e278cc89ddbc86d1 Mon Sep 17 00:00:00 2001 From: fossdd Date: Wed, 5 Mar 2025 22:46:00 +0100 Subject: [PATCH] systemd/pipewire: upgrade to 1.4.1 Upstream: - https://gitlab.alpinelinux.org/alpine/aports/-/commit/a0b4c813c66f812bba56da6603a11d5bdeba662d - https://gitlab.alpinelinux.org/alpine/aports/-/commit/a1c2f5b55925d1febc3feb2e6772e63ffb0334c1 - https://gitlab.alpinelinux.org/alpine/aports/-/commit/5f7e0b7cbb6c786ce07a6393c804c7c5cb4d0ea1 - https://gitlab.alpinelinux.org/alpine/aports/-/commit/d93edb2de92923915f04d9420393f64f8b334cd3 - https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/81346 Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6290 --- extra-repos/systemd/pipewire/APKBUILD | 24 +++------- .../systemd/pipewire/spa-init-explictly.patch | 44 ------------------- 2 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 extra-repos/systemd/pipewire/spa-init-explictly.patch diff --git a/extra-repos/systemd/pipewire/APKBUILD b/extra-repos/systemd/pipewire/APKBUILD index b290ff4c1..dd53d2436 100644 --- a/extra-repos/systemd/pipewire/APKBUILD +++ b/extra-repos/systemd/pipewire/APKBUILD @@ -1,9 +1,9 @@ # Forked from Alpine to rebuild with systemd support pkgname=pipewire -pkgver=9991.2.7 -_pkgver=1.2.7 -pkgrel=3 +pkgver=9991.4.1 +_pkgver=1.4.1 +pkgrel=0 _so_ver=0.3 pkgdesc="Multimedia processing graphs" url="https://pipewire.org/" @@ -38,6 +38,7 @@ makedepends=" roc-toolkit-dev sbc-dev vulkan-loader-dev + webrtc-audio-processing-2-dev xmltoman systemd-dev @@ -58,12 +59,12 @@ subpackages=" $pkgname-tools $pkgname-spa-tools:spa_tools $pkgname-lang + $pkgname-echo-cancel:echo_cancel " install="$pkgname.post-upgrade $pkgname.post-install $pkgname.pre-deinstall" source="https://gitlab.freedesktop.org/PipeWire/pipewire/-/archive/$_pkgver/pipewire-$_pkgver.tar.gz pipewire.desktop pipewire-launcher.sh - spa-init-explictly.patch " builddir="$srcdir/$pkgname-$_pkgver" @@ -76,16 +77,6 @@ case "$CARCH" in ;; esac -case "$CARCH" in - ppc64le|s390x|riscv64) - # no webrtc-audio-processing - ;; - *) - makedepends="$makedepends webrtc-audio-processing-1-dev" - subpackages="$subpackages $pkgname-echo-cancel:echo_cancel" - ;; -esac - # put libs last to steal residual files taken by some prior extras subpackages="$subpackages $pkgname-libs" @@ -156,7 +147,7 @@ pulse() { amove usr/bin/pipewire-pulse amove usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-pulse.so amove usr/lib/pipewire-$_so_ver/libpipewire-module-pulse-tunnel.so - amove usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain-lv2.so + amove usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain.so amove usr/share/pipewire/pipewire-pulse.conf amove usr/share/pipewire/pipewire-pulse.conf.avail amove usr/lib/systemd/user/pipewire-pulse.service @@ -255,8 +246,7 @@ libs() { } sha512sums=" -a921bcc56626a90b4195f98cb47934d1e4eeda9d2fb76ea93ef49b56bf2b080ec711d93dfd47833bcdbc9c4623bad16c93f00828d214439aee06ab9a31f21ffd pipewire-1.2.7.tar.gz +f14964153d2f07e70e10a1a17e53354639cab736dc4290d530a9762f739d50f812033e50718bef036b993664532fccec85bc762d8e4a887be1a10b8fb4249984 pipewire-1.4.1.tar.gz b70b05151bcf4b7f13d68b2731d789b9c062fadfcb91f4ed6bdb0d495390b0010f57034fb115a053e1459c7d9ea27523ca1c0c69639aeeb96c17ebac8dfc5b57 pipewire.desktop 6f4322d306bef346187778fc0975d608fdd37d4c8e08815a0aed28ef7e07c3f21d6a80b70743d0f867bdc237f5e1dc28131c778e7a45e363e5677668ce7acdb1 pipewire-launcher.sh -5bed0f3a41947c58b9da6cc1b1a9779ed7c3c148dff86f0e6535ae051f7cc110eeb5bc203df00a0bd51c90c3dc229f0fb8ca76c4b83490fa2ebb4bc9afa55c6c spa-init-explictly.patch " diff --git a/extra-repos/systemd/pipewire/spa-init-explictly.patch b/extra-repos/systemd/pipewire/spa-init-explictly.patch deleted file mode 100644 index 1e1ce8ea3..000000000 --- a/extra-repos/systemd/pipewire/spa-init-explictly.patch +++ /dev/null @@ -1,44 +0,0 @@ -Patch-Source: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/0ca64277b317b4836beccaa3248ab9055526811c ---- -From 0ca64277b317b4836beccaa3248ab9055526811c Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 30 Sep 2024 10:06:30 +0200 -Subject: [PATCH] spa: initialize all fields explicitly - -Patch by Petar Popovic - -Fixes #4325 ---- - spa/include/spa/pod/builder.h | 2 +- - spa/include/spa/pod/parser.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h -index 0564d94ea2..6d3e9d54af 100644 ---- a/spa/include/spa/pod/builder.h -+++ b/spa/include/spa/pod/builder.h -@@ -49,7 +49,7 @@ struct spa_pod_builder { - struct spa_callbacks callbacks; - }; - --#define SPA_POD_BUILDER_INIT(buffer,size) ((struct spa_pod_builder){ (buffer), (size), 0, {0}, {0} }) -+#define SPA_POD_BUILDER_INIT(buffer,size) ((struct spa_pod_builder){ (buffer), (size), 0, {0,0,NULL},{NULL,NULL}}) - - static inline void - spa_pod_builder_get_state(struct spa_pod_builder *builder, struct spa_pod_builder_state *state) -diff --git a/spa/include/spa/pod/parser.h b/spa/include/spa/pod/parser.h -index 083f911713..4c1e72acce 100644 ---- a/spa/include/spa/pod/parser.h -+++ b/spa/include/spa/pod/parser.h -@@ -33,7 +33,7 @@ struct spa_pod_parser { - struct spa_pod_parser_state state; - }; - --#define SPA_POD_PARSER_INIT(buffer,size) ((struct spa_pod_parser){ (buffer), (size), 0, {0} }) -+#define SPA_POD_PARSER_INIT(buffer,size) ((struct spa_pod_parser){ (buffer), (size), 0, {0,0,NULL}}) - - static inline void spa_pod_parser_init(struct spa_pod_parser *parser, - const void *data, uint32_t size) --- -GitLab -