From e0ee32259ec91b7ef87677bb2e7eebfcb655d99d Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 6 Jun 2023 11:00:12 +0200 Subject: mutter: upgrade 44.1 -> 44.2 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/mutter/mutter_44.1.bb | 105 ------------------------- meta-gnome/recipes-gnome/mutter/mutter_44.2.bb | 105 +++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/mutter/mutter_44.1.bb create mode 100644 meta-gnome/recipes-gnome/mutter/mutter_44.2.bb diff --git a/meta-gnome/recipes-gnome/mutter/mutter_44.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_44.1.bb deleted file mode 100644 index 1060e916a3..0000000000 --- a/meta-gnome/recipes-gnome/mutter/mutter_44.1.bb +++ /dev/null @@ -1,105 +0,0 @@ -SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - xserver-xorg-cvt-native \ - wayland-native \ - virtual/libx11 \ - graphene \ - gtk4 \ - gdk-pixbuf \ - cairo \ - pango \ - gsettings-desktop-schemas \ - json-glib \ - gnome-desktop \ - gnome-settings-daemon \ - libxtst \ - libxkbfile \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ - xwayland \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext features_check - -SRC_URI[archive.sha256sum] = "973aeafab42f06f934a0994fc84878958cdb4d2766a4c867a5ccdc547dd57056" - -# x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" - -# systemd can be replaced by libelogind (not available atow - make systemd -# mandatory distro feature) -LOGIND ?= "systemd" -REQUIRED_DISTRO_FEATURES += "systemd" - -# profiler requires sysprof 3.34 which is not willing to build atow -PACKAGECONFIG ??= " \ - native-backend \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \ - sm \ - startup-notification \ -" - -EXTRA_OEMESON += " \ - -Dtests=false \ - -Dnative_tests=false \ - -Dxwayland_path=${bindir}/Xwayland \ -" - -# combi-config - see meson_options.txt for more details -PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" -PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" -PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -# Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" -PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" -PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" -PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" - -MUTTER_API_NAME = "mutter-12" - -do_install:prepend() { - sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c - sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c - sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c -} - -do_install:append() { - # Add gir links in standard paths. That makes dependents life much easier - # to find them - install -d ${D}${datadir}/gir-1.0 - for gir_full in `find ${D}${libdir}/${MUTTER_API_NAME} -name '*.gir'`; do - gir=`basename "$gir_full"` - ln -sr "${D}${libdir}/${MUTTER_API_NAME}/$gir" "${D}${datadir}/gir-1.0/$gir" - done -} - -GSETTINGS_PACKAGE = "${PN}-gsettings" - -PACKAGES =+ "${PN}-tests ${PN}-gsettings" - -FILES:${PN} += " \ - ${datadir}/gnome-control-center \ - ${datadir}/gir-1.0 \ - ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ - ${libdir}/${MUTTER_API_NAME}/*.typelib \ - ${libdir}/${MUTTER_API_NAME}/plugins \ -" - -FILES:${PN}-tests += " \ - ${datadir}/installed-tests \ - ${datadir}/${MUTTER_API_NAME}/tests \ - ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ -" - -FILES:${PN}-dev += " \ - ${libdir}/${MUTTER_API_NAME}/*.gir \ - ${libdir}/${MUTTER_API_NAME}/lib*.so \ -" - -RDEPENDS:${PN} += "zenity ${PN}-gsettings" - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_44.2.bb b/meta-gnome/recipes-gnome/mutter/mutter_44.2.bb new file mode 100644 index 0000000000..9c25eda6f7 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter_44.2.bb @@ -0,0 +1,105 @@ +SUMMARY = "Window and compositing manager based on Clutter" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + xserver-xorg-cvt-native \ + wayland-native \ + virtual/libx11 \ + graphene \ + gtk4 \ + gdk-pixbuf \ + cairo \ + pango \ + gsettings-desktop-schemas \ + json-glib \ + gnome-desktop \ + gnome-settings-daemon \ + libxtst \ + libxkbfile \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ + xwayland \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection gettext features_check + +SRC_URI[archive.sha256sum] = "37566d7e55c93dc8894e9c7f23a7ba5879a8b30baf65558223009d2b467402a1" + +# x11 is still manadatory - see meson.build +REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" + +# systemd can be replaced by libelogind (not available atow - make systemd +# mandatory distro feature) +LOGIND ?= "systemd" +REQUIRED_DISTRO_FEATURES += "systemd" + +# profiler requires sysprof 3.34 which is not willing to build atow +PACKAGECONFIG ??= " \ + native-backend \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \ + sm \ + startup-notification \ +" + +EXTRA_OEMESON += " \ + -Dtests=false \ + -Dnative_tests=false \ + -Dxwayland_path=${bindir}/Xwayland \ +" + +# combi-config - see meson_options.txt for more details +PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" +PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" +PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" +PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" +# Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" +PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" +PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" + +MUTTER_API_NAME = "mutter-12" + +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c +} + +do_install:append() { + # Add gir links in standard paths. That makes dependents life much easier + # to find them + install -d ${D}${datadir}/gir-1.0 + for gir_full in `find ${D}${libdir}/${MUTTER_API_NAME} -name '*.gir'`; do + gir=`basename "$gir_full"` + ln -sr "${D}${libdir}/${MUTTER_API_NAME}/$gir" "${D}${datadir}/gir-1.0/$gir" + done +} + +GSETTINGS_PACKAGE = "${PN}-gsettings" + +PACKAGES =+ "${PN}-tests ${PN}-gsettings" + +FILES:${PN} += " \ + ${datadir}/gnome-control-center \ + ${datadir}/gir-1.0 \ + ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ + ${libdir}/${MUTTER_API_NAME}/*.typelib \ + ${libdir}/${MUTTER_API_NAME}/plugins \ +" + +FILES:${PN}-tests += " \ + ${datadir}/installed-tests \ + ${datadir}/${MUTTER_API_NAME}/tests \ + ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ +" + +FILES:${PN}-dev += " \ + ${libdir}/${MUTTER_API_NAME}/*.gir \ + ${libdir}/${MUTTER_API_NAME}/lib*.so \ +" + +RDEPENDS:${PN} += "zenity ${PN}-gsettings" + -- cgit v1.2.3-54-g00ecf