diff --git a/.gitignore b/.gitignore index 7b9f8ed..27437b6 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ gdm-2.30.2.tar.bz2 /gdm-41.rc.tar.xz /gdm-41.0.tar.xz /gdm-41.3.tar.xz +/gdm-42.0.tar.xz diff --git a/0001-gdm.rules-Prefer-Wayland-with-NVIDIA-510.patch b/0001-gdm.rules-Prefer-Wayland-with-NVIDIA-510.patch deleted file mode 100644 index 6722fe6..0000000 --- a/0001-gdm.rules-Prefer-Wayland-with-NVIDIA-510.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 69260becaa948988ab515595f137ac032b54d3ae Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Thu, 20 Jan 2022 15:36:36 +0100 -Subject: [PATCH] gdm.rules: Prefer Wayland with NVIDIA >= 510 - -NVIDIA driver version 510 and above have support for GBM, use Wayland by -default with NVIDIA proprietary driver version 510 and above. - -For versions between 470 and 510, prefer Xorg as before. ---- - data/61-gdm.rules.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in -index bbc6a00e..e9c72697 100644 ---- a/data/61-gdm.rules.in -+++ b/data/61-gdm.rules.in -@@ -10,7 +10,9 @@ IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland" - LABEL="gdm_nomodeset_end" - - # Disable wayland when nvidia modeset is disabled or when drivers are a lower --# version than 470, in any case always prefer Xorg -+# version than 470, -+# For versions above 470 but lower than 510 prefer Xorg, -+# Above 510, prefer Wayland. - KERNEL!="nvidia_drm", GOTO="gdm_nvidia_drm_end" - SUBSYSTEM!="module", GOTO="gdm_nvidia_drm_end" - ACTION!="add", GOTO="gdm_nvidia_drm_end" -@@ -18,6 +20,9 @@ ACTION!="add", GOTO="gdm_nvidia_drm_end" - ATTR{parameters/modeset}!="Y", GOTO="gdm_disable_wayland" - # disable wayland for nvidia drivers versions lower than 470 - ATTR{version}=="4[0-6][0-9].*|[0-3][0-9][0-9].*|[0-9][0-9].*|[0-9].*", GOTO="gdm_disable_wayland" -+# For nvidia drivers versions Above 510, keep Wayland by default -+ATTR{version}=="[5-9][1-9][0-9].*", GOTO="gdm_end" -+# For nvidia drivers versions 470-495, prefer Xorg by default - GOTO="gdm_prefer_xorg" - LABEL="gdm_nvidia_drm_end" - --- -2.34.1 - diff --git a/gdm.spec b/gdm.spec index 0f713f2..7fee10f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -10,13 +10,13 @@ Name: gdm Epoch: 1 -Version: 41.3 -Release: 3%{?dist} +Version: 42.0 +Release: 1%{?dist} Summary: The GNOME Display Manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM -Source0: http://download.gnome.org/sources/gdm/40/gdm-%{tarball_version}.tar.xz +Source0: http://download.gnome.org/sources/gdm/42/gdm-%{tarball_version}.tar.xz Source1: org.gnome.login-screen.gschema.override # moved here from pulseaudio-gdm-hooks-11.1-16 @@ -24,10 +24,6 @@ Source5: default.pa-for-gdm Source6: gdm.sysusers -# Enable Wayland by default with NVIDIA version 510 and above -# https://fedoraproject.org/wiki/Changes/WaylandByDefaultOnNVIDIA -Patch1: 0001-gdm.rules-Prefer-Wayland-with-NVIDIA-510.patch - # Downstream patches Patch80001: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch Patch90001: 0001-data-add-system-dconf-databases-to-gdm-profile.patch @@ -49,6 +45,7 @@ BuildRequires: pkgconfig(accountsservice) >= 0.6.3 BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libselinux) @@ -303,6 +300,9 @@ fi %{_libdir}/pkgconfig/gdm-pam-extensions.pc %changelog +* Tue Mar 22 2022 David King - 1:42.0-1 +- Update to 42.0 + * Thu Jan 20 2022 Olivier Fourdan - 1:41.3-3 - Enable Wayland by default with NVIDIA version 510 and above Resolves: #2043056 diff --git a/sources b/sources index b37d012..84e4d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gdm-41.3.tar.xz) = 71a93eef02fccee22ca4f90e3217431923da2b1ac4f5995ff7b64c9b4cac839f4695f4122d255407b570635d34e86e233fa7e4d5d22a8d8185ccfa8ad20f83aa +SHA512 (gdm-42.0.tar.xz) = e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa