X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=68209f0be31db9f055baedefac8fc5c393eb285a;hb=b12d42f92ba16c7929a528e03bcd46d9efe751c9;hp=19e5b4fd6f2c72ee9fa6929ecda3672cf9075d6f;hpb=0c455ac36fec552337bfc95fdbd8e4788c247549;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 19e5b4f..68209f0 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,22 @@ 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:	370.28
+Version:	384.90
 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:	7d3e1c691cd53852f422a93169268178
+# Source0-md5:	9423e4bdef7745c7b57a75c24f853b53
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	3bcd9a132e50a17b846869f1c57b9c75
+# Source1-md5:	d33916ac2d962a7e6acc803cf6fd677c
 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:		linux-4.1-and-older.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,10 +63,11 @@ 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) <= 23.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	ocl-icd(nvidia)
 Provides:	ocl-icd-driver
+Provides:	vulkan(icd) = 1.0.46
 Provides:	xorg-driver-video
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	XFree86-driver-nvidia
@@ -110,6 +120,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 +166,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
@@ -251,6 +269,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -263,7 +282,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}/vulkan/icd.d
 
 %if %{with settings}
 install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
@@ -283,23 +303,29 @@ 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
 
 for f in \
-	libGL.so.%{version}			\
+%if %{with glvnd}
+%if %{without system_libglvnd}
+	libGL.so.1.0.0				\
 	libGLX.so.0				\
-	libGLX_nvidia.so.%{version}		\
+	libOpenGL.so.0				\
 	libGLdispatch.so.0			\
+	libGLESv1_CM.so.1			\
+	libGLESv2.so.2				\
+%endif
+	libGLX_nvidia.so.%{version}		\
 	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				\
+	libnvidia-egl-wayland.so.1.0.1		\
+	libnvidia-eglcore.so.%{version}		\
+%else
+	libGL.so.%{version}			\
+%endif
 	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}	\
@@ -339,15 +365,29 @@ 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.0.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 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so
 ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.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.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so
+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
+%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
 %endif
 
 %if %{with kernel}
@@ -390,6 +430,7 @@ EOF
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf
 %{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
 
 %files libs
 %defattr(644,root,root,755)
@@ -398,23 +439,32 @@ 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.0.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
+%endif
 %attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1
 %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
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.*
+%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
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so
@@ -424,8 +474,6 @@ EOF
 %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-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.*.*
@@ -435,6 +483,7 @@ EOF
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.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.*.*
@@ -451,11 +500,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/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
+%endif
+%attr(755,root,root) %{_libdir}/nvidia/libEGL.so
+%else
+%attr(755,root,root) %{_libdir}/nvidia/libGL.so
+%endif
 %{_pkgconfigdir}/gl.pc
 
 %files doc