diff --git a/0001-window-actor-Special-case-shaped-Java-windows.patch b/0001-window-actor-Special-case-shaped-Java-windows.patch index 8cf1507cd4c5f1fc9930c711697b0796a3417d5f..36d50b6c347b0fa48781ce3aff070cfc81c7c222 100644 --- a/0001-window-actor-Special-case-shaped-Java-windows.patch +++ b/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 + diff --git a/mutter-3.38.4.tar.xz b/mutter-3.38.4.tar.xz deleted file mode 100644 index c688a1aa499f91187ceb2b2104cabdca10cd9241..0000000000000000000000000000000000000000 Binary files a/mutter-3.38.4.tar.xz and /dev/null differ diff --git a/mutter-42.2.tar.xz b/mutter-42.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..7f5b8a95474d6a97be7017936a64c07b5a2f1deb Binary files /dev/null and b/mutter-42.2.tar.xz differ diff --git a/mutter-42.alpha-disable-tegra.patch b/mutter-42.alpha-disable-tegra.patch new file mode 100644 index 0000000000000000000000000000000000000000..f341984724a0c9408247c2283206a4305da56b3b --- /dev/null +++ b/mutter-42.alpha-disable-tegra.patch @@ -0,0 +1,25 @@ +From 2184adca1e510361fd1c425d88ac9a3d458eb76a Mon Sep 17 00:00:00 2001 +From: David King +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 + diff --git a/mutter.spec b/mutter.spec index d64f8f58a92cbbb66bccaba709a163f1276beb85..8d420193be73c939c03fdb28a3630efa75e1f676 100644 --- a/mutter.spec +++ b/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 -Release: 3 +Version: 42.2 +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 - -BuildRequires: startup-notification-devel gnome-desktop3-devel -BuildRequires: gobject-introspection-devel libSM-devel libwacom-devel -BuildRequires: libxkbcommon-x11-devel libxkbfile-devel -BuildRequires: mesa-libEGL-devel mesa-libGL-devel mesa-libgbm-devel -BuildRequires: desktop-file-utils -BuildRequires: libcanberra-devel json-glib-devel -BuildRequires: libinput-devel -BuildRequires: pkgconfig(graphene-gobject-1.0) pkgconfig(libpipewire-0.3) >= 0.3.0 -BuildRequires: gnome-settings-daemon-devel meson -BuildRequires: pkgconfig(wayland-eglstream) xorg-x11-server-Xwayland - -Obsoletes: mutter-wayland < 3.13.0 -Obsoletes: mutter-wayland-devel < 3.13.0 - -Conflicts: gnome-shell < 3.21.1 - -Requires: gnome-control-center-filesystem libinput gsettings-desktop-schemas -Requires: gtk3 pipewire startup-notification dbus-x11 zenity json-glib -Requires: gsettings-desktop-schemas +Patch1: mutter-42.alpha-disable-tegra.patch + +BuildRequires: meson pam-devel zenity sysprof-devel gtk-doc gettext-devel git-core +BuildRequires: xorg-x11-server-Xorg xorg-x11-server-Xvfb desktop-file-utils +BuildRequires: mesa-libEGL-devel mesa-libGLES-devel mesa-libGL-devel mesa-libgbm-devel +BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version} +BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} +BuildRequires: pkgconfig(libinput) >= %{libinput_version} +BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0 +BuildRequires: pkgconfig(sm) +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) + +Requires: gnome-control-center-filesystem +Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} +Requires: gnome-settings-daemon +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: json-glib%{?_isa} >= %{json_glib_version} +Requires: libinput%{?_isa} >= %{libinput_version} +Requires: pipewire%{_isa} >= %{pipewire_version} +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* -%{_prefix}/lib/udev/rules.d/61-mutter.rules - -%files devel -%defattr(-,root,root) -%{_bindir}/* -%{_includedir}/mutter-7/* -%{_libdir}/pkgconfig/*.pc -%{_libdir}/libmutter-7.so -%{_prefix}/libexec/installed-tests/* -%{_datadir}/installed-tests/* -%{_datadir}/mutter-7/tests/stacking/*.metatest +%{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml +%{_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 +%{_includedir}/* +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%{_libexecdir}/installed-tests/mutter-%{mutter_api_version} +%{_datadir}/installed-tests/mutter-%{mutter_api_version} +%{_datadir}/mutter-%{mutter_api_version}/tests %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 - 42.2-1 +- Update to 42.2 + * Tue Sep 16 2021 weijin deng - 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 - 3.30.1-6 - Package init - diff --git a/mutter.yaml b/mutter.yaml index 99f86c1945a47d8e2791043addf9bb55baf1f75d..7793c281a91611b56bd75ddbf351f0a5a1cd961f 100644 --- a/mutter.yaml +++ b/mutter.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: mutter tag_prefix: "^v" -seperator: "." +separator: "."