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=acf452fd0806d3c451f03ea8b8c59f46b427b24e;hp=f2faeea3b9b52239161ba7fdced1b70da0c7a45e;hb=bedc4e7f0fcf038fc144afab17340acba7b8ba50;hpb=5b65e118629419f2b1f6cabf506ea7ac349c5867

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index f2faeea..acf452f 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,6 +4,8 @@
 # - 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	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)
@@ -18,6 +20,12 @@
 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
@@ -32,21 +40,18 @@ 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.27
+Version:	410.66
 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:	f32b9ab673acce56990f2b5acdc1e77f
-Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	cdf8a16c533382acc9f088bd8e689860
+Source0:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
+# Source0-md5:	91969d7ae791a17d37689f81a02c4b56
 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
+Patch0:		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}}
@@ -54,16 +59,17 @@ 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) <= 24.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	ocl-icd(nvidia)
 Provides:	ocl-icd-driver
+Provides:	vulkan(icd) = 1.1.82
 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:	%{?with_userspace:%{ix86}} %{x8664}
 BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 %define		_noautoreqdep	libGL.so.1 libnvcuvid.so
@@ -110,6 +116,11 @@ 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 = 3.3
 Provides:	OpenGL-GLX = 1.4
@@ -151,6 +162,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
@@ -174,6 +188,7 @@ 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,42 +244,39 @@ 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}\
 %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\
-%endif\
 %{nil}
 
 %{?with_kernel:%{expand:%create_kernel_packages}}
+%endif
 
 %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
+%ifarch %{x8664}
 %{?with_kernel:%{expand:%build_kernel_packages}}
+%endif
 
 %install
 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} \
+	$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%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \
+	$RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d}
 
+%ifarch %{x8664}
 %if %{with settings}
 install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 cp -p nvidia-settings.1* $RPM_BUILD_ROOT%{_mandir}/man1
@@ -281,53 +293,75 @@ 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
+%endif
+
+%ifarch %{ix86}
+%define	srcdir	32
+%else
+%define	srcdir	.
+%endif
 
 for f in \
-	libGL.so.%{version}			\
-	libGLX.so.0				\
-	libGLX_nvidia.so.%{version}		\
-	libGLdispatch.so.0			\
-	libEGL.so.1				\
-	libEGL_nvidia.so.%{version}		\
-	libGLESv1_CM.so.1			\
-	libGLESv1_CM_nvidia.so.%{version}	\
-	libGLESv2.so.2				\
-	libGLESv2_nvidia.so.%{version}		\
-	libOpenGL.so.0				\
-	libcuda.so.%{version}			\
-	libnvcuvid.so.%{version}		\
-	libnvidia-cfg.so.%{version}		\
-	libnvidia-compiler.so.%{version}	\
-	libnvidia-egl-wayland.so.%{version}	\
-	libnvidia-eglcore.so.%{version}		\
-	libnvidia-encode.so.%{version}		\
-	libnvidia-fatbinaryloader.so.%{version}	\
-	libnvidia-fbc.so.%{version}	\
-	libnvidia-glcore.so.%{version}		\
-	libnvidia-glsi.so.%{version}		\
-	libnvidia-ifr.so.%{version}		\
-	libnvidia-ml.so.%{version}		\
-	libnvidia-opencl.so.%{version}		\
-	libnvidia-ptxjitcompiler.so.%{version}	\
-	tls/libnvidia-tls.so.%{version}		\
+%if %{with glvnd}
+%if %{without system_libglvnd}
+	%{srcdir}/libGL.so.1.7.0				\
+	%{srcdir}/libGLX.so.0				\
+	%{srcdir}/libOpenGL.so.0				\
+	%{srcdir}/libGLdispatch.so.0			\
+	%{srcdir}/libGLESv1_CM.so.1.2.0			\
+	%{srcdir}/libGLESv2.so.2.1.0			\
+	%{srcdir}/libEGL.so.1.1.0				\
+%endif
+	%{srcdir}/libGLX_nvidia.so.%{version}		\
+	%{srcdir}/libEGL_nvidia.so.%{version}		\
+	%{srcdir}/libGLESv1_CM_nvidia.so.%{version}	\
+	%{srcdir}/libGLESv2_nvidia.so.%{version}		\
+%ifarch %{x8664}
+	%{srcdir}/libnvidia-egl-wayland.so.1.1.0		\
+	%{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-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-ml.so.%{version}		\
+	%{srcdir}/libnvidia-opencl.so.%{version}		\
+	%{srcdir}/libnvidia-ptxjitcompiler.so.%{version}	\
+	%{srcdir}/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
+%ifarch %{x8664}
+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}
@@ -339,27 +373,51 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 %endif
 
 # OpenGL ABI for Linux compatibility
-ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
+%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 libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indirect.so.0
-ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.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
+
+%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
+%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
 %endif
+%endif
 
 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
 
@@ -377,6 +435,7 @@ EOF
 %postun	libs -p /sbin/ldconfig
 
 %if %{with userspace}
+%ifarch %{x8664}
 %files
 %defattr(644,root,root,755)
 %doc LICENSE NVIDIA_Changelog README.txt
@@ -384,48 +443,70 @@ EOF
 %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
-%{_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
+%endif
 
 %files libs
 %defattr(644,root,root,755)
+%ifarch %{x8664}
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%endif}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
 %dir %{_libdir}/nvidia
-%attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1
+%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) %{_libdir}/nvidia/libGL.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so.1
 %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) %{_libdir}/nvidia/libGLESv2.so.2
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv2_nvidia.so.2
 %attr(755,root,root) %{_libdir}/nvidia/libGLESv2_nvidia.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libGLX.so.0
 %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/libGLdispatch.so.0
-%attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so.0
+%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-egl-wayland.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.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.*.*
@@ -433,8 +514,10 @@ EOF
 %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.*.*
@@ -443,25 +526,34 @@ EOF
 %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}
+%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
+%endif
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
+%endif
 
 %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/libEGL.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
 %defattr(644,root,root,755)
 %doc html/*
 
+%ifarch %{x8664}
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
@@ -480,3 +572,4 @@ EOF
 %{_pixmapsdir}/nvidia-settings.png
 %endif
 %endif
+%endif