Update to 42.2

0001-window-actor-Special-case-shaped-Java-windows.patch

@@ -12,13 +12,14 @@ by special-casing shaped Java windows.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c
-index e4e579e..082ffac 100644
+index b7032e0ba..b05d5e158 100644
 --- a/src/compositor/meta-window-actor-x11.c
 +++ b/src/compositor/meta-window-actor-x11.c
-@@ -549,6 +549,14 @@ has_shadow (MetaWindowActorX11 *actor_x11)
+@@ -528,6 +528,14 @@ has_shadow (MetaWindowActorX11 *actor_x11)
+    */
    if (window->has_custom_frame_extents)
      return FALSE;
- 
++ 
 +  /*
 +   * OpenJDK wrongly assumes that shaping a window implies no compositor
 +   * shadows; make its compliance tests happy to give it what it wants ...
@@ -26,7 +27,9 @@ index e4e579e..082ffac 100644
 +  if (g_strcmp0 (window->res_name, "sun-awt-X11-XWindowPeer") == 0 &&
 +      window->shape_region != NULL)
 +    return FALSE;
-+
+ 
    /*
     * Generate shadows for all other windows.
-    */
+-- 
+2.23.0
+

mutter-42.alpha-disable-tegra.patch

@@ -0,0 +1,25 @@
+From 2184adca1e510361fd1c425d88ac9a3d458eb76a Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Fri, 14 Jan 2022 18:18:03 +0000
+Subject: [PATCH] Disable KMS on tegra
+
+Based on commit 77a40614f08ef10044409f689b9efc3d5f65ff0c.
+---
+ src/backends/native/meta-kms-impl-device-atomic.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backends/native/meta-kms-impl-device-atomic.c b/src/backends/native/meta-kms-impl-device-atomic.c
+index bcb41e8ad..bafbc7b8f 100644
+--- a/src/backends/native/meta-kms-impl-device-atomic.c
++++ b/src/backends/native/meta-kms-impl-device-atomic.c
+@@ -1159,6 +1159,7 @@ is_atomic_allowed (const char *driver_name)
+     "vboxvideo",
+     "nvidia-drm",
+     "virtio_gpu",
++    "tegra",
+     NULL,
+   };
+ 
+-- 
+2.34.1
+

mutter.spec

@@ -1,32 +1,78 @@
+%global gtk3_version 3.19.8
+%global glib_version 2.53.2
+%global gsettings_desktop_schemas_version 40~alpha
+%global json_glib_version 0.12.0
+%global libinput_version 1.4
+%global pipewire_version 0.3.33
+%global mutter_api_version 10
+
 Name:          mutter
-Version:       3.38.4
+Version:       42.2
-Release:       3
+Release:       1
 Summary:       Window and compositing manager based on Clutter
 License:       GPLv2+
 URL:           https://www.gnome.org
-Source0:       https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source0:       http://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz
 
 Patch0:        0001-window-actor-Special-case-shaped-Java-windows.patch
+Patch1:        mutter-42.alpha-disable-tegra.patch
 
-BuildRequires: startup-notification-devel gnome-desktop3-devel 
+BuildRequires: meson pam-devel zenity sysprof-devel gtk-doc gettext-devel git-core
-BuildRequires: gobject-introspection-devel libSM-devel libwacom-devel 
+BuildRequires: xorg-x11-server-Xorg xorg-x11-server-Xvfb desktop-file-utils
-BuildRequires: libxkbcommon-x11-devel libxkbfile-devel 
+BuildRequires: mesa-libEGL-devel mesa-libGLES-devel mesa-libGL-devel mesa-libgbm-devel
-BuildRequires: mesa-libEGL-devel mesa-libGL-devel mesa-libgbm-devel 
+BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version}
-BuildRequires: desktop-file-utils 
+BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
-BuildRequires: libcanberra-devel json-glib-devel 
+BuildRequires: pkgconfig(libinput) >= %{libinput_version}
-BuildRequires: libinput-devel 
+BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
-BuildRequires: pkgconfig(graphene-gobject-1.0) pkgconfig(libpipewire-0.3) >= 0.3.0
+BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0
-BuildRequires: gnome-settings-daemon-devel meson
+BuildRequires: pkgconfig(sm)
-BuildRequires: pkgconfig(wayland-eglstream) xorg-x11-server-Xwayland
+BuildRequires: pkgconfig(libwacom)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(x11-xcb)
+BuildRequires: pkgconfig(xkbcommon)
+BuildRequires: pkgconfig(xkbcommon-x11)
+BuildRequires: pkgconfig(xkbfile)
+BuildRequires: pkgconfig(xtst)
+BuildRequires: pkgconfig(glesv2)
+BuildRequires: pkgconfig(graphene-gobject-1.0)
+BuildRequires: pkgconfig(sysprof-capture-4)
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(xkeyboard-config)
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(gnome-settings-daemon)
+BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(gudev-1.0)
+BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(wayland-eglstream)
+BuildRequires: pkgconfig(wayland-protocols)
+BuildRequires: pkgconfig(wayland-server)
+BuildRequires: xorg-x11-server
+#BuildRequires: pkgconfig(xwayland)
 
-Obsoletes:     mutter-wayland < 3.13.0
+Requires: gnome-control-center-filesystem
-Obsoletes:     mutter-wayland-devel < 3.13.0
+Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
-
+Requires: gnome-settings-daemon
-Conflicts:     gnome-shell < 3.21.1
+Requires: gtk3%{?_isa} >= %{gtk3_version}
-
+Requires: json-glib%{?_isa} >= %{json_glib_version}
-Requires:      gnome-control-center-filesystem libinput gsettings-desktop-schemas
+Requires: libinput%{?_isa} >= %{libinput_version}
-Requires:      gtk3 pipewire startup-notification dbus-x11 zenity json-glib
+Requires: pipewire%{_isa} >= %{pipewire_version}
-Requires:      gsettings-desktop-schemas
+Requires: startup-notification
+Requires: dbus
+Requires: zenity
+Recommends: mesa-dri-drivers%{?_isa}
+Provides: firstboot(windowmanager) = mutter
+Provides: bundled(cogl) = 1.22.0
+Provides: bundled(clutter) = 1.26.0
 
 %description
 Mutter is a window and compositing manager based on Clutter, forked
@@ -35,6 +81,7 @@ from Metacity.
 %package       devel
 Summary:       Development files and Header files for %{name}
 Requires:      %{name} = %{version}-%{release}
+Requires:      mesa-libEGL-devel
 Provides:      %{name}-tests
 Obsoletes:     %{name}-tests < %{version}-%{release}
 %description   devel
@@ -59,32 +106,30 @@ developing applications that use %{name}.
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "/usr/lib64/mutter-7" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+echo "/usr/lib64/mutter-10" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %ldconfig_scriptlets
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %license COPYING
-%config(noreplace) /etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_bindir}/mutter
-%{_libdir}/mutter-7/*
-%{_libdir}/libmutter-7.so.*
-%{_prefix}/libexec/mutter-restart-helper
 %{_datadir}/applications/*.desktop
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
+%{_libdir}/lib*.so.*
+%{_libdir}/mutter-%{mutter_api_version}/
+%{_libexecdir}/mutter-restart-helper
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
-%{_datadir}/gnome-control-center/keybindings/50-mutter*
+%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
-%{_prefix}/lib/udev/rules.d/61-mutter.rules
+%{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-*.xml
+%{_udevrulesdir}/61-mutter.rules
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
-%files  devel
+%files devel
-%defattr(-,root,root)
+%{_includedir}/*
-%{_bindir}/*
+%{_libdir}/lib*.so
-%{_includedir}/mutter-7/*
+%{_libdir}/pkgconfig/*
-%{_libdir}/pkgconfig/*.pc
+%{_libexecdir}/installed-tests/mutter-%{mutter_api_version}
-%{_libdir}/libmutter-7.so
+%{_datadir}/installed-tests/mutter-%{mutter_api_version}
-%{_prefix}/libexec/installed-tests/*
+%{_datadir}/mutter-%{mutter_api_version}/tests
-%{_datadir}/installed-tests/*
-%{_datadir}/mutter-7/tests/stacking/*.metatest
 
 %files help
 %defattr(-,root,root)
@@ -92,6 +137,9 @@ echo "/usr/lib64/mutter-7" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.2-1
+- Update to 42.2
+
 * Tue Sep 16 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.4-3
 - Add concrete dynamic library search path
 
@@ -115,4 +163,3 @@ echo "/usr/lib64/mutter-7" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
 * Mon Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.30.1-6
 - Package init
-

mutter.yaml

@@ -1,4 +1,4 @@
 version_control: gitlab.gnome
 src_repo: mutter
 tag_prefix: "^v"
-seperator: "."
+separator: "."