- fix building with kernel 6.4, rel 4

[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 c9aaa87429119b4ca1c718849d1bcc5b9fa2f4d3..916f16eca5a6e4f4202b254a7ecff466deb47ba3 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -3,7 +3,7 @@
 # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
-%bcond_with    glvnd           # with GL vendor neutral libs
+%bcond_without glvnd           # with GL vendor neutral libs
 %bcond_without system_libglvnd # do not use system libglvnd
 %bcond_without kernel          # without kernel packages
 %bcond_without userspace       # don't build userspace programs
@@ -29,29 +29,32 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     3
+%define                rel     4
 %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.144
+Version:       390.157
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       https://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: 6ee8cd784135bd79f5e416b6815f443d
+# Source0-md5: 0975ee17f9c690555dfb2a342a0138b8
 Source1:       https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 258c635ac21824b282db79745867024d
+# Source1-md5: 405c2220d5d3711e9f298c871e8d66ee
 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.14.patch
+Patch2:                kenrel-6.2.patch
+Patch3:                kernel-6.3.patch
+Patch4:                kernel-6.3-uvm.patch
+Patch5:                kernel-6.4.patch
 URL:           https://www.nvidia.com/en-us/drivers/unix/
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -60,7 +63,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.1
+Requires:      xorg-xserver-server(videodrv-abi) <= 25.2
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
@@ -165,9 +168,9 @@ Summary(pl.UTF-8):  Biblioteki OpenGL (GL i GLX) Nvidia
 Group:         X11/Development/Libraries
 Requires(post,postun): /sbin/ldconfig
 %if %{with glvnd} && %{with system_libglvnd}
-Requires:      libglvnd
-Requires:      libglvnd-libGL
-Requires:      libglvnd-libGLES
+Requires:      libglvnd >= 1.3.4-2
+Requires:      libglvnd-libGL >= 1.3.4-2
+Requires:      libglvnd-libGLES >= 1.3.4-2
 %endif
 Requires:      libvdpau >= 0.3
 Provides:      OpenGL = 4.3
@@ -313,6 +316,11 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%ifarch %{x8664}
+%patch4 -p1
+%endif
+%patch5 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build