mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-30 19:50:23 +00:00
mutter: Make gnome-desktop and libcanberra dependencies optional
mutter may be used as a standalone compositor and even an X11 WM without the complete GNOME desktop environment. Make this optional and add the new control knob to PACKAGECONFIG by default. The built-in sound player functionality depends on libcanberra which is considered outdated. Make this optional. Add the colord build dependency explicitly because mutter does not build when PACKAGECONFIG = "gnome-desktop" is not used. Add the gsettings-desktop-schemas runtime dependency explicitly, so mutter may work without PACKAGECONFIG = "gnome-desktop". This change allows mutter in kiosk-like scenarios. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
97f91bdbb0
commit
d6f689da36
@ -6,6 +6,7 @@ DEPENDS = " \
|
|||||||
xserver-xorg-cvt-native \
|
xserver-xorg-cvt-native \
|
||||||
wayland-native \
|
wayland-native \
|
||||||
virtual/libx11 \
|
virtual/libx11 \
|
||||||
|
colord \
|
||||||
graphene \
|
graphene \
|
||||||
gtk4 \
|
gtk4 \
|
||||||
gdk-pixbuf \
|
gdk-pixbuf \
|
||||||
@ -13,8 +14,6 @@ DEPENDS = " \
|
|||||||
pango \
|
pango \
|
||||||
gsettings-desktop-schemas \
|
gsettings-desktop-schemas \
|
||||||
json-glib \
|
json-glib \
|
||||||
gnome-desktop \
|
|
||||||
gnome-settings-daemon \
|
|
||||||
libei \
|
libei \
|
||||||
libxtst \
|
libxtst \
|
||||||
libxkbfile \
|
libxkbfile \
|
||||||
@ -41,6 +40,7 @@ PACKAGECONFIG ??= " \
|
|||||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \
|
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \
|
||||||
sm \
|
sm \
|
||||||
startup-notification \
|
startup-notification \
|
||||||
|
gnome-desktop \
|
||||||
"
|
"
|
||||||
|
|
||||||
EXTRA_OEMESON += " \
|
EXTRA_OEMESON += " \
|
||||||
@ -57,7 +57,9 @@ PACKAGECONFIG[libdisplay-info] = "-Dlibdisplay_info=true, -Dlibdisplay_info=fals
|
|||||||
PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
|
PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
|
||||||
# Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+
|
# Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+
|
||||||
PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
|
PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
|
||||||
|
PACKAGECONFIG[gnome-desktop] = "-Dlibgnome_desktop=true, -Dlibgnome_desktop=false, gnome-desktop gnome-settings-daemon"
|
||||||
PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
|
PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
|
||||||
|
PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcanberra"
|
||||||
PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
|
PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
|
||||||
PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
|
PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
|
||||||
|
|
||||||
@ -102,5 +104,5 @@ FILES:${PN}-dev += " \
|
|||||||
${libdir}/${MUTTER_API_NAME}/lib*.so \
|
${libdir}/${MUTTER_API_NAME}/lib*.so \
|
||||||
"
|
"
|
||||||
|
|
||||||
RDEPENDS:${PN} += "zenity ${PN}-gsettings"
|
RDEPENDS:${PN} += "zenity ${PN}-gsettings gsettings-desktop-schemas"
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user