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=49f9156d14713c047fe53a28080f97ffb071880c;hp=d667ae51daacdb987cc76d57897ace054ce70735;hb=5bf93a3456090d2ef65cb96a9aac5acfa7a20cbc;hpb=abfa14b50e8aaf2a22a6056e064dac7d2e498a4f

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d667ae5..49f9156 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,8 +4,7 @@
 # - 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_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)
@@ -20,115 +19,168 @@
 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
+%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:	396.24
+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:	7b5c4735a5b7ad3a9d166ca85cc88e17
+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-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:2.6.32}}
 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) <= 24.1
+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.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:	%{x8664}
+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
 
 %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}
+%if %{with system_libglvnd}
 Requires:	libglvnd
 Requires:	libglvnd-libGL
 Requires:	libglvnd-libGLES
 %endif
 Requires:	libvdpau >= 0.3
-Provides:	OpenGL = 3.3
+Provides:	OpenGL = 4.6
 Provides:	OpenGL-GLX = 1.4
 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 +194,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 +212,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 +231,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.
@@ -206,7 +259,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.\
@@ -236,13 +289,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 ..\
@@ -250,7 +296,9 @@ cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\
 %{nil}
 
+%ifarch %{x8664}
 %{?with_kernel:%{expand:%create_kernel_packages}}
+%endif
 
 %prep
 cd %{_builddir}
@@ -258,22 +306,24 @@ 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
+%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%{_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
@@ -294,67 +344,81 @@ install -p nvidia-drm-outputclass.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nv
 
 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 \
-%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				\
+	%{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
-	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}			\
+	%{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.5		\
+	%{srcdir}/libnvidia-eglcore.so.%{version}		\
+%endif
+	%{srcdir}/libcuda.so.%{version}			\
+	%{srcdir}/libnvcuvid.so.%{version}		\
+%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
-	libcuda.so.%{version}			\
-	libnvcuvid.so.%{version}		\
-	libnvidia-cfg.so.%{version}		\
-	libnvidia-compiler.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}		\
+	%{srcdir}/libnvidia-allocator.so.%{version}	\
+	%{srcdir}/libnvidia-compiler.so.%{version}	\
+	%{srcdir}/libnvidia-encode.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-opticalflow.so.%{version}		\
+	%{srcdir}/libnvidia-ptxjitcompiler.so.%{version}	\
+	%{srcdir}/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}
 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
@@ -373,27 +437,28 @@ 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
 
+%ifarch %{x8664}
 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
 %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
+%ifarch %{x8664}
+install -p nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d
+%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
 
@@ -411,15 +476,13 @@ EOF
 %postun	libs -p /sbin/ldconfig
 
 %if %{with userspace}
+%ifarch %{x8664}
 %files
 %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
@@ -428,18 +491,21 @@ EOF
 %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
-%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
@@ -459,12 +525,10 @@ 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.*.*
-%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
@@ -472,12 +536,21 @@ EOF
 %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-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.*.*
@@ -485,45 +558,38 @@ 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
-%if %{with glvnd}
+%ifarch %{x8664}
 %{_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)
 %doc html/*
 
+%ifarch %{x8664}
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
@@ -535,10 +601,11 @@ 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
 %{_pixmapsdir}/nvidia-settings.png
 %endif
 %endif
+%endif