[packages/xorg-driver-video-nvidia] select proper vulkan lib based on glvnd bcond

atler atler at pld-linux.org
Sat Jul 1 00:59:47 CEST 2017


commit 8d2b2a197d3ca5eec79973c0dcfd4f22a8266e96
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Jul 1 00:24:52 2017 +0200

    select proper vulkan lib based on glvnd bcond

 xorg-driver-video-nvidia.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 83f92e8..4410826 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -19,6 +19,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
@@ -364,7 +370,7 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so
 ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so
 ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so
 
-install nvidia_icd.json $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d
+sed 's!"library_path":[[:blank:]]*"[^"]\+"!"library_path": "%{vulkan_lib}"!g' nvidia_icd.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json
 %endif
 
 %if %{with kernel}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/8d2b2a197d3ca5eec79973c0dcfd4f22a8266e96



More information about the pld-cvs-commit mailing list