fix build with kernel 5.10

[packages/xorg-driver-video-nvidia-legacy-390xx.git] / xorg-driver-video-nvidia-legacy-390xx.spec

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index 6575009c4c973885a3b601b845078f730efb38e0..65a27d0fdd5997b8602aeb4b01c84061d89745c5 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -33,28 +33,33 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     1
+%define                rel     3
 %define                pname   xorg-driver-video-nvidia-legacy-390xx
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:       390.116
+Version:       390.138
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: bffe6d7e97a57bebd8bde645fb3c81bc
+# Source0-md5: 1247db325e3127324e28fb5f7c59ad50
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 2bf2f9b7dcaea8cb2c30813ab4e57f71
+# Source1-md5: 06e8b4f973719cb425a580542c861259
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
+Patch2:                kernel-5.8.patch
+Patch3:                kernel-5.8-uvm.patch
+Patch4:                kernel-5.9.patch
+Patch5:                kernel-5.9-uvm.patch
+Patch6:                kernel-5.10.patch
 URL:           http://www.nvidia.com/object/unix.html
 BuildRequires: rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -62,7 +67,7 @@ BuildRequires:        sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) <= 24.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 24.1
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
@@ -238,13 +243,6 @@ sterownik nVidii dla Xorg/XFree86.\
 
 %define build_kernel_pkg()\
 cd kernel\
-#cat >> Makefile <<'EOF'\
-#\
-#$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin\
-#      cp $< $@\
-#EOF\
-#mv nv-kernel.o{,.bin}\
-#build_kernel_modules -m nvidia\
 %{__make} SYSSRC=%{_kernelsrcdir} clean\
 %{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\
 cd ..\
@@ -268,6 +266,13 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch4 -p1
+%ifarch %{x8664}
+%patch3 -p1
+%patch5 -p1
+%endif
+%patch6 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build