diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2026-03-14 18:14:07 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-18 14:33:24 -0700 |
| commit | 8ceaab26fb32fc2317e9e16416e3ddc9528d7018 (patch) | |
| tree | b7cb96715284fdcbd0cf775c8491692b330f3883 | |
| parent | 84d6a691c8cd7069b4880da5c448537023bc868a (diff) | |
| download | meta-openembedded-8ceaab26fb32fc2317e9e16416e3ddc9528d7018.tar.gz | |
gnome-settings-daemon: add alsa as a mandatory dependency
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_49.1.bb | 6 |
1 files changed, 3 insertions, 3 deletions
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 = " \ | |||
| 18 | upower \ | 18 | upower \ |
| 19 | libwacom \ | 19 | libwacom \ |
| 20 | networkmanager \ | 20 | networkmanager \ |
| 21 | alsa-lib \ | ||
| 21 | " | 22 | " |
| 22 | 23 | ||
| 23 | # all these are mandatory | 24 | # all these are mandatory |
| 24 | REQUIRED_DISTRO_FEATURES = "polkit pulseaudio systemd gobject-introspection-data" | 25 | REQUIRED_DISTRO_FEATURES = "alsa polkit pulseaudio systemd gobject-introspection-data" |
| 25 | GIR_MESON_OPTION = "" | 26 | GIR_MESON_OPTION = "" |
| 26 | 27 | ||
| 27 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" | 28 | SRC_URI += "file://0001-gsd-smartcard-enum-types.c.in-fix-reproducibility-is.patch" |
| 28 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" | 29 | SRC_URI[archive.sha256sum] = "2a9957fc4f91c3b9127b49484179bef485120d9c1c208e44d44e6a746e6cc1c1" |
| 29 | 30 | ||
| 30 | PACKAGECONFIG ??= " \ | 31 | PACKAGECONFIG ??= " \ |
| 31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11 alsa', d)} \ | 32 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
| 32 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \ | 33 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)} \ |
| 33 | gudev \ | 34 | gudev \ |
| 34 | smartcard \ | 35 | smartcard \ |
| 35 | cups \ | 36 | cups \ |
| 36 | " | 37 | " |
| 37 | PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" | ||
| 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" | 38 | PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" |
| 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" | 39 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" |
| 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" | 40 | PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" |
