x11-drivers/nvidia-drivers : disable >=systemd-256's freeze session (https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/nvidia-drivers?id=380e65161ef386416fd7510fb1538a86f9c50b1c)

5 files changed, 35 insertions, 3 deletions

diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r4
index 1e6e72a4..6d5ed831 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r4
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=4
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=935998fc2b03b373c3e65535eff4ff7a
+_md5_=df1c7f667e5988be985ea39d419ddd77
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.127.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.127.05-r1
index 94f505d2..d2fe7214 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.127.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.127.05-r1
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=5
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/550.127.05/NVIDIA-Linux-x86_64-550.127.05.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.127.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.127.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.127.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.127.05.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=679333a6613e753ab09156898ade4850
+_md5_=e59bbc617b1bdd8c4f90bf3c416f15de
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 7ddf3cd5..7dfed3e5 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -84,7 +84,7 @@ virtual/tmpfiles 1.314.1337-r1: Virtual to select between different tmpfiles.d h
 virtual/udev 314.1337-r1: Virtual to select between different udev daemon providers
 www-client/ungoogled-chromium 130.0.6723.58: Modifications to Chromium for removing Google integration and enhancing privacy
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
-x11-drivers/nvidia-drivers 390.157-r11 470.256.02-r3 550.127.05: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157-r11 470.256.02-r4 550.127.05-r1: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r6 3.24.41-r6: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
 x11-misc/nvidia-settings 390.157-r7 470.256.02 550.127.05: NVIDIA Linux X11 Settings Utility
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r4.ebuild
index db4c9dcb..442dceae 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r4.ebuild
@@ -289,6 +289,22 @@ documentation that is installed alongside this README."
 	# TODO: cleanup after 255.5 been stable for a few months
 	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
 
+	# needed with >=systemd-256 or may fail to resume with some setups
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072722
+	insinto "${unitdir}"/systemd-homed.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_HOME_LOCK_FREEZE_SESSION=false
+	EOF
+	insinto "${unitdir}"/systemd-suspend.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false
+	EOF
+	dosym -r "${unitdir}"/systemd-{suspend,hibernate}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,hybrid-sleep}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,suspend-then-hibernate}.service.d/10-nvidia.conf
+
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
index f86871e4..d47e74b2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.127.05-r1.ebuild
@@ -309,6 +309,22 @@ documentation that is installed alongside this README."
 	# TODO: cleanup after 255.5 been stable for a few months
 	dosym {/usr/lib,/"${libdir}"}/elogind/system-sleep/nvidia
 
+	# needed with >=systemd-256 or may fail to resume with some setups
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1072722
+	insinto "${unitdir}"/systemd-homed.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_HOME_LOCK_FREEZE_SESSION=false
+	EOF
+	insinto "${unitdir}"/systemd-suspend.service.d
+	newins - 10-nvidia.conf <<-EOF
+		[Service]
+		Environment=SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false
+	EOF
+	dosym -r "${unitdir}"/systemd-{suspend,hibernate}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,hybrid-sleep}.service.d/10-nvidia.conf
+	dosym -r "${unitdir}"/systemd-{suspend,suspend-then-hibernate}.service.d/10-nvidia.conf
+
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
 	dosym nvidia-application-profiles-${PV}-key-documentation \
 		${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation