X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=69a39c0a46091baf92af898c07796b90567d8cb4;hp=bca767cf06f0400b19862c9c6bff180940b3743f;hb=dd40547;hpb=b424f6e6236aac1255054031ca5810e4a80ba693 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index bca767c..69a39c0 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -19,34 +19,29 @@ exit 1 %endif -%if %{without userspace} -# nothing to be placed to debuginfo package -%define _enable_debug_packages 0 -%endif - %define no_install_post_check_so 1 -%define rel 1 +%define rel 2 %define pname xorg-driver-video-nvidia 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: 440.59 +Version: 460.56 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_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run -# Source0-md5: 596a63329c35d24cd787dc4e7e72d2d1 +Source0: https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run +# Source0-md5: 5851075ac80f5b5f0415ef5e31327e51 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html -BuildRequires: rpmbuild(macros) >= 1.701 +BuildRequires: rpmbuild(macros) >= 1.752 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}} BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia @@ -56,7 +51,7 @@ Requires: xorg-xserver-server(videodrv-abi) <= 24.1 Requires: xorg-xserver-server(videodrv-abi) >= 4.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver -Provides: vulkan(icd) = 1.1.119 +Provides: vulkan(icd) = 1.2.155 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -65,6 +60,8 @@ Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{?with_userspace:%{ix86}} %{x8664} BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) +%define _enable_debug_packages 0 + %define _noautoreqdep libGL.so.1 libnvcuvid.so # libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1 %define _noautoreq libnvcuvid.so @@ -155,9 +152,7 @@ firmy NVIDIA. %package doc Summary: Documentation for NVIDIA Graphics Driver Group: Documentation -%if "%{_rpmversion}" >= "5" -BuildArch: noarch -%endif +%{?noarchpackage} %description doc NVIDIA Accelerated Linux Graphics Driver README and Installation @@ -181,7 +176,6 @@ Eszközök az nVidia grafikus kártyák beállításához. %description progs -l pl.UTF-8 Narzędzia do zarządzania kartami graficznymi nVidia. -%ifarch %{x8664} %define kernel_pkg()\ %package -n kernel%{_alt_kernel}-video-nvidia\ Summary: nVidia kernel module for nVidia Architecture support\ @@ -229,13 +223,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 ..\ @@ -243,6 +230,7 @@ cd ..\ %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\ %{nil} +%ifarch %{x8664} %{?with_kernel:%{expand:%create_kernel_packages}} %endif @@ -313,7 +301,7 @@ for f in \ %{srcdir}/libGLESv1_CM_nvidia.so.%{version} \ %{srcdir}/libGLESv2_nvidia.so.%{version} \ %ifarch %{x8664} - %{srcdir}/libnvidia-egl-wayland.so.1.1.4 \ + %{srcdir}/libnvidia-egl-wayland.so.1.1.5 \ %{srcdir}/libnvidia-eglcore.so.%{version} \ %endif %{srcdir}/libcuda.so.%{version} \ @@ -321,12 +309,13 @@ for f in \ %ifarch %{x8664} %{srcdir}/libnvidia-cbl.so.%{version} \ %{srcdir}/libnvidia-cfg.so.%{version} \ + %{srcdir}/libnvidia-ngx.so.%{version} \ %{srcdir}/libnvidia-rtcore.so.%{version} \ %{srcdir}/libnvoptix.so.%{version} \ %endif + %{srcdir}/libnvidia-allocator.so.%{version} \ %{srcdir}/libnvidia-compiler.so.%{version} \ %{srcdir}/libnvidia-encode.so.%{version} \ - %{srcdir}/libnvidia-fatbinaryloader.so.%{version} \ %{srcdir}/libnvidia-fbc.so.%{version} \ %{srcdir}/libnvidia-glcore.so.%{version} \ %{srcdir}/libnvidia-glsi.so.%{version} \ @@ -334,6 +323,7 @@ for f in \ %{srcdir}/libnvidia-ifr.so.%{version} \ %{srcdir}/libnvidia-ml.so.%{version} \ %{srcdir}/libnvidia-opencl.so.%{version} \ + %{srcdir}/libnvidia-opticalflow.so.%{version} \ %{srcdir}/libnvidia-ptxjitcompiler.so.%{version} \ %{srcdir}/libnvidia-tls.so.%{version} \ ; do @@ -443,7 +433,7 @@ EOF %dir %{_sysconfdir}/OpenCL %dir %{_sysconfdir}/OpenCL/vendors %{_sysconfdir}/OpenCL/vendors/nvidia.icd -%endif} +%endif %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf %dir %{_libdir}/nvidia %if %{without system_libglvnd} @@ -483,14 +473,17 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cbl.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ngx.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ngx.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-rtcore.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvoptix.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvoptix.so.1 %endif +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-allocator.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-allocator.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-encode.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-encode.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-fatbinaryloader.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-fbc.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-fbc.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.* @@ -498,12 +491,14 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ifr.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ifr.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-opticalflow.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opticalflow.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1