xfce4-pulseaudio-plugin: unbreak build with pavucontrol6

'pavucontrol-6' requires gtk4 and thus also needs gpu acceleration
Only recommend to install pavucontrol if it would run

- remove x11 from DISTRO_FEATURES. There's no direct dependency on it
- add PACKAFECONFIG for libcanberra

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
index 8773cbcbb9..2fa76351a4 100644
--- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
+++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.5.1.bb
@@ -7,7 +7,7 @@ XFCE_COMPRESS_TYPE = "xz"
 
 inherit xfce-panel-plugin features_check
 
-REQUIRED_DISTRO_FEATURES = "pulseaudio x11"
+REQUIRED_DISTRO_FEATURES = "pulseaudio"
 
 DEPENDS += "dbus-glib pulseaudio"
 
@@ -15,8 +15,8 @@ SRC_URI[sha256sum] = "8e1f3a505f37aa3bc2816a58bec5f9555366f1c476f10eab59fd0e6581
 
 PACKAGECONFIG ??= "libnotify"
 PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify"
+PACKAGECONFIG[libcanberra] = "--enable-libcanberra,--disable-libcanberra,libcanberra"
 
-EXTRA_OECONF = "GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources \
-                "
+EXTRA_OECONF = "GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources"
 
-RRECOMMENDS:${PN} = "pavucontrol"
+RRECOMMENDS:${PN} = "${@bb.utils.contains_any('DISTRO_FEATURES', 'opengl vulkan', 'pavucontrol', '', d)}"