chore: sync AUR packages (edge)

2026-04-30 08:07:53 +00:00
1 parent 77d9947f2f
commit dc752f0ac6
@@ -1,6 +1,6 @@
 pkgbase = nvidia-580xx-utils
 	pkgver = 580.142
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -14,6 +14,7 @@ pkgbase = nvidia-580xx-utils
 	source = https://download.nvidia.com/XFree86/Linux-x86_64/580.142/NVIDIA-Linux-x86_64-580.142.run
 	source = 0001-Enable-atomic-kernel-modesetting-by-default.patch
 	source = 0002-Fix-hardware-cursor-crash.patch
+	source = 0003-kernel-7.0.patch
 	source = limit-vram-usage
 	sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
 	sha256sums = f77a5247a3ba63e9fad3a3b2822d0fcfa51e0f79b5a90bd79bf08ea34b64ab07
@@ -24,6 +25,7 @@ pkgbase = nvidia-580xx-utils
 	sha256sums = 20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563
 	sha256sums = 163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009
 	sha256sums = c1a1cf05dd12efd67858180461ad97a6ebe206b55b56df207854b322ce734613
+	sha256sums = 856a04794d44063ba98a4dd5fca198bc45042d203773b9659f178bb6c73ac9f3
 	sha256sums = b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a

 pkgname = nvidia-580xx-utils
@@ -0,0 +1,35 @@
+From 1ab454e3114dbe6bc61e35be9b6cbcbfe119bfaf Mon Sep 17 00:00:00 2001
+From: Peter Jung <admin@ptr1337.dev>
+Date: Thu, 26 Feb 2026 16:53:26 +0100
+Subject: [PATCH] kernel-open/Makefile: Fix PAHOLE_VARIABLES for kernels using
+ gen-btf.sh, fix for 7.0rc1
+
+Signed-off-by: Peter Jung <admin@ptr1337.dev>
+---
+ kernel-open/Makefile | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a//Makefile b/Makefile
+index f7a8db69f..9a3fc281e 100644
+--- a/Makefile
+++ b/Makefile
+@@ -92,10 +92,15 @@ else
+   #     system(pahole_cmd)
+   # }
+   PAHOLE_AWK_PROGRAM = BEGIN { pahole_cmd = \"pahole\"; for (i = 1; i < ARGC; i++) { if (ARGV[i] ~ /--lang_exclude=/) { pahole_cmd = pahole_cmd sprintf(\" %s,c++\", ARGV[i]); } else { pahole_cmd = pahole_cmd sprintf(\" %s\", ARGV[i]); } } system(pahole_cmd); }
+-  # If scripts/pahole-flags.sh is not present in the kernel tree, add PAHOLE and
+-  # PAHOLE_AWK_PROGRAM assignments to PAHOLE_VARIABLES; otherwise assign the
+-  # empty string to PAHOLE_VARIABLES.
+-  PAHOLE_VARIABLES=$(if $(wildcard $(KERNEL_SOURCES)/scripts/pahole-flags.sh),,"PAHOLE=$(AWK) '$(PAHOLE_AWK_PROGRAM)'")
+  # If scripts/pahole-flags.sh is not present AND scripts/gen-btf.sh is not
+  # present in the kernel tree, add PAHOLE and PAHOLE_AWK_PROGRAM assignments
+  # to PAHOLE_VARIABLES; otherwise assign the empty string to PAHOLE_VARIABLES.
+  #
+  # scripts/gen-btf.sh was introduced in kernel 7.0 (formerly 6.17) when
+  # scripts/pahole-flags.sh was removed.  The gen-btf.sh-based BTF generation
+  # calls ${PAHOLE} inside a shell script, so the awk wrapper used here is
+  # incompatible (shell word-splitting breaks the single-quoted awk program).
+  PAHOLE_VARIABLES=$(if $(or $(wildcard $(KERNEL_SOURCES)/scripts/pahole-flags.sh),$(wildcard $(KERNEL_SOURCES)/scripts/gen-btf.sh)),,"PAHOLE=$(AWK) '$(PAHOLE_AWK_PROGRAM)'")
+ 
+   ifndef ARCH
+     ARCH := $(shell uname -m | sed -e 's/i.86/i386/' \
@@ -8,7 +8,7 @@
 pkgbase=nvidia-580xx-utils
 pkgname=('nvidia-580xx-utils' 'opencl-nvidia-580xx' 'nvidia-580xx-dkms')
 pkgver=580.142
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -24,6 +24,7 @@ source=('nvidia-drm-outputclass.conf'
        "https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
        '0001-Enable-atomic-kernel-modesetting-by-default.patch'
        '0002-Fix-hardware-cursor-crash.patch'
+        '0003-kernel-7.0.patch'
        'limit-vram-usage')

 sha256sums=(
@@ -36,6 +37,7 @@ sha256sums=(
    '20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563'
    '163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009'
    'c1a1cf05dd12efd67858180461ad97a6ebe206b55b56df207854b322ce734613'
+    '856a04794d44063ba98a4dd5fca198bc45042d203773b9659f178bb6c73ac9f3'
    'b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a'
 )

@@ -65,6 +67,9 @@ prepare() {
    # https://forums.developer.nvidia.com/t/580-release-feedback-discussion/341205/1058
    patch -Np1 -i "${srcdir}/0002-Fix-hardware-cursor-crash.patch" -d "${srcdir}/${_pkg}/kernel"

+    # Fix compilation for 7.0
+    patch -Np1 -i "${srcdir}/0003-kernel-7.0.patch" -d "${srcdir}/${_pkg}/kernel"
+
    shopt -s globstar
    for conf in "${srcdir}"/**/dkms.conf; do
        sed -i "s/__VERSION_STRING/${pkgver}/" "$conf"