X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-390xx.git;a=blobdiff_plain;f=xorg-driver-video-nvidia-legacy-390xx.spec;h=37521619afbcf4f599eb1f8fe13f9484819ad3b9;hp=d0784e6aa2f32bb9c2641829d5726945f802b788;hb=bf926a1;hpb=79331cf5ac6d20b8d084871e70269eaf27f60978 diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec index d0784e6..3752161 100644 --- a/xorg-driver-video-nvidia-legacy-390xx.spec +++ b/xorg-driver-video-nvidia-legacy-390xx.spec @@ -33,29 +33,32 @@ exit 1 %define no_install_post_check_so 1 -%define rel 2 +%define rel 6 %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.132 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: 2677480ee20cd4918b1de9289b2d0af8 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 2bf2f9b7dcaea8cb2c30813ab4e57f71 +# Source1-md5: dcc8f272fef30c43a68d21b3379d99aa 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.1.patch +Patch2: kernel-5.5.patch +Patch3: kernel-5.6.patch +Patch4: kernel-5.6-x8664.patch +Patch5: kernel-5.7.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}} @@ -63,7 +66,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 @@ -239,13 +242,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 ..\ @@ -270,6 +266,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