X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=866ebde277bcac80e4e91c58d26500d612b30b80;hp=e64ddf5a7052af175e1a573d1260f83be1fc7c22;hb=e2d14cbc13c208791a25480bf5bcf602c592413e;hpb=7362d6fbfc481cc7783e5e75698a3cfd24a25872 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index e64ddf5..866ebde 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -32,21 +32,22 @@ 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: 367.35 +Version: 375.26 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: 42db6f6485c3c337c7c756380ec64b7a +# Source0-md5: b0706e88ad173f6b9c7bd2e5a838c163 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 24f1fc19fe10bcc6ff264fb5034c4ccc +# Source1-md5: 5595fb385e41638c5118784114b03d9a 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: linux-4.1-and-older.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}} @@ -54,7 +55,7 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 20.0 +Requires: xorg-xserver-server(videodrv-abi) <= 23.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver @@ -151,6 +152,9 @@ firmy NVIDIA. %package doc Summary: Documentation for NVIDIA Graphics Driver Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description doc NVIDIA Accelerated Linux Graphics Driver README and Installation @@ -229,7 +233,7 @@ cd kernel\ #mv nv-kernel.o{,.bin}\ #build_kernel_modules -m nvidia\ %{__make} SYSSRC=%{_kernelsrcdir} clean\ -%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 module\ +%{__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}\ @@ -251,6 +255,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