From 22cccbd771b859f4a127e28575b360daf36cb4f7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 2 Oct 2021 15:41:46 -0600 Subject: [PATCH] package/pipewire: bump to version 0.3.38 We need to backport an ARM compilation build fix. The optional pw-cli tool now depends on readline, so depend on it when available. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../0001-cpu-fix-compilation-on-ARM.patch | 28 +++++++++++++++++++ package/pipewire/pipewire.hash | 2 +- package/pipewire/pipewire.mk | 6 +++- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 package/pipewire/0001-cpu-fix-compilation-on-ARM.patch diff --git a/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch b/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch new file mode 100644 index 0000000000..445cab08bd --- /dev/null +++ b/package/pipewire/0001-cpu-fix-compilation-on-ARM.patch @@ -0,0 +1,28 @@ +From f8817b439433798bd7217dc4ae72197887b0fc96 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 30 Sep 2021 11:12:27 +0200 +Subject: [PATCH] cpu: fix compilation on ARM + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +f8817b439433798bd7217dc4ae72197887b0fc96] +--- + 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 d80b8ad87..de07ebf41 100644 +--- a/spa/plugins/support/cpu-arm.c ++++ b/spa/plugins/support/cpu-arm.c +@@ -80,7 +80,7 @@ arm_init(struct impl *impl) + int arch; + + if (!(cpuinfo = get_cpuinfo())) { +- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl); ++ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl); + return 1; + } + +-- +2.25.1 + diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a289464988..879cfa41cb 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce7dbd71bce46c9d81c549d8c846e8f3a8a263a19bf981d141d57bd2d316e3ac pipewire-0.3.35.tar.bz2 +sha256 f4ae272e8d3fa3ff6a6ba2a465d1f951405b08fd31bbb82c27bb7cf55e113ba1 pipewire-0.3.38.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index b88f129055..87e747e917 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.35 +PIPEWIRE_VERSION = 0.3.38 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) @@ -146,6 +146,10 @@ else PIPEWIRE_CONF_OPTS += -Dlibpulse=disabled endif +ifeq ($(BR2_PACKAGE_READLINE),y) +PIPEWIRE_DEPENDENCIES += readline +endif + ifeq ($(BR2_PACKAGE_SDL2),y) PIPEWIRE_DEPENDENCIES += sdl2 PIPEWIRE_CONF_OPTS += -Dsdl2=enabled