From a5ac1d4b769ed1b35aedf2219188b522ea1def4e512dd1595bcc790e5e0138ec Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Mar 2020 21:56:27 +0000 Subject: [PATCH] Accepting request 781704 from home:qkzhu:branches:GNOME:Factory - Add gdm-disable-wayland-on-mgag200-chipsets.patch: disable wayland on mgag200 chipsets, this patch used to be part of gdm-disable-wayland-on-unsupported-chipsets.patch which was dropped, however the mgag200 part is still not fixed by upstream. So we should keep this part to make sure GNOME works properly on mgag200 chipsets (bsc#1162888, glgo#GNOME/mutter#57). OBS-URL: https://build.opensuse.org/request/show/781704 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=445 --- gdm-disable-wayland-on-mgag200-chipsets.patch | 17 +++++++++++++++++ gdm.changes | 10 ++++++++++ gdm.spec | 5 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gdm-disable-wayland-on-mgag200-chipsets.patch diff --git a/gdm-disable-wayland-on-mgag200-chipsets.patch b/gdm-disable-wayland-on-mgag200-chipsets.patch new file mode 100644 index 0000000..1d20f4c --- /dev/null +++ b/gdm-disable-wayland-on-mgag200-chipsets.patch @@ -0,0 +1,17 @@ +diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in +index ad5b87d..f964259 100644 +--- a/data/61-gdm.rules.in ++++ b/data/61-gdm.rules.in +@@ -4,3 +4,12 @@ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4" + ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland" + # disable Wayland when using the proprietary nvidia driver + DRIVER=="nvidia", RUN+="@libexecdir@/gdm-disable-wayland" ++# disable Wayland on Matrox Electronics Systems Ltd. MGA G200 server engines ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0522", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0524", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0530", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0532", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0533", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="@libexecdir@/gdm-disable-wayland" ++ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="@libexecdir@/gdm-disable-wayland" diff --git a/gdm.changes b/gdm.changes index 66fa91e..275d712 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 4 09:44:06 UTC 2020 - QK ZHU + +- Add gdm-disable-wayland-on-mgag200-chipsets.patch: disable wayland + on mgag200 chipsets, this patch used to be part of + gdm-disable-wayland-on-unsupported-chipsets.patch which was dropped, + however the mgag200 part is still not fixed by upstream. So we should + keep this part to make sure GNOME works properly on mgag200 chipsets + (bsc#1162888, glgo#GNOME/mutter#57). + ------------------------------------------------------------------- Sat Jan 25 14:08:10 UTC 2020 - Dominique Leuenberger diff --git a/gdm.spec b/gdm.spec index dbcf5f0..5c39cda 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,6 +63,8 @@ Patch9: gdm-initial-setup-hardening.patch Patch13: gdm-s390-not-require-g-s-d_wacom.patch # PATCH-FIX-UPSTREAM gdm-switch-user-tty7.patch bsc#1155408 glgo#GNOME#gdm#532 xwang@suse.com -- Switch to tty7 when switch user Patch14: gdm-switch-user-tty7.patch +# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bsc#1162888 glgo#GNOME/mutter#57 qkzhu@suse.com -- Disable Wayland on mgag200 chipsets +Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch ### NOTE: Keep please SLE-only patches at bottom (starting on 1000). # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. Patch1000: gdm-disable-gnome-initial-setup.patch @@ -218,6 +220,7 @@ cp %{SOURCE8} . %patch13 -p1 %endif %patch14 -p1 +%patch15 -p1 # SLE-only patches start at 1000 %if !0%{?is_opensuse}