3 files changed, 33 insertions, 6 deletions
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch
new file mode 100644
index 000000000..74e5ba33b
--- /dev/null
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire/0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch
@@ -0,0 +1,26 @@
+From 3b2935ed044e657b515a07e78638b902baa8157a Mon Sep 17 00:00:00 2001
+From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
+Date: Wed, 1 Dec 2021 12:17:52 +0530
+Subject: [PATCH] meson: remove pipewire_module_c_args as it is no longer used.
+
+Upstream-Status: Inappropriate [smack specific]
+
+---
+ src/modules/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index d1d90bf05..c9f629c08 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -114,7 +114,6 @@ pipewire_module_echo_cancel = shared_library('pipewire-module-echo-cancel',
+ 
+ pipewire_module_access_seclabel = shared_library('pipewire-module-access-seclabel',
+   [ 'module-access-seclabel.c' ],
+-  c_args : pipewire_module_c_args,
+   include_directories : [configinc, spa_inc],
+   install : true,
+   install_dir : modules_install_dir,
+-- 
+2.33.1
+
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
index c895efc8b..b6086ea1c 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.30.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/pipewire/pipewire_0.3.43.bbappend
@@ -1,14 +1,15 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/pipewire:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/pipewire:"
 
-SRC_URI_append= "\
+SRC_URI:append= "\
     file://0001-modules-add-new-access-seclabel-module.patch \
+    file://0002-meson-remove-pipewire_module_c_args-as-it-is-no-long.patch \
     file://pipewire.conf \
     file://pipewire.service \
     file://pipewire.socket \
     file://smack-pipewire \
 "
 
-do_install_append() {
+do_install:append() {
      # replace the original config with our smack-aware config
     mkdir -p ${D}${sysconfdir}/pipewire/
     install -m 0644 ${WORKDIR}/pipewire.conf ${D}${sysconfdir}/pipewire/pipewire.conf
@@ -28,7 +29,7 @@ do_install_append() {
     fi
 }
 
-FILES_${PN}_append = "\
+FILES:${PN}:append = "\
     ${sysconfdir}/smack/accesses.d/* \
     ${sysconfdir}/pipewire/pipewire.conf \
 "
diff --git a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
index e94f67eff..106de4f6a 100644
--- a/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
+++ b/meta-pipewire/dynamic-layers/meta-app-framework/recipes-multimedia/wireplumber/wireplumber-config-agl_git.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/wireplumber-config-agl:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/wireplumber-config-agl:"
 
 SRC_URI += "\
     file://50-access-agl.lua \
     file://access-smack.lua \
 "
 
-do_install_append() {
+do_install:append() {
     # install smack-specific config
     config_dir="${D}${sysconfdir}/wireplumber/config.lua.d/"
     access_dir="${D}${sysconfdir}/wireplumber/scripts/access/"