summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2026-03-19 06:18:43 +0100
committerKhem Raj <raj.khem@gmail.com>2026-03-19 13:22:58 -0700
commit2889a70aabe49b72114381ce9cdb79179b761ccb (patch)
treeb8af4f465cc1498e301fa1ff318cf77b61af454e
parentd87c0d8f3de48741b3e1f250c04139302234e25b (diff)
downloadmeta-openembedded-2889a70aabe49b72114381ce9cdb79179b761ccb.tar.gz
pipewire: Backport two patches to build with glibc 2.43
This avoids the following error: In file included from spa/plugins/alsa/acp/compat.c:26: spa/plugins/alsa/acp/compat.h: In function 'pa_path_get_filename': spa/plugins/alsa/acp/compat.h:437:13: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] 437 | if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) | ^ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch28
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch25
-rw-r--r--meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb2
3 files changed, 55 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch
new file mode 100644
index 0000000000..6ded1c15f8
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch
@@ -0,0 +1,28 @@
1From c847b8162959c29b783585e0dcadbfb096e7cb73 Mon Sep 17 00:00:00 2001
2From: Ripley Tom <discofan420@protonmail.com>
3Date: Sat, 21 Feb 2026 19:33:11 +0100
4Subject: [PATCH] spa/plugins/alsa/acp/compat.h: Fix missed
5 -Wdiscarded-qualifiers warning
6
7Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c847b8162959c29b783585e0dcadbfb096e7cb73]
8Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
9---
10 spa/plugins/alsa/acp/compat.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h
14index f7592e1a6..0f7b959df 100644
15--- a/spa/plugins/alsa/acp/compat.h
16+++ b/spa/plugins/alsa/acp/compat.h
17@@ -429,9 +429,9 @@ static PA_PRINTF_FUNC(1,0) inline char *pa_vsprintf_malloc(const char *fmt, va_l
18
19 #define pa_fopen_cloexec(f,m) fopen(f,m"e")
20
21-static inline char *pa_path_get_filename(const char *p)
22+static inline const char *pa_path_get_filename(const char *p)
23 {
24- char *fn;
25+ const char *fn;
26 if (!p)
27 return NULL;
28 if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch
new file mode 100644
index 0000000000..d6fc5866ec
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire/0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch
@@ -0,0 +1,25 @@
1From 1a37f445a20e67976c83360ab5830887fffe37e2 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Tue, 17 Mar 2026 03:17:15 +1100
4Subject: [PATCH] spa/plugins/alsa/acp/compat.h: p is already const do not
5 recast
6
7Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a37f445a20e67976c83360ab5830887fffe37e2]
8Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
9---
10 spa/plugins/alsa/acp/compat.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/spa/plugins/alsa/acp/compat.h b/spa/plugins/alsa/acp/compat.h
14index 0f7b959df..87151d197 100644
15--- a/spa/plugins/alsa/acp/compat.h
16+++ b/spa/plugins/alsa/acp/compat.h
17@@ -436,7 +436,7 @@ static inline const char *pa_path_get_filename(const char *p)
18 return NULL;
19 if ((fn = strrchr(p, PA_PATH_SEP_CHAR)))
20 return fn+1;
21- return (char*) p;
22+ return p;
23 }
24
25 static inline bool pa_is_path_absolute(const char *fn)
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb
index 14e467fa33..6914a4a0ad 100644
--- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb
+++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.6.2.bb
@@ -15,6 +15,8 @@ DEPENDS = "dbus ncurses"
15SRCREV = "95da54a482b68475958bbc3fa572a9c20df0df74" 15SRCREV = "95da54a482b68475958bbc3fa572a9c20df0df74"
16BRANCH = "${@oe.utils.trim_version('${PV}', 2)}" 16BRANCH = "${@oe.utils.trim_version('${PV}', 2)}"
17SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}" 17SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=${BRANCH};protocol=https;tag=${PV}"
18SRC_URI += "file://0001-spa-plugins-alsa-acp-compat.h-Fix-missed-Wdiscarded-.patch"
19SRC_URI += "file://0002-spa-plugins-alsa-acp-compat.h-p-is-already-const-do-.patch"
18 20
19inherit meson pkgconfig systemd gettext useradd 21inherit meson pkgconfig systemd gettext useradd
20 22