MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 22:35:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pipewire-media-session: Fix for incompatible-pointer-types build errors

Browse Source 
Backport a fix from master branch to fix these errors:
| FAILED: src/pipewire-media-session.p/access-flatpak.c.o
| x86_64-poky-linux-gcc [...] -o src/pipewire-media-session.p/access-flatpak.c.o -c ../git/src/access-flatpak.c
| ../git/src/access-flatpak.c: In function 'object_update':
| ../git/src/access-flatpak.c:117:62: error: passing argument 1 of 'pw_client_update_permissions' from incompatible pointer type [-Wincompatible-pointer-types]
|   117 |                 pw_client_update_permissions(client->obj->obj.proxy,
|       |                                              ~~~~~~~~~~~~~~~~^~~~~~
|       |                                                              |
|       |                                                              struct pw_proxy *
| In file included from .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/pipewire.h:15,
|                  from ../git/src/access-flatpak.c:35:
| .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/client.h:191:71: note: expected 'struct pw_client *' but argument is of type 'struct pw_proxy *'
|   191 | PW_API_CLIENT_IMPL int pw_client_update_permissions(struct pw_client *object, uint32_t n_permissions,
|       |                                                     ~~~~~~~~~~~~~~~~~~^~~~~~

| FAILED: src/pipewire-media-session.p/default-routes.c.o
| x86_64-poky-linux-gcc [...] -o src/pipewire-media-session.p/default-routes.c.o -c ../git/src/default-routes.c
| ../git/src/default-routes.c: In function 'restore_route_params':
| ../git/src/default-routes.c:482:29: error: passing argument 1 of 'pw_device_set_param' from incompatible pointer type [-Wincompatible-pointer-types]
|   482 |         pw_device_set_param((struct pw_node*)dev->obj->obj.proxy,
|       |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|       |                             |
|       |                             struct pw_node *
| In file included from .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/pipewire.h:18,
|                  from ../git/src/default-routes.c:43:
| .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/device.h:179:62: note: expected 'struct pw_device *' but argument is of type 'struct pw_node *'
|   179 | PW_API_DEVICE_IMPL int pw_device_set_param(struct pw_device *object, uint32_t id, uint32_t flags,
|       |                                            ~~~~~~~~~~~~~~~~~~^~~~~~

| FAILED: src/pipewire-media-session.p/access-portal.c.o
| x86_64-poky-linux-gcc [...] -o src/pipewire-media-session.p/access-portal.c.o -c ../git/src/access-portal.c
| ../git/src/access-portal.c: In function 'set_global_permissions':
| ../git/src/access-portal.c:268:62: error: passing argument 1 of 'pw_client_update_permissions' from incompatible pointer type [-Wincompatible-pointer-types]
|   268 |                 pw_client_update_permissions(client->obj->obj.proxy,
|       |                                              ~~~~~~~~~~~~~~~~^~~~~~
|       |                                                              |
|       |                                                              struct pw_proxy *
| In file included from .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/pipewire.h:15,
|                  from ../git/src/access-portal.c:39:
| .../tmp/work/core2-64-poky-linux/pipewire-media-session/0.4.2/recipe-sysroot/usr/include/pipewire-0.3/pipewire/client.h:191:71: note: expected 'struct pw_client *' but argument is of type 'struct pw_proxy *'
|   191 | PW_API_CLIENT_IMPL int pw_client_update_permissions(struct pw_client *object, uint32_t n_permissions,
|       |                                                     ~~~~~~~~~~~~~~~~~~^~~~~~

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yoann Congal 2025-03-15 23:22:06 +01:00 committed by Khem Raj
parent e3a6de1f94
commit 5bfc081d8f
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session/0001-pass-right-types-to-methods.patch Normal file
View File

@ -0,0 +1,53 @@
From 97e0d7646c873ea3badfa604b3f084ed6208af97 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 26 Nov 2024 13:37:06 +0100
Subject: [PATCH] pass right types to methods
Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/media-session/-/commit/e6243381cf2b7d0d33707627b4186f5580908752]
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
src/access-flatpak.c | 2 +-
src/access-portal.c | 2 +-
src/default-routes.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/access-flatpak.c b/src/access-flatpak.c
index afe780b2d..dd802d6eb 100644
--- a/src/access-flatpak.c
+++ b/src/access-flatpak.c
@@ -114,7 +114,7 @@ static void object_update(void *data)
pw_log_info("%p: flatpak client %d granted 0x%08x permissions"
, impl, client->id, perms);
permissions[0] = PW_PERMISSION_INIT(PW_ID_ANY, perms);
- pw_client_update_permissions(client->obj->obj.proxy,
+ pw_client_update_permissions((struct pw_client*)client->obj->obj.proxy,
1, permissions);
client->active = true;
}
diff --git a/src/access-portal.c b/src/access-portal.c
index 92d95a26b..4e3a9f52a 100644
--- a/src/access-portal.c
+++ b/src/access-portal.c
@@ -265,7 +265,7 @@ set_global_permissions(void *data, struct sm_object *object)
permissions[n_permissions++] =
PW_PERMISSION_INIT(object->id, allowed ? PW_PERM_ALL : 0);
pw_log_info("%p: object %d allowed:%d", impl, object->id, allowed);
- pw_client_update_permissions(client->obj->obj.proxy,
+ pw_client_update_permissions((struct pw_client*)client->obj->obj.proxy,
n_permissions, permissions);
}
return 0;
diff --git a/src/default-routes.c b/src/default-routes.c
index 5a842faf7..86f9e217b 100644
--- a/src/default-routes.c
+++ b/src/default-routes.c
@@ -479,7 +479,7 @@ static int restore_route_params(struct device *dev, const char *val, const struc
if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
spa_debug_pod(2, NULL, param);
- pw_device_set_param((struct pw_node*)dev->obj->obj.proxy,
+ pw_device_set_param((struct pw_device*)dev->obj->obj.proxy,
SPA_PARAM_Route, 0, param);
sm_media_session_schedule_rescan(dev->impl->session);

4
meta-multimedia/recipes-multimedia/pipewire/pipewire-media-session_0.4.2.bb
View File

@ -10,7 +10,9 @@ DEPENDS = " \
dbus \
"
SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master"
SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master \
file://0001-pass-right-types-to-methods.patch \
"
S = "${WORKDIR}/git"
SRCREV = "80dae7e24bec02b2befe09a72fbac6e2b38ccb5c"