diff --git a/extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch b/extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch index 4e900e28f..64a895b46 100644 --- a/extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch +++ b/extra-repos/systemd/gdm/0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch @@ -14,7 +14,7 @@ diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in index a4f841bdf..481c5b4dd 100644 --- a/data/61-gdm.rules.in +++ b/data/61-gdm.rules.in -@@ -2,13 +2,13 @@ SUBSYSTEM!="pci", GOTO="gdm_pci_device_end" +@@ -2,13 +2,13 @@ ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end" # cirrus @@ -32,25 +32,26 @@ index a4f841bdf..481c5b4dd 100644 # disable Wayland on Hi1710 chipsets ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland" -@@ -36,7 +36,7 @@ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end" - # but keep it enabled for simple framebuffer drivers - DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end" +@@ -21,7 +21,7 @@ + SUBSYSTEM!="drm", GOTO="gdm_hardware_gpu_end" + DRIVERS=="simple-framebuffer", GOTO="gdm_hardware_gpu_end" IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU" -ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu" +ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu" - IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland" - LABEL="gdm_nomodeset_end" + LABEL="gdm_hardware_gpu_end" -@@ -46,7 +46,7 @@ LABEL="gdm_nomodeset_end" + # The vendor nvidia driver has multiple modules that need to be loaded before GDM can make an +@@ -30,7 +30,7 @@ KERNEL!="nvidia", GOTO="gdm_nvidia_end" SUBSYSTEM!="module", GOTO="gdm_nvidia_end" ACTION!="add", GOTO="gdm_nvidia_end" -RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver" +RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver" - # Check if suspend/resume services necessary for working wayland support is available - TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland" -@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end" + # Import nvidia kernel parameters + IMPORT{program}="/bin/sh -c \"sed -e 's/: /=/g' -e 's/\([^[:upper:]]\)\([[:upper:]]\)/\1_\2/g' -e 's/[[:lower:]]/\U&/g' -e 's/^/NVIDIA_/' /proc/driver/nvidia/params\"" +@@ -59,8 +59,8 @@ + SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end" ACTION!="add", GOTO="gdm_hybrid_graphics_check_end" IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\"" -ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics" @@ -59,7 +60,4 @@ index a4f841bdf..481c5b4dd 100644 +ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics" LABEL="gdm_hybrid_graphics_check_end" - # If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland --- -2.39.2 - + # Disable wayland in situation where we're in a guest with a virtual gpu and host passthrough gpu diff --git a/extra-repos/systemd/gdm/APKBUILD b/extra-repos/systemd/gdm/APKBUILD index 326914209..b5cdd23d9 100644 --- a/extra-repos/systemd/gdm/APKBUILD +++ b/extra-repos/systemd/gdm/APKBUILD @@ -1,8 +1,8 @@ # Forked from Alpine for systemd support pkgname=gdm -pkgver=99947.0 -_pkgver=47.0 +pkgver=99948.0 +_pkgver=48.0 pkgrel=0 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" @@ -82,8 +82,8 @@ systemd() { } sha512sums=" -5578b2839ec78ef0b155a6ef6b82384495ef0f3ceb49f4bc7c656bf9dafa95b260148c7fc9b8295b71d4a2d33f6fe6c4a47485cd9eba5c0929f0492ba06e0893 gdm-47.0.tar.xz -c5c57ee93f5a33db154632f0f81fa2e62a48635cfa5e51ada9cc969478df0ce15878446c639c8647c53d439f2eb4173e7fca0069eae31fbdcec541cc5f28cd28 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch +3e4a320cc6a0b43d65122bacd2b99531695f20ec809a767b957d63a511e00da017a9a4abe815596c6ad1398c5d427418d5c51bf6162216f60fdae5e8095bd305 gdm-48.0.tar.xz +aa302c33c9b31e823ab98ca80c330c3f7eaa10d05c402cf111d78a35fbec82ce90bff34c19b713b6e352428c31df91f04bd01b58cae8968e130a991c73382020 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch 66611d49fc4c9578415a7e554834edcb9de99396bd0ca511dcfd4fb256e8a1cd1fd5f10464f4668ffe04799d919bc22ddb58e8bf272017edba69a7951522e63d 0003-DOWNSTREAM-pam-rename-common-to-base.patch f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession "