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=8e4790b0a4eec127961ae8dff4465955e231628f;hp=8cb1d695fd95a8e60707e771b968df8f6abf6852;hb=d56b66df0f85ede3a8eb67bfcfb73f9bde04f677;hpb=78d034daa75aac56277fd8fbd1f8ddb860872e59 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 8cb1d69..8e4790b 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -4,7 +4,7 @@ # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: -%bcond_with system_libglvnd # do not use system libglvnd +%bcond_with system_libglvnd # use system libglvnd %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs %bcond_with settings # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec) @@ -19,34 +19,30 @@ 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.44 +Version: 465.27 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: 8b72e9af14e43171405526a308a08796 +Source0: https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run +# Source0-md5: 212e7765216ca3961409637360acce4c 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 +URL: https://www.nvidia.com/en-us/drivers/unix/ +BuildRequires: rpm-build >= 4.6 +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,15 +52,17 @@ 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 -Obsoletes: XFree86-nvidia +Obsoletes: XFree86-driver-nvidia < 1.0.5336-4 +Obsoletes: XFree86-nvidia < 1.0 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 @@ -121,6 +119,9 @@ Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-OpenGL-core < 1:7.0.0 Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 +%if %{with system_libglvnd} +Obsoletes: xorg-driver-video-nvidia-devel < 465.27-2 +%endif %description libs NVIDIA OpenGL (GL and GLX only) implementation libraries. @@ -136,9 +137,9 @@ Group: X11/Development/Libraries Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 -Obsoletes: X11-OpenGL-devel-base -Obsoletes: XFree86-OpenGL-devel-base -Obsoletes: XFree86-driver-nvidia-devel +Obsoletes: X11-OpenGL-devel-base < 1:7.0.0 +Obsoletes: XFree86-OpenGL-devel-base < 1:7.0.0 +Obsoletes: XFree86-driver-nvidia-devel < 1.0.5336-4 Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3 %description devel @@ -154,15 +155,18 @@ firmy NVIDIA. %package doc Summary: Documentation for NVIDIA Graphics Driver +Summary(pl.UTF-8): Dokumentacja do sterownika graficznego NVIDIA Group: Documentation -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description doc NVIDIA Accelerated Linux Graphics Driver README and Installation Guide. +%description doc -l pl.UTF-8 +Plik README oraz przewodnik instalacji do akcelerowanego sterownika +graficznego NVIDIA dla Linuksa. + %package progs Summary: Tools for advanced control of nVidia graphic cards Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához @@ -170,7 +174,7 @@ Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System Requires: %{pname} = %{epoch}:%{version} Suggests: pkgconfig -Obsoletes: XFree86-driver-nvidia-progs +Obsoletes: XFree86-driver-nvidia-progs < 1.0.5336-4 %description progs Tools for advanced control of nVidia graphic cards. @@ -181,7 +185,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\ @@ -199,7 +202,7 @@ Requires: %{releq_kernel -n drm}\ Requires(postun): %releq_kernel\ Requires: %{pname} = %{epoch}:%{version}\ Provides: X11-driver-nvidia(kernel)\ -Obsoletes: XFree86-nvidia-kernel\ +Obsoletes: XFree86-nvidia-kernel < 1.0.5336-4\ \ %description -n kernel%{_alt_kernel}-video-nvidia\ nVidia Architecture support for Linux kernel.\ @@ -229,13 +232,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 +239,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 +310,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 +318,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 +332,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,12 +442,13 @@ 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} %attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGL.so %attr(755,root,root) %{_libdir}/nvidia/libGLX.so.0 %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so.0 %attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0 @@ -483,14 +483,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 +501,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 @@ -512,17 +517,16 @@ EOF %{_datadir}/vulkan/icd.d/nvidia_icd.json %endif +%if %{without system_libglvnd} %files devel %defattr(644,root,root,755) -%if %{without system_libglvnd} -%attr(755,root,root) %{_libdir}/nvidia/libGL.so %attr(755,root,root) %{_libdir}/nvidia/libGLX.so %attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so %attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so %attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so %attr(755,root,root) %{_libdir}/nvidia/libEGL.so -%endif %{_pkgconfigdir}/gl.pc +%endif %files doc %defattr(644,root,root,755) @@ -540,7 +544,7 @@ EOF %{_mandir}/man1/nvidia-smi.1* %{_mandir}/man1/nvidia-xconfig.1* %if %{with settings} -%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh +%attr(755,root,root) /etc/X11/xinit/xinitrc.d/nvidia-settings.sh %attr(755,root,root) %{_bindir}/nvidia-settings %{_mandir}/man1/nvidia-settings.1* %{_desktopdir}/nvidia-settings.desktop