From aab066c1bc1293803ee6db414a84c8169794b8c9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:46:49 +0100
Subject: [PATCH] update to 340.107 [release 340.107-1mamba;Thu Feb 28 2019]

---
 nvidia_340-340.107-conftest-x86.patch | 38 +++++++++++++++++++++++++++
 nvidia_340.spec                       | 28 +++++++++++++++++---
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 nvidia_340-340.107-conftest-x86.patch

diff --git a/nvidia_340-340.107-conftest-x86.patch b/nvidia_340-340.107-conftest-x86.patch
new file mode 100644
index 0000000..697df66
--- /dev/null
+++ b/nvidia_340-340.107-conftest-x86.patch
@@ -0,0 +1,38 @@
+--- NVIDIA-Linux-x86-340.107/kernel/conftest_orig.sh	2018-10-18 11:31:58.727173092 +1100
++++ NVIDIA-Linux-x86-340.107/kernel/conftest.sh	2018-10-18 11:32:10.909169831 +1100
+@@ -27,7 +27,7 @@
+ COMPILE_TEST_HEADERS="macros functions symbols types generic headers"
+ KERNEL_ARCH="$ARCH"
+ 
+-if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++if [ "$ARCH" = "i386" -o "$ARCH" = "x86" -o "$ARCH" = "x86_64" ]; then
+     if [ -d "$SOURCES/arch/x86" ]; then
+         KERNEL_ARCH="x86"
+     fi
+@@ -213,7 +213,7 @@
+ 
+     if [ "$OUTPUT" != "$SOURCES" ]; then
+         MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default"
+-        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++        if [ "$ARCH" = "i386" -o "$ARCH" = "x86" -o "$ARCH" = "x86_64" ]; then
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
+@@ -230,7 +230,7 @@
+         fi
+     else
+         MACH_CFLAGS="-I$HEADERS/asm/mach-default"
+-        if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++        if [ "$ARCH" = "i386"  -o "$ARCH" = "x86" -o "$ARCH" = "x86_64" ]; then
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default"
+             MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
+@@ -250,7 +250,7 @@
+     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS"
+     CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi -I$OUTPUT/include/generated/uapi"
+ 
+-    if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
++    if [ "$ARCH" = "i386" -o "$ARCH" = "x86" -o "$ARCH" = "x86_64" ]; then
+         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+         CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi"
+         CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
diff --git a/nvidia_340.spec b/nvidia_340.spec
index f9d1b84..b6c6269 100644
--- a/nvidia_340.spec
+++ b/nvidia_340.spec
@@ -1,9 +1,9 @@
 %define nvidia_current_ver    %version
 %define nvidia_current_libver %version
 Name:          nvidia_340
-Version:       340.102
+Version:       340.107
 Epoch:         1
-Release:       2mamba
+Release:       1mamba
 Summary:       NVIDIA proprietary accelerated drivers for the Linux Kernel
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -15,6 +15,7 @@ Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{nvidia_curre
 Patch0:        nvidia-331.20-x86-conftest.patch
 Patch1:        nvidia-340.102-kernel-4.9.patch
 Patch2:        nvidia_340-340.102-kernel-4.9-2.patch
+Patch3:        nvidia_340-340.107-conftest-x86.patch
 License:       no OSI Approved
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
@@ -121,9 +122,10 @@ sed -i "s|__UTILS_PATH__|%{_bindir}|;s|__PIXMAP_PATH__|%{_datadir}/pixmaps|" \
    current/nvidia-settings.desktop
 
 cd current
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%patch3 -p1
 cd ..
 
 %build
@@ -253,6 +255,21 @@ export CLUTTER_BACKEND=x11
 _EOF
 chmod +x %{buildroot}%{_sysconfdir}/profile.d/nvidia-clutter.sh
 
+%check
+cd current/kernel
+#for d in /lib/modules/4.*/build; do
+#   kver=`echo $d|sed "s|/lib/modules/\(.*\)/build.*|\1|"`
+#   [ "${kver:0:4}" == "4.0." -o "${kver:0:3}" == "4.1." ] && continue
+#   [ "${kver/-arm}" == "${kver}" ] || continue
+   d=/lib/modules/`uname -r`/build
+   rm -f *.ko
+   make %{_smp_mflags} SYSSRC=$d module
+   for n in nvidia; do
+      [ -e ${n}.ko ] || exit 1
+   done
+   make %{_smp_mflags} SYSSRC=$d clean
+#done
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -422,6 +439,9 @@ exit 0
 %doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html
 
 %changelog
+* Thu Feb 28 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 340.107-1mamba
+- update to 340.107
+
 * Sat Aug 12 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 340.102-2mamba
 - patched to fix 'Error: Driver nvidia is already registered, aborting...'