From 5143025ffdd334dd2f41621f75a41d6ace7d21a0 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Fri, 31 Jan 2025 00:28:05 +0300 Subject: [PATCH] Take 2 --- .github/build-nest-v3 | 2 +- .github/release-nest-v3 | 2 +- .../debian/libnvidia-ngx1-570.install | 3 ++- .../debian/nvidia-driver-bin-570.install | 3 ++- .../debian/nvidia-suspend-common-570.install | 1 + .../debian/nvidia-suspend-common-570.postinst | 1 + nvidia-graphics-drivers-570/debian/rules | 20 +++++++++---------- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 index 56a6051..7813681 100644 --- a/.github/build-nest-v3 +++ b/.github/build-nest-v3 @@ -1 +1 @@ -1 \ No newline at end of file +5 \ No newline at end of file diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index bf0d87a..7813681 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/nvidia-graphics-drivers-570/debian/libnvidia-ngx1-570.install b/nvidia-graphics-drivers-570/debian/libnvidia-ngx1-570.install index 206925b..43e7a0f 100644 --- a/nvidia-graphics-drivers-570/debian/libnvidia-ngx1-570.install +++ b/nvidia-graphics-drivers-570/debian/libnvidia-ngx1-570.install @@ -1,4 +1,5 @@ #! /usr/bin/dh-exec libnvidia-ngx.so.570.86.16 usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/ _nvngx.dll usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/nvidia/wine -nvngx.dll usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/nvidia/wine \ No newline at end of file +nvngx.dll usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/nvidia/wine +nvngx_dlssg.dll usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/nvidia/wine \ No newline at end of file diff --git a/nvidia-graphics-drivers-570/debian/nvidia-driver-bin-570.install b/nvidia-graphics-drivers-570/debian/nvidia-driver-bin-570.install index 9708d83..b6c9414 100644 --- a/nvidia-graphics-drivers-570/debian/nvidia-driver-bin-570.install +++ b/nvidia-graphics-drivers-570/debian/nvidia-driver-bin-570.install @@ -2,4 +2,5 @@ nvidia-bug-report.sh usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/ nvidia-debugdump usr/lib/${DEB_HOST_MULTIARCH}/nvidia/current/ nvidia-application-profiles-570.86.16-rc usr/share/nvidia/ -nvidia-application-profiles-570.86.16-key-documentation usr/share/nvidia/ \ No newline at end of file +nvidia-application-profiles-570.86.16-key-documentation usr/share/nvidia/ +sandboxutils-filelist.json usr/share/nvidia/files.d/ \ No newline at end of file diff --git a/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.install b/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.install index 66c615e..4af1843 100644 --- a/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.install +++ b/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.install @@ -1,5 +1,6 @@ systemd/system/nvidia-suspend.service usr/lib/systemd/system/ systemd/system/nvidia-hibernate.service usr/lib/systemd/system/ systemd/system/nvidia-resume.service usr/lib/systemd/system/ +systemd/system/nvidia-suspend-then-hibernate.service usr/lib/systemd/system/ systemd/system-sleep/nvidia usr/lib/systemd/system-sleep/ systemd/nvidia-sleep.sh usr/bin/ \ No newline at end of file diff --git a/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.postinst b/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.postinst index 527a1b1..fbfcbae 100644 --- a/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.postinst +++ b/nvidia-graphics-drivers-570/debian/nvidia-suspend-common-570.postinst @@ -3,3 +3,4 @@ systemctl enable nvidia-hibernate || true systemctl enable nvidia-resume || true systemctl enable nvidia-suspend || true +systemctl enable nvidia-suspend-then-hibernate || true diff --git a/nvidia-graphics-drivers-570/debian/rules b/nvidia-graphics-drivers-570/debian/rules index eec6da8..ab55584 100644 --- a/nvidia-graphics-drivers-570/debian/rules +++ b/nvidia-graphics-drivers-570/debian/rules @@ -61,27 +61,27 @@ ifeq (i386,$(DEB_HOST_ARCH)) # This avoids various issue, when Simplefb is used # https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/issues/14 # https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch - patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel + #patch -Np2 -i $(CURDIR)/debian/patches/0001-Make-modeset-and-fbdev-default-enabled.patch -d $(CURDIR)/debian/tmp/kernel-open # Fix build errors on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/746 - patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0006-crypto-Add-fix-for-6.13-Module-compilation.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/751 - patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0007-nvidia-nv-Convert-symbol-namespace-to-string-literal.patch -d $(CURDIR)/debian/tmp/kernel-open # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/747 - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel + #patch -Np2 -i $(CURDIR)/debian/patches/0008-Kbuild-Use-absolute-paths-for-symbolic-links.patch -d $(CURDIR)/debian/tmp/kernel-open # Fixes fbdev on 6.13+ # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/749 # https://gist.github.com/xtexChooser/da92d9df902788b75f746f348552ae80 - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel - patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel + #patch -Np2 -i $(CURDIR)/debian/patches/0009-FROM-AOSC-Use-linux-aperture.c-for-removing-conflict.patch -d $(CURDIR)/debian/tmp/kernel-open + #patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel + #patch -Np2 -i $(CURDIR)/debian/patches/0010-FROM-AOSC-TTM-fbdev-emulation-for-Linux-6.13.patch -d $(CURDIR)/debian/tmp/kernel-open # Replace libs with 32 bit rm -rf debian/tmp/*.so*