X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-pipewire%2Frecipes-multimedia%2Fwireplumber%2Fwireplumber_git.bb;h=e5c825384c36778b0aadd5c2228b5766385cc985;hb=762c46e7456563c2f10a9054195a89599fd0e24c;hp=56065db487c324eef7a9d0176afe488163089ff1;hpb=fa55216e21c8a63f9f9b9309edc005ed2bea2485;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 56065db48..e5c825384 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_git.bb
@@ -14,10 +14,14 @@ DEPENDS = "glib-2.0 glib-2.0-native pipewire lua"
 SRC_URI = "\
     git://gitlab.freedesktop.org/pipewire/wireplumber.git;protocol=https;branch=master \
 "
-SRCREV = "ecef960b7859b9b24885840453a3ddf4812845f2"
+# v0.4.15
+SRCREV = "d67b48e595cb4612fd7fd47f97df6b8883ef7f60"
 
-#PV = "0.3.95+git${SRCPV}"
-PV = "0.3.95"
+# patches to be able to compile with lower version of meson that is available in AGL.
+SRC_URI += "\
+"
+
+PV = "0.4.15"
 S  = "${WORKDIR}/git"
 
 WPAPI="0.4"
@@ -36,10 +40,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
 }
 
@@ -48,26 +52,35 @@ 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/* \
+    ${datadir}/zsh/* \
     ${systemd_system_unitdir}/* \
 "
-RPROVIDES_${PN} += "virtual/pipewire-sessionmanager"
-RDEPENDS_${PN} += "virtual/wireplumber-config"
+RPROVIDES:${PN} += "virtual/pipewire-sessionmanager"
 
-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 += "\
-    ${sysconfdir}/wireplumber/* \
-"
-RPROVIDES_${PN}-config += "virtual/wireplumber-config"
+do_install:append() {
+    rm -rf ${D}${sysconfdir}/wireplumber/
+    rm -f ${D}${datadir}/wireplumber/*conf
+    rm -rf ${D}${datadir}/wireplumber/common
+    rm -rf ${D}${datadir}/wireplumber/main.lua.d
+    rm -rf ${D}${datadir}/wireplumber/bluetooth.lua.d
+    rm -rf ${D}${datadir}/wireplumber/policy.lua.d
+}