Sync

2026-02-11 17:47:01 -05:00
parent 8c5222fe01
commit 74ceefdecb
5 changed files with 39 additions and 3 deletions
@@ -1,6 +1,6 @@
 pkgbase = nvidia-580xx-utils
 	pkgver = 580.126.09
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -13,6 +13,7 @@ pkgbase = nvidia-580xx-utils
 	source = nvidia-sleep.conf
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/580.126.09/NVIDIA-Linux-x86_64-580.126.09.run
 	source = 0001-Enable-atomic-kernel-modesetting-by-default.patch
+	source = 0002-Fix-compile-for-6.19.patch
 	source = limit-vram-usage
 	sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
 	sha256sums = f77a5247a3ba63e9fad3a3b2822d0fcfa51e0f79b5a90bd79bf08ea34b64ab07
@@ -22,6 +23,7 @@ pkgbase = nvidia-580xx-utils
 	sha256sums = 12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631
 	sha256sums = 4cac53e48f8adff661d47c8788ed24059a248c9fd8098ceafd088a498986ec26
 	sha256sums = 163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009
+	sha256sums = fdfe224fa39b2707942a89a54e1c0d60c5eb7da20b7a3e1dfde294e5bdec237e
 	sha256sums = b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a

 pkgname = nvidia-580xx-utils
@@ -0,0 +1,28 @@
+From 82f3c2441c636c59550201b9f2ee3c4cbecbb886 Mon Sep 17 00:00:00 2001
+From: Peter Jung <admin@ptr1337.dev>
+Date: Mon, 9 Feb 2026 17:10:25 +0100
+Subject: [PATCH] nvidia-uvm: Add fix for 6.19 Kernel
+
+Signed-off-by: Peter Jung <admin@ptr1337.dev>
+---
+ kernel-open/nvidia-uvm/uvm_hmm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kernel-open/nvidia-uvm/uvm_hmm.c b/kernel-open/nvidia-uvm/uvm_hmm.c
+index 2ddf64b7..9f045ccf 100644
+--- a/kernel-open/nvidia-uvm/uvm_hmm.c
+++ b/kernel-open/nvidia-uvm/uvm_hmm.c
+@@ -78,7 +78,9 @@ module_param(uvm_disable_hmm, bool, 0444);
+ // Pass 0 as the order, when actual large order support is added this
+ // function will need to be revisited
+ //
+-#if defined(NV_ZONE_DEVICE_PAGE_INIT_HAS_ORDER_ARG)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
+#define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page, page_pgmap(page), 0)
+#elif defined(NV_ZONE_DEVICE_PAGE_INIT_HAS_ORDER_ARG)
+ #define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page, 0)
+ #else
+ #define ZONE_DEVICE_PAGE_INIT(page)   zone_device_page_init(page)
+-- 
+2.53.0
+
@@ -8,7 +8,7 @@
 pkgbase=nvidia-580xx-utils
 pkgname=('nvidia-580xx-utils' 'opencl-nvidia-580xx' 'nvidia-580xx-dkms')
 pkgver=580.126.09
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -23,6 +23,7 @@ source=('nvidia-drm-outputclass.conf'
        'nvidia-sleep.conf'
        "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
        '0001-Enable-atomic-kernel-modesetting-by-default.patch'
+        '0002-Fix-compile-for-6.19.patch'
        'limit-vram-usage')

 sha256sums=(
@@ -34,6 +35,7 @@ sha256sums=(
    '12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631'
    '4cac53e48f8adff661d47c8788ed24059a248c9fd8098ceafd088a498986ec26'
    '163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009'
+    'fdfe224fa39b2707942a89a54e1c0d60c5eb7da20b7a3e1dfde294e5bdec237e'
    'b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a'
 )

@@ -58,6 +60,9 @@ prepare() {
    # https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch
    patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_pkg}/kernel"

+    # Fix compilation for 6.19
+    patch -Np1 -i "${srcdir}/0002-Fix-compile-for-6.19.patch"
+
    shopt -s globstar
    for conf in "${srcdir}"/**/dkms.conf; do
        sed -i "s/__VERSION_STRING/${pkgver}/" "$conf"
@@ -1,7 +1,7 @@
 pkgbase = python-terminaltexteffects
 	pkgdesc = Visual effects engine applied to text in the terminal.
 	pkgver = 0.14.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ChrisBuilds/terminaltexteffects
 	arch = any
 	license = MIT
@@ -4,3 +4,4 @@
 /pkg
 /src
 /yay
+!pkgrel.override