From 5c2e8a461771a3dd4e25614b70a88d1fa399a9c7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 12 Dec 2021 20:25:44 +0100 Subject: [PATCH] package/pipewire: bump to version 0.3.40 - Drop patches (already in version) - This bump will fix build failures on ARM - This bump will fix build failures with old glibc thanks to https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e1671236671afbf7719b3ef29039ec4ac5102347 https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.40 Fixes: - http://autobuild.buildroot.org/results/faec4ea02f4a6ddf44d54d5784d9de866c2d8a1f - http://autobuild.buildroot.org/results/31014558b6ad72e0f602095c423d48219dd6ebfa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 88281a5c4efbc637f0a6d1ac6e92f68ba2050c1a) Signed-off-by: Peter Korsgaard --- ...ix-compilation-on-some-architectures.patch | 28 ----------------- ...u-disable-VFP-asm-when-not-available.patch | 30 ------------------- package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 2 +- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch delete mode 100644 package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch diff --git a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch b/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch deleted file mode 100644 index 4465523610..0000000000 --- a/package/pipewire/0001-cpu-fix-compilation-on-some-architectures.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 651f0decea5f83730c271e9bed03cdd0048fcd49 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 21 Oct 2021 11:09:48 +0200 -Subject: [PATCH] cpu: fix compilation on some architectures - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu.c b/spa/plugins/support/cpu.c -index ee1816512..01cff4854 100644 ---- a/spa/plugins/support/cpu.c -+++ b/spa/plugins/support/cpu.c -@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory, - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL) - this->vm_type = atoi(str); - if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL) -- impl_cpu_zero_denormals(this, spa_atob(str)); -+ spa_cpu_zero_denormals(&this->cpu, spa_atob(str)); - } - - spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x", --- -GitLab - diff --git a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch b/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch deleted file mode 100644 index 297016edc2..0000000000 --- a/package/pipewire/0002-cpu-disable-VFP-asm-when-not-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2cddd4a775c145570f4a8a30d28b57f551d43206 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 25 Oct 2021 16:32:16 +0200 -Subject: [PATCH] cpu: disable VFP asm when not available - -Fixes #1746 - -[Retrieved from: -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206] -Signed-off-by: Fabrice Fontaine ---- - spa/plugins/support/cpu-arm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spa/plugins/support/cpu-arm.c b/spa/plugins/support/cpu-arm.c -index c07711f70..fe6222f7c 100644 ---- a/spa/plugins/support/cpu-arm.c -+++ b/spa/plugins/support/cpu-arm.c -@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable) - "msr fpcr, %0 \n" - "isb \n" - : "=r"(cw)::"memory"); --#else -+#elif (defined(__VFP_FP__) && !defined(__SOFTFP__)) - uint32_t cw; - if (enable) - __asm__ __volatile__( --- -GitLab - diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index 7894939b0d..c41c0a3686 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 fafcde675b264485883df1f3bf7e08f36fd1d661ecc092dcec6fd35a059c2aff pipewire-0.3.39.tar.bz2 +sha256 b6a2eab8bda2f3cb87c3a0a714839696831ad27b5786674c4bd6c3776b9ebc97 pipewire-0.3.40.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index cbf24dd0ec..efda3ad695 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.39 +PIPEWIRE_VERSION = 0.3.40 PIPEWIRE_SOURCE = pipewire-$(PIPEWIRE_VERSION).tar.bz2 PIPEWIRE_SITE = https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION) PIPEWIRE_LICENSE = MIT, LGPL-2.1+ (libspa-alsa), GPL-2.0 (libjackserver)