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=fdcfbb9eb63bdc303bcebc605e1c253217b5c45d;hp=4713b6918b36bee090230d7145a3cb3ec8b4f93c;hb=2ea8529d8aa59a06136fff1888587dbb2c6ff24c;hpb=0d9800f002363d00de3258329fad12551f87c656 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 4713b69..fdcfbb9 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -4,41 +4,49 @@ # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: -%bcond_without dist_kernel # without distribution kernel +%bcond_with glvnd # with GL vendor neutral libs +%bcond_without system_libglvnd # do not use system libglvnd %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs -%bcond_with force_userspace # force userspace build (useful if alt_kernel is set) %bcond_with settings # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec) %bcond_with verbose # verbose build (V=1) -%if "%{_alt_kernel}" != "%{nil}" -%undefine with_userspace +# The goal here is to have main, userspace, package built once with +# simple release number, and only rebuild kernel packages with kernel +# version as part of release number, without the need to bump release +# with every kernel change. +%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace} +%{error:kernel and userspace cannot be built at the same time on PLD builders} +exit 1 %endif -%if %{with force_userspace} -%define with_userspace 1 + +%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 5 +%define rel 1 %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}%{_alt_kernel} +Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 319.32 -Release: %{rel} +Version: 396.24 +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: 978339ff37c3207f3a39d3952721dcdb -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: d181d856768868823df3bda4607a5315 +Source0: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run +# Source0-md5: 7b5c4735a5b7ad3a9d166ca85cc88e17 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -46,23 +54,23 @@ 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 -%if %{with kernel} -%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} -%endif -BuildRequires: %{kgcc_package} -BuildRequires: rpmbuild(macros) >= 1.379 +BuildRequires: rpmbuild(macros) >= 1.701 +%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 14.1 +Requires: xorg-xserver-server(videodrv-abi) <= 24.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Provides: ocl-icd(nvidia) +Provides: ocl-icd-driver +Provides: vulkan(icd) = 1.1.70 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 -ExclusiveArch: %{ix86} %{x8664} +ExclusiveArch: %{x8664} BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libnvcuvid.so @@ -109,8 +117,13 @@ 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 +%endif Requires: libvdpau >= 0.3 -Provides: OpenGL = 2.1 +Provides: OpenGL = 3.3 Provides: OpenGL-GLX = 1.4 Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 @@ -150,6 +163,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 @@ -173,65 +189,80 @@ 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. -%package -n kernel%{_alt_kernel}-video-nvidia -Summary: nVidia kernel module for nVidia Architecture support -Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung -Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez. -Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -Requires: dev >= 2.7.7-10 -%if %{with dist_kernel} -%requires_releq_kernel -%if "%{_alt_kernel}" == "%{nil}" -Requires: %releq_kernel -n drm -%endif -%endif -Requires: %{pname} = %{epoch}:%{version} -Provides: X11-driver-nvidia(kernel) -Obsoletes: XFree86-nvidia-kernel - -%description -n kernel%{_alt_kernel}-video-nvidia -nVidia Architecture support for Linux kernel. - -%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8 -Die nVidia-Architektur-Unterstützung für den Linux-Kern. - -%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8 -nVidia Architektúra támogatás Linux kernelhez. - -%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8 -Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez -sterownik nVidii dla Xorg/XFree86. +%define kernel_pkg()\ +%package -n kernel%{_alt_kernel}-video-nvidia\ +Summary: nVidia kernel module for nVidia Architecture support\ +Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung\ +Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez.\ +Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia\ +Release: %{rel}@%{_kernel_ver_str}\ +Group: Base/Kernel\ +Requires(post,postun): /sbin/depmod\ +Requires: dev >= 2.7.7-10\ +%requires_releq_kernel\ +%if %{_kernel_version_code} >= %{_kernel_version_magic 3 10 0}\ +Requires: %{releq_kernel -n drm}\ +%endif\ +Requires(postun): %releq_kernel\ +Requires: %{pname} = %{epoch}:%{version}\ +Provides: X11-driver-nvidia(kernel)\ +Obsoletes: XFree86-nvidia-kernel\ +\ +%description -n kernel%{_alt_kernel}-video-nvidia\ +nVidia Architecture support for Linux kernel.\ +\ +%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8\ +Die nVidia-Architektur-Unterstützung für den Linux-Kern.\ +\ +%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8\ +nVidia Architektúra támogatás Linux kernelhez.\ +\ +%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8\ +Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez\ +sterownik nVidii dla Xorg/XFree86.\ +\ +%if %{with kernel}\ +%files -n kernel%{_alt_kernel}-video-nvidia\ +%defattr(644,root,root,755)\ +/lib/modules/%{_kernel_ver}/misc/*.ko*\ +%endif\ +\ +%post -n kernel%{_alt_kernel}-video-nvidia\ +%depmod %{_kernel_ver}\ +\ +%postun -n kernel%{_alt_kernel}-video-nvidia\ +%depmod %{_kernel_ver}\ +%{nil} + +%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 ..\ +%install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-drm,kernel/nvidia-modeset -d misc\ +%install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\ +%{nil} + +%{?with_kernel:%{expand:%create_kernel_packages}} %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{version}* -%ifarch %{ix86} +rm -rf NVIDIA-Linux-x86_64-%{version} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{version} -%else -/bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32 -%endif +%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 -%if %{with kernel} -cd kernel -ln -sf Makefile.kbuild Makefile -#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} module -%endif +%{?with_kernel:%{expand:%build_kernel_packages}} %install rm -rf $RPM_BUILD_ROOT @@ -240,7 +271,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_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%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \ + $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d} %if %{with settings} install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} @@ -258,24 +290,51 @@ install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d install %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-modules.conf +install -p nvidia-drm-outputclass.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf + +install -p nvidia-application-profiles-%{version}-key-documentation $RPM_BUILD_ROOT%{_datadir}/nvidia +install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/nvidia for f in \ +%if %{with glvnd} +%if %{without system_libglvnd} + libGL.so.1.7.0 \ + libGLX.so.0 \ + libOpenGL.so.0 \ + libGLdispatch.so.0 \ + libGLESv1_CM.so.1.2.0 \ + libGLESv2.so.2.1.0 \ + libEGL.so.1.1.0 \ +%endif + libGLX_nvidia.so.%{version} \ + libEGL_nvidia.so.%{version} \ + libGLESv1_CM_nvidia.so.%{version} \ + libGLESv2_nvidia.so.%{version} \ + libnvidia-egl-wayland.so.1.0.3 \ + libnvidia-eglcore.so.%{version} \ +%else libGL.so.%{version} \ - libOpenCL.so.1.0.0 \ +%endif libcuda.so.%{version} \ libnvcuvid.so.%{version} \ libnvidia-cfg.so.%{version} \ libnvidia-compiler.so.%{version} \ - libnvidia-encode.so.%{version} \ + libnvidia-encode.so.%{version} \ + libnvidia-fatbinaryloader.so.%{version} \ + libnvidia-fbc.so.%{version} \ libnvidia-glcore.so.%{version} \ + libnvidia-glsi.so.%{version} \ + libnvidia-glvkspirv.so.%{version} \ + libnvidia-ifr.so.%{version} \ libnvidia-ml.so.%{version} \ libnvidia-opencl.so.%{version} \ + libnvidia-ptxjitcompiler.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia done -install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau +install -p %{srcdir}/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau 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 @@ -291,24 +350,43 @@ 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} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf -%else -echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf -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 +ln -sf libGLX.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX.so +ln -sf libOpenGL.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenGL.so +ln -sf libGLESv1_CM.so.1.2.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so.1 +ln -sf libGLESv1_CM.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so +ln -sf libGLESv2.so.2.1.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so.2 +ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so +ln -sf libEGL.so.1.1.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so.1 +ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so +%endif +ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_nvidia.so.0 +ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indirect.so.0 +ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidia.so.0 +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 + +install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d +%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 -ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so +%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 + +sed 's!__NV_VK_ICD__!%{vulkan_lib}!g' nvidia_icd.json.template > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json %endif %if %{with kernel} -%install_kernel_modules -m kernel/nvidia -d misc +install -d $RPM_BUILD_ROOT +cp -a installed/* $RPM_BUILD_ROOT %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} @@ -325,19 +403,13 @@ rm -rf $RPM_BUILD_ROOT %post cat << 'EOF' NOTE: You must also install kernel module for this driver to work - kernel-video-nvidia-%{version} + kernel%{_alt_kernel}-video-nvidia-%{version} EOF -%post libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post -n kernel%{_alt_kernel}-video-nvidia -%depmod %{_kernel_ver} - -%postun -n kernel%{_alt_kernel}-video-nvidia -%depmod %{_kernel_ver} - %if %{with userspace} %files %defattr(644,root,root,755) @@ -350,8 +422,12 @@ EOF %attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so -%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf %{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf +%{_sysconfdir}/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf +%dir %{_datadir}/nvidia +%{_datadir}/nvidia/nvidia-application-profiles-%{version}-key-documentation +%{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc %files libs %defattr(644,root,root,755) @@ -360,11 +436,36 @@ EOF %{_sysconfdir}/OpenCL/vendors/nvidia.icd %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf %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/libGLX.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so.1.2.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2.1.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv2.so.2 +%attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1.1.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL.so.1 +%endif +%attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL_nvidia.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libEGL_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv2_nvidia.so.2 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2_nvidia.so.*.* +%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.*.* +%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.*.* +%else %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so +%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 @@ -376,14 +477,27 @@ EOF %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.*.* +%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-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-ptxjitcompiler.so.*.* %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 +%if %{with glvnd} +%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json +%endif +%{_datadir}/vulkan/icd.d/nvidia_icd.json %files devel %defattr(644,root,root,755) @@ -392,7 +506,18 @@ EOF %{_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 %files doc @@ -416,10 +541,3 @@ EOF %{_desktopdir}/nvidia-settings.desktop %{_pixmapsdir}/nvidia-settings.png %endif -%endif - -%if %{with kernel} -%files -n kernel%{_alt_kernel}-video-nvidia -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/*.ko* -%endif