commit 377cb031994304ff5d19081c1ad98b60f1666485 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Apr 16 23:49:09 2024 +0100 Update nvidia-470xx-kmod to 470.239.06 gcc-14.patch | 25 +++++++++++++++++++++++++ kernel-6.7.3.patch | 45 --------------------------------------------- nvidia-470xx-kmod.spec | 10 ++++++---- 3 files changed, 31 insertions(+), 49 deletions(-) --- diff --git a/gcc-14.patch b/gcc-14.patch new file mode 100644 index 0000000..99631c6 --- /dev/null +++ b/gcc-14.patch @@ -0,0 +1,25 @@ +diff -Naur a/kernel/conftest.sh b/kernel/conftest.sh +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -101,7 +101,8 @@ + build_cflags() { + BASE_CFLAGS="-O2 -D__KERNEL__ \ + -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \ +--nostdinc -isystem $ISYSTEM" ++-nostdinc -isystem $ISYSTEM \ ++-Wno-implicit-function-declaration -Wno-strict-prototypes -Wno-incompatible-pointer-types" + + if [ "$OUTPUT" != "$SOURCES" ]; then + OUTPUT_CFLAGS="-I$OUTPUT/include2 -I$OUTPUT/include" +diff -Naur a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h +@@ -236,7 +236,7 @@ + #error "NV_EFI_ENABLED_ARGUMENT_COUNT value unrecognized!" + #endif + #elif (defined(NV_EFI_ENABLED_PRESENT) || defined(efi_enabled)) +-#define NV_EFI_ENABLED() efi_enabled ++#define NV_EFI_ENABLED() ((int)efi_enabled) + #else + #define NV_EFI_ENABLED() 0 + #endif diff --git a/nvidia-470xx-kmod.spec b/nvidia-470xx-kmod.spec index 5f7ec48..cf6ad14 100644 --- a/nvidia-470xx-kmod.spec +++ b/nvidia-470xx-kmod.spec @@ -10,16 +10,16 @@ Name: nvidia-470xx-kmod Epoch: 3 -Version: 470.223.02 +Version: 470.239.06 # Taken over by kmodtool -Release: 2%{?dist} +Release: 1%{?dist} License: Redistributable, no modification permitted Summary: NVIDIA 470xx display driver kernel module URL: https://www.nvidia.com/ Source11: nvidia-470xx-kmodtool-excludekernel-filterfile -Patch0: kernel-6.7.3.patch +Patch0: gcc-14.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: x86_64 @@ -42,7 +42,6 @@ The nvidia 470xx %{version} display driver kernel module for kernel %{kversion}. kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}-%{release}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz -# patch loop %patch -P0 -p1 for kernel_version in %{?kernel_versions} ; do cp -a kernel _kmod_build_${kernel_version%%___*} @@ -74,6 +73,9 @@ done %{?akmod_install} %changelog +* Mon Apr 15 2024 Sérgio Basto <sergio(a)serjux.com&gt; - 3:470.239.06-1 +- Update nvidia-470xx-kmod to 470.239.06 + * Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:470.223.02-2 - fix build with kernel-6.7.3