[nvidia-open-kmod/el9: 10/13] Fix gcc14 compile issue (rfbz#6882)
commit 31d01df783caac5c9981456e247a77ad89969af0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 1 11:07:08 2024 +0000
Fix gcc14 compile issue (rfbz#6882)
gcc14.patch | 17 +++++++++++++++++
nvidia-open-kmod.spec | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..19ef22f
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,17 @@
+--- a/kernel-open/conftest.sh
++++ b/kernel-open/conftest.sh
+@@ -5154,8 +5154,13 @@
+ #
+ CODE="
+ #include <drm/drm_gem.h>
++ #if defined(NV_LINUX_IOSYS_MAP_H_PRESENT)
++ typedef struct iosys_map nv_sysio_map_t;
++ #else
++ typedef struct dma_buf_map nv_sysio_map_t;
++ #endif
+ int conftest_drm_gem_object_vmap_has_map_arg(
+- struct drm_gem_object *obj, struct dma_buf_map *map) {
++ struct drm_gem_object *obj, nv_sysio_map_t *map) {
+ return obj->funcs->vmap(obj, map);
+ }"
+
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index 83bb10f..b10512b 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -12,13 +12,14 @@ Name: nvidia-open-kmod
Epoch: 3
Version: 550.54.14
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA open display driver kernel module
License: GPLv2 and MIT
URL: https://github.com/NVIDIA/open-gpu-kernel-modules
Source0: %{url}/archive/%{version}/open-gpu-kernel-modules-%{version}.tar.gz
Source11: nvidia-open-kmodtool-excludekernel-filterfile
+Patch0: gcc14.patch
ExclusiveArch: x86_64 aarch64
@@ -40,6 +41,8 @@ The nvidia open %{version} display driver kernel module for kernel
%{kversion}.
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile
%{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels
"%{?kernels}"} 2>/dev/null
%setup -q -c
# patch loop
+ls
+%patch -P0 -p1 -d open-gpu-kernel-modules-%{version}
%if 0%{?_without_nvidia_kmod_patches:1}
# placeholder
%endif
@@ -77,6 +80,9 @@ done
%changelog
+* Fri Mar 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-2
+- Fix gcc14 compile issue (rfbz#6882)
+
* Sat Feb 24 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.54.14-1
- Update to 550.54.14 release