X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-pipewire%2Frecipes-multimedia%2Fwireplumber%2Fwireplumber_git.bb;h=f42b12770e6da3e5d2f20810948988f9fc818141;hb=6c546aa68a4c0281cb74e2b2dc68f82b102fbbbd;hp=8daff304235d260486036699e4f13d2bb16ac8d8;hpb=e17ac0809da83b63f7242b6ad91c00e377c7f96e;p=AGL%2Fmeta-agl.git

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
index 8daff3042..f42b12770 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
@@ -14,9 +14,17 @@ DEPENDS = "glib-2.0 glib-2.0-native pipewire lua"
 SRC_URI = "\
     git://gitlab.freedesktop.org/pipewire/wireplumber.git;protocol=https;branch=master \
 "
-SRCREV = "4af7e2bd68c4862bb707b62edf7557df56dad10f"
+# v0.4.8
+SRCREV = "e14bb72dcc85e2130d0ea96768e5ae3b375a041e"
 
-PV = "0.4.0"
+# patches to be able to compile with lower version of meson that is available in AGL.
+SRC_URI += "\
+    file://0001-Revert-tests-add-pipewire-env-variables-when-running.patch \
+    file://0002-Revert-wp-uninstalled-build-this-script-with-the-mes.patch \
+    file://0003-spa-json-fix-va_list-APIs-for-different-architecture.patch \
+"
+
+PV = "0.4.8"
 S  = "${WORKDIR}/git"
 
 WPAPI="0.4"
@@ -35,10 +43,10 @@ PACKAGECONFIG = "\
 
 PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsystemd-system-service=true -Dsystemd-user-service=false,-Dsystemd=disabled -Dsystemd-system-service=false -Dsystemd-user-service=false,systemd"
 
-do_configure_prepend() {
+do_configure:prepend() {
     # relax meson version requirement
     # we only need 0.54 when building with -Dsystem-lua=false
-    sed "s/meson_version : '>= 0.54.0'/meson_version : '>= 0.51.0'/" ${S}/meson.build > ${S}/tmp.build
+    sed "s/meson_version : '>= 0.56.0'/meson_version : '>= 0.53.2'/" ${S}/meson.build > ${S}/tmp.build
     mv -f ${S}/tmp.build ${S}/meson.build
 }
 
@@ -47,26 +55,31 @@ PACKAGES =+ "\
     ${PN}-config \
 "
 
-SYSTEMD_SERVICE_${PN} = "wireplumber.service"
-FILES_${PN} = "\
+SYSTEMD_SERVICE:${PN} = "wireplumber.service"
+FILES:${PN} = "\
     ${bindir}/wireplumber \
     ${bindir}/wpctl \
     ${bindir}/wpexec \
     ${libdir}/wireplumber-${WPAPI}/* \
-    ${datadir}/wireplumber/* \
+    ${datadir}/wireplumber/scripts/* \
     ${systemd_system_unitdir}/* \
 "
-RPROVIDES_${PN} += "virtual/pipewire-sessionmanager"
-RDEPENDS_${PN} += "virtual/wireplumber-config"
+RPROVIDES:${PN} += "virtual/pipewire-sessionmanager"
+RDEPENDS:${PN} += "virtual/wireplumber-config"
 
-FILES_lib${PN}-${WPAPI} = "\
+FILES:lib${PN}-${WPAPI} = "\
     ${libdir}/libwireplumber-${WPAPI}.so.* \
 "
 
-FILES_${PN}-config += "\
+FILES:${PN}-config += "\
     ${sysconfdir}/wireplumber/* \
+    ${datadir}/wireplumber/*conf \
+    ${datadir}/wireplumber/common/* \
+    ${datadir}/wireplumber/main.lua.d/* \
+    ${datadir}/wireplumber/bluetooth.lua.d/* \
+    ${datadir}/wireplumber/policy.lua.d/* \
 "
-CONFFILES_${PN}-config += "\
+CONFFILES:${PN}-config += "\
     ${sysconfdir}/wireplumber/* \
 "
-RPROVIDES_${PN}-config += "virtual/wireplumber-config"
+RPROVIDES:${PN}-config += "virtual/wireplumber-config"