X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-video-nvidia-legacy-390xx.spec;h=3f15b444702ccc4d94cca6d9c63b7563c7d89334;hb=b0685433a2c3514d0aebf545ec115e4578e0e6b8;hp=d9597332f4dce6a08bc9e95386d784909bba9ca2;hpb=d97e340595653893e5f06c6cf4cbb96018238d7a;p=packages%2Fxorg-driver-video-nvidia-legacy-390xx.git

diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index d959733..3f15b44 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -33,28 +33,29 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	1
+%define		rel	2
 %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.77
+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:	70f401c73e8b19d40d2f7b98bc8083f8
+# Source0-md5:	1247db325e3127324e28fb5f7c59ad50
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	d741d5bb82146f1a90839fea781c07f3
+# 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
 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 +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.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
@@ -192,7 +193,7 @@ Eszközök az nVidia grafikus kártyák beállításához.
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
 %define	kernel_pkg()\
-%package -n kernel%{_alt_kernel}-video-nvidia\
+%package -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx\
 Summary:	nVidia kernel module for nVidia Architecture support\
 Summary(de.UTF-8):	Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung\
 Summary(hu.UTF-8):	nVidia Architektúra támogatás Linux kernelhez.\
@@ -210,48 +211,43 @@ Requires:	%{pname} = %{epoch}:%{version}\
 Provides:	X11-driver-nvidia(kernel)\
 Obsoletes:	XFree86-nvidia-kernel\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx\
 nVidia Architecture support for Linux kernel.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx -l de.UTF-8\
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx -l hu.UTF-8\
 nVidia Architektúra támogatás Linux kernelhez.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx -l pl.UTF-8\
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez\
 sterownik nVidii dla Xorg/XFree86.\
 \
 %if %{with kernel}\
-%files -n kernel%{_alt_kernel}-video-nvidia\
+%files -n kernel%{_alt_kernel}-video-nvidia-legacy-390xx\
 %defattr(644,root,root,755)\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
 \
-%post	-n kernel%{_alt_kernel}-video-nvidia\
+%post	-n kernel%{_alt_kernel}-video-nvidia-legacy-390xx\
 %depmod %{_kernel_ver}\
 \
-%postun	-n kernel%{_alt_kernel}-video-nvidia\
+%postun	-n kernel%{_alt_kernel}-video-nvidia-legacy-390xx\
 %depmod %{_kernel_ver}\
 %{nil}
 
 %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 ..\
 %install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-drm,kernel/nvidia-modeset -d misc\
 %ifarch %{x8664}\
+%if %{_kernel_version_code} < %{_kernel_version_magic 5 8 0}\
 %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\
 %endif\
+%endif\
 %{nil}
 
 %{?with_kernel:%{expand:%create_kernel_packages}}
@@ -268,6 +264,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -416,7 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
-  kernel%{_alt_kernel}-video-nvidia-%{version}
+  kernel%{_alt_kernel}-video-nvidia-legacy-390xx-%{version}
 
 EOF