diff mbox series

[meta-gnome] gnome-settings-daemon: add alsa as a mandatory dependency

Message ID 20260314171407.3510715-1-skandigraun@gmail.com
State New
Headers show
Series [meta-gnome] gnome-settings-daemon: add alsa as a mandatory dependency | expand

Commit Message

Gyorgy Sarvari March 14, 2026, 5:14 p.m. UTC
In case the recipe is compiled without alsa DISTRO_FEATURE,
compilation fails with the following error:

../sources/gnome-settings-daemon-49.1/meson.build:132:0: ERROR: Assert failed: ALSA is not optional on Linux platforms

This change makes alsa a standard non-optional dependency.

Alsa is enabled by default in the upstream meson config, it is
not enabled explicitly in the recipe.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../gnome-settings-daemon/gnome-settings-daemon_49.1.bb     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb
index dfda4a3a13..a9b5aceb1d 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb
@@ -18,23 +18,23 @@  DEPENDS = " \
     upower \
     libwacom \
     networkmanager \
+    alsa-lib \
 "
 
 # all these are mandatory
-REQUIRED_DISTRO_FEATURES = "polkit pulseaudio systemd gobject-introspection-data"
+REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
 SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch"
 SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1"
 
 PACKAGECONFIG ??= " \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \
     gudev \
     smartcard \
     cups \
 "
-PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib"
 PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups"
 PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev"
 PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss"