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=8a90b7a1339812939231f8b8e8fff7e68d547fc9;hp=6e6200691a0e83a171f6365dcc0938a1a07ea92f;hb=HEAD;hpb=97113226fa72f3dbd2f2bd671faf557c63035cfb diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 6e62006..cfb3c08 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,11 +1,9 @@ # TODO -# - should -libs Require main package? -# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it? +# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: -%bcond_with glvnd # with GL vendor neutral libs -%bcond_without system_libglvnd # do not use system libglvnd +%bcond_without 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) @@ -20,17 +18,6 @@ exit 1 %endif -%if %{with glvnd} -%define vulkan_lib libGLX_nvidia.so.0 -%else -%define vulkan_lib libGL.so.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 @@ -40,95 +27,166 @@ 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: 396.54 +Version: 550.54.14 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: 195afa93d400bdbb9361ede6cef95143 +Source0: https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run +# Source0-md5: 69e77647875bef192f8458912027e44b 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 -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}} +Patch0: X11-driver-nvidia-desktop.patch +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:3.10}} 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) >= 2.0 +Requires: xorg-xserver-server(videodrv-abi) <= 25.2 +Requires: xorg-xserver-server(videodrv-abi) >= 4.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver -Provides: vulkan(icd) = 1.1.70 +Provides: vulkan(icd) = 1.3.194 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 _noautoreqdep libGL.so.1 libnvcuvid.so +%define _enable_debug_packages 0 + # libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1 %define _noautoreq libnvcuvid.so +%define _noautostrip .*/lib/firmware/.* + %description This driver set adds improved 2D functionality to the Xorg X server as well as high performance OpenGL acceleration, AGP support, support for -most flat panels, and 2D multiple monitor support. Supported hardware: -modern NVIDIA GeForce (from GeForce2 MX) and Quadro (Quadro4 and up) -based graphics accelerators. - -The older graphics chips are unsupported: -- NV1 and RIVA 128/128ZX chips are supported in the base Xorg install - (nv driver) -- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy - drivers. +most flat panels, and 2D multiple monitor support. + +Supported hardware: +- GeForce 600 series (excluding 605/GT 610/GT 620/GT 645) +- GeForce 600M series (GT 640M LE only) +- GeForce 700 series (excluding GT 705) +- GeForce 800M series (830M/840M/845M/850M/860M only) +- GeForce 900/900M series (excluding 910M/920M) +- GeForce 10 series (including GT 1010) +- GeForce 10 mobile series +- GeForce 16 series (also mobile) +- GeForce MX100 series +- GeForce MX200 series +- GeForce MX300 series +- GeForce MX400 series +- GeForce RTX 20 series (also mobile) +- GeForce RTX 30 series (also mobile) +- GeForce TITAN series (GTX TITAN X/GTX TITAN Black/GTX TITAN Z) +- NVIDIA RTX series (also mobile) +- NVIDIA TITAN series (RTX/V/Xp) +- NVS series (NVS 510/NVS 810 only) +- Quadro NVS series (NVS 510/NVS 810 only) +- Quadro Blade/Embedded series (M3000 SE/M5000 SE/P3000/P5000 only) +- Quadro mobile series (K620M/K2200M/M*/P*/T* only) +- Quadro series (410/K*/M*/P*/GP100/GV100 only) +- Quadro RTX series (also mobile) +- GRID series (K520) + +For older hardware see appropriate xorg-driver-video-nvidia-legacy-* +driver series. %description -l hu.UTF-8 Ez a meghajtó kibővíti az Xorg X szerver 2D működését OpenGL gyorsítással, AGP támogatással és támogatja a több monitort. -Támogatott hardverek: modern NVIDIA GeForce (GeForce2 MX-től) és -Quadro (Quadro4 és újabbak) alapú grafikai gyorsítók. -A régekbbi grafikus chipek nem támogatottak: -- NV1 és RIVA 128/128ZX chipek az alap Xorg telepítéssel (nv meghajtó) -- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 a -legacy driverekkel - támogatottak. +Támogatott hardverek: +- GeForce 600 series (- 605/GT 610/GT 620/GT 645) +- GeForce 600M series (GT 640M LE) +- GeForce 700 series (- GT 705) +- GeForce 800M series (830M/840M/845M/850M/860M) +- GeForce 900/900M series (- 910M/920M) +- GeForce 10 series +- GeForce 10 mobile series +- GeForce 16 series (+mobile) +- GeForce MX100 series +- GeForce MX200 series +- GeForce MX300 series +- GeForce MX400 series +- GeForce RTX 20 series (+mobile) +- GeForce RTX 30 series (+mobile) +- GeForce TITAN series (GTX TITAN X/GTX TITAN Black/GTX TITAN Z) +- NVIDIA RTX series (+mobile) +- NVIDIA TITAN series (RTX/V/Xp) +- NVS series (NVS 510/NVS 810) +- Quadro NVS series (NVS 510/NVS 810) +- Quadro Blade/Embedded series (M3000 SE/M5000 SE/P3000/P5000) +- Quadro mobile series (K620M/K2200M/M*/P*/T*) +- Quadro series (410/K*/M*/P*/GP100/GV100) +- Quadro RTX series (+mobile) +- GRID series (K520) %description -l pl.UTF-8 Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg, dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów -2D. Obsługują w miarę nowe karty NVIDIA GeForce (od wersji GeForce2 -MX) oraz Quadro (od wersji Quadro4). - -Starsze układy graficzne nie są obsługiwane przez ten pakiet: -- NV1 i RIVA 128/128ZX są obsługiwane przez sterownik nv z Xorg -- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez - sterowniki -legacy +2D. + +Obsługują karty: +- GeForce serii 600 (oprócz 605/GT 610/GT 620/GT 645) +- GeForce serii 600M (tylko GT 640M LE) +- GeForce serii 700 (oprócz GT 705) +- GeForce serii 800M (tylko 830M/840M/845M/850M/860M) +- GeForce serii 900/900M series (oprócz 910M/920M) +- GeForce serii 10 (wraz z GT 1010) +- GeForce serii 10 mobile +- GeForce serii 16 (także mobile) +- GeForce serii MX100 +- GeForce serii MX200 +- GeForce serii MX300 +- GeForce serii MX400 +- GeForce serii RTX 20 (także mobile) +- GeForce serii RTX 30 (także mobile) +- GeForce serii TITAN (GTX TITAN X/GTX TITAN Black/GTX TITAN Z) +- NVIDIA serii RTX (także mobile) +- NVIDIA serii TITAN (RTX/V/Xp) +- serii NVS (tylko NVS 510/NVS 810) +- Quadro serii NVS (tylko NVS 510/NVS 810) +- Quadro serii Blade/Embedded (tylko M3000 SE/M5000 SE/P3000/P5000) +- Quadro mobile (tylko K620M/K2200M/M*/P*/T*) +- Quadro (tylko 410/K*/M*/P*/GP100/GV100) +- Quadro serii RTX (także mobile) +- GRID (K520) %package libs Summary: OpenGL (GL and GLX) Nvidia libraries Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries Requires(post,postun): /sbin/ldconfig -%if %{with glvnd} && %{with system_libglvnd} -Requires: libglvnd -Requires: libglvnd-libGL -Requires: libglvnd-libGLES +%if %{with system_libglvnd} +Requires: libglvnd >= 1.3.4-2 +Requires: libglvnd-libGL >= 1.3.4-2 +Requires: libglvnd-libGLES >= 1.3.4-2 %endif Requires: libvdpau >= 0.3 -Provides: OpenGL = 3.3 +Provides: OpenGL = 4.6 Provides: OpenGL-GLX = 1.4 +%if %{with system_libglvnd} +Provides: glvnd(EGL)%{?_isa} +Provides: glvnd(GL)%{?_isa} +Provides: glvnd(GLES)%{?_isa} +%endif 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. @@ -142,11 +200,9 @@ Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) 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 @@ -162,15 +218,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 @@ -178,7 +237,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. @@ -189,7 +248,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\ @@ -207,7 +265,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.\ @@ -225,6 +283,10 @@ sterownik nVidii dla Xorg/XFree86.\ %if %{with kernel}\ %files -n kernel%{_alt_kernel}-video-nvidia\ %defattr(644,root,root,755)\ +%dir /lib/firmware/nvidia\ +%dir /lib/firmware/nvidia/%{version}\ +/lib/firmware/nvidia/%{version}/gsp_ga10x.bin\ +/lib/firmware/nvidia/%{version}/gsp_tu10x.bin\ /lib/modules/%{_kernel_ver}/misc/*.ko*\ %endif\ \ @@ -237,13 +299,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 ..\ @@ -251,6 +306,7 @@ cd ..\ %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\ %{nil} +%ifarch %{x8664} %{?with_kernel:%{expand:%create_kernel_packages}} %endif @@ -260,7 +316,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version} /bin/sh %{SOURCE0} --extract-only %setup -qDT -n NVIDIA-Linux-x86_64-%{version} %patch0 -p1 -%patch1 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build @@ -272,11 +327,11 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kerne rm -rf $RPM_BUILD_ROOT %if %{with userspace} -install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \ - $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ +install -d $RPM_BUILD_ROOT%{_libdir}/{gbm,nvidia,xorg/modules/{drivers,extensions/nvidia}} \ + $RPM_BUILD_ROOT{%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \ - $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d} + $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d,egl/egl_external_platform.d} %ifarch %{x8664} %if %{with settings} @@ -308,7 +363,6 @@ install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/ %endif for f in \ -%if %{with glvnd} %if %{without system_libglvnd} %{srcdir}/libGL.so.1.7.0 \ %{srcdir}/libGLX.so.0 \ @@ -322,30 +376,33 @@ for f in \ %{srcdir}/libEGL_nvidia.so.%{version} \ %{srcdir}/libGLESv1_CM_nvidia.so.%{version} \ %{srcdir}/libGLESv2_nvidia.so.%{version} \ -%ifarch %{x8664} - %{srcdir}/libnvidia-egl-wayland.so.1.0.3 \ - %{srcdir}/libnvidia-eglcore.so.%{version} \ -%endif -%else - %{srcdir}/libGL.so.%{version} \ -%endif %{srcdir}/libcuda.so.%{version} \ %{srcdir}/libnvcuvid.so.%{version} \ -%ifarch %{x8664} - %{srcdir}/libnvidia-cfg.so.%{version} \ -%endif - %{srcdir}/libnvidia-compiler.so.%{version} \ + %{srcdir}/libnvidia-allocator.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} \ %{srcdir}/libnvidia-glvkspirv.so.%{version} \ - %{srcdir}/libnvidia-ifr.so.%{version} \ + %{srcdir}/libnvidia-gpucomp.so.%{version} \ %{srcdir}/libnvidia-ml.so.%{version} \ + %{srcdir}/libnvidia-nvvm.so.%{version} \ %{srcdir}/libnvidia-opencl.so.%{version} \ + %{srcdir}/libnvidia-opticalflow.so.%{version} \ %{srcdir}/libnvidia-ptxjitcompiler.so.%{version} \ - %{srcdir}/tls/libnvidia-tls.so.%{version} \ + %{srcdir}/libnvidia-tls.so.%{version} \ +%ifarch %{x8664} + %{srcdir}/libcudadebugger.so.%{version} \ + %{srcdir}/libnvidia-api.so.1 \ + %{srcdir}/libnvidia-egl-gbm.so.1.1.1 \ + %{srcdir}/libnvidia-egl-wayland.so.1.1.13 \ + %{srcdir}/libnvidia-eglcore.so.%{version} \ + %{srcdir}/libnvidia-cfg.so.%{version} \ + %{srcdir}/libnvidia-ngx.so.%{version} \ + %{srcdir}/libnvidia-pkcs11-openssl3.so.%{version} \ + %{srcdir}/libnvidia-rtcore.so.%{version} \ + %{srcdir}/libnvoptix.so.%{version} \ +%endif ; do install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia done @@ -353,19 +410,15 @@ done install -p %{srcdir}/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau %ifarch %{x8664} -install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia -ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so +install -p libglxserver_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia +ln -s libglxserver_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} ln -s nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so -install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia -ln -s libnvidia-wfb.so.1 $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so %endif /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/nvidia /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia -cp -p gl*.h $RPM_BUILD_ROOT%{_includedir}/GL - ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 %ifarch %{x8664} @@ -377,7 +430,6 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf %endif # OpenGL ABI for Linux compatibility -%if %{with glvnd} %if %{without system_libglvnd} ln -sf libGL.so.1.7.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so @@ -396,25 +448,24 @@ ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidi ln -sf libGLESv1_CM_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1 ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2_nvidia.so.2 +ln -sf ../nvidia/libnvidia-allocator.so.%{version} $RPM_BUILD_ROOT%{_libdir}/gbm/nvidia-drm_gbm.so + %ifarch %{x8664} install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d -%endif -%else -ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 -ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so +install -p 15_nvidia_gbm.json $RPM_BUILD_ROOT%{_datadir}/egl/egl_external_platform.d +install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d %endif ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so -%ifarch %{x8664} -sed 's!__NV_VK_ICD__!%{vulkan_lib}!g' nvidia_icd.json.template > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json -%endif %endif %ifarch %{x8664} %if %{with kernel} install -d $RPM_BUILD_ROOT cp -a installed/* $RPM_BUILD_ROOT +install -D firmware/gsp_ga10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_ga10x.bin +install -D firmware/gsp_tu10x.bin $RPM_BUILD_ROOT/lib/firmware/nvidia/%{version}/gsp_tu10x.bin %endif %endif @@ -422,7 +473,6 @@ install -d $RPM_BUILD_ROOT%{_pkgconfigdir} sed -e ' s|@@prefix@@|%{_prefix}|g; s|@@libdir@@|%{_libdir}|g; - s|@@includedir@@|%{_includedir}|g; s|@@version@@|%{version}|g' < %{SOURCE3} \ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc @@ -445,11 +495,8 @@ EOF %defattr(644,root,root,755) %doc LICENSE NVIDIA_Changelog README.txt %dir %{_libdir}/xorg/modules/extensions/nvidia -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1 -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so.* -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so.* +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglxserver_nvidia.so %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf @@ -466,13 +513,14 @@ 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 +%attr(755,root,root) %{_libdir}/gbm/nvidia-drm_gbm.so %dir %{_libdir}/nvidia -%if %{with glvnd} %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 @@ -492,72 +540,70 @@ EOF %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_indirect.so.0 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_nvidia.so.0 %attr(755,root,root) %{_libdir}/nvidia/libGLX_nvidia.so.*.* -%ifarch %{x8664} -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.* -%endif -%else -%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%endif %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvcuvid.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvcuvid.so -%ifarch %{x8664} -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1 -%endif -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.* +%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-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.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.so.*.* %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-gpucomp.so.*.* %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-nvvm.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-nvvm.so.4 %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 %ifarch %{x8664} -%if %{with glvnd} +%attr(755,root,root) %{_libdir}/nvidia/libcudadebugger.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libcudadebugger.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-api.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-gbm.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-gbm.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.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-pkcs11-openssl3.so.*.* +%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 +# which package should own those? +%dir %{_datadir}/egl +%dir %{_datadir}/egl/egl_external_platform.d +%{_datadir}/egl/egl_external_platform.d/15_nvidia_gbm.json %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -%endif %{_datadir}/vulkan/icd.d/nvidia_icd.json %endif +%if %{without system_libglvnd} %files devel %defattr(644,root,root,755) -%dir %{_includedir}/GL -%{_includedir}/GL/gl.h -%{_includedir}/GL/glext.h -%{_includedir}/GL/glx.h -%{_includedir}/GL/glxext.h -%if %{with glvnd} -%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 -%else -%attr(755,root,root) %{_libdir}/nvidia/libGL.so -%endif %{_pkgconfigdir}/gl.pc +%endif %files doc %defattr(644,root,root,755) @@ -575,7 +621,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