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=040968387cc8e30dff592e11b07bb59b63fe652c;hb=2ea8529d8aa59a06136fff1888587dbb2c6ff24c;hpb=7c831f98fc347c95699e7007db6abf17975e878a

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 0409683..fdcfbb9 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -40,22 +40,19 @@ 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:	387.34
+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:	4e356a75541633ac3f9ac0f53bb65823
-Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	a009bbc502c30e4b483d71be9fa51790
+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
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
-Patch2:		structrand.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}}
@@ -63,17 +60,17 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 23.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.0.56
+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
@@ -250,26 +247,18 @@ cd kernel\
 %{__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}}
 
 %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
-%patch2 -p0
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -309,19 +298,19 @@ install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/
 for f in \
 %if %{with glvnd}
 %if %{without system_libglvnd}
-	libGL.so.1.0.0				\
+	libGL.so.1.7.0				\
 	libGLX.so.0				\
 	libOpenGL.so.0				\
 	libGLdispatch.so.0			\
-	libGLESv1_CM.so.1			\
-	libGLESv2.so.2				\
-	libEGL.so.1				\
+	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.2		\
+	libnvidia-egl-wayland.so.1.0.3		\
 	libnvidia-eglcore.so.%{version}		\
 %else
 	libGL.so.%{version}			\
@@ -335,6 +324,7 @@ for f in \
 	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}		\
@@ -344,7 +334,7 @@ for f in \
 	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
@@ -360,23 +350,21 @@ 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.0.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
+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
@@ -384,6 +372,8 @@ ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indir
 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
@@ -392,7 +382,6 @@ 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
-install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d
 %endif
 
 %if %{with kernel}
@@ -449,14 +438,17 @@ EOF
 %dir %{_libdir}/nvidia
 %if %{with glvnd}
 %if %{without system_libglvnd}
-%attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.0.0
+%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
-%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2
-%attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1
+%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.*.*
@@ -468,6 +460,7 @@ EOF
 %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.*.*
@@ -489,6 +482,7 @@ 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
@@ -547,4 +541,3 @@ EOF
 %{_desktopdir}/nvidia-settings.desktop
 %{_pixmapsdir}/nvidia-settings.png
 %endif
-%endif