[packages/vulkan-sdk] include %{name} in ICD manifest filename

jajcus jajcus at pld-linux.org
Thu Feb 25 17:11:39 CET 2016


commit bbd66d6bcd2ef86023231ffedc1a1ad4a2320d3b
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Thu Feb 25 17:10:44 2016 +0100

    include %{name} in ICD manifest filename
    
    to prevent conflict with intel driver from Mesa (both can be installed
    at the same time).

 vulkan-sdk.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index 5e0bb34..8ad2a00 100644
--- a/vulkan-sdk.spec
+++ b/vulkan-sdk.spec
@@ -280,7 +280,7 @@ sed -e's@"library_path": "./@"library_path": "%{_libdir}/vulkan/layer/@' \
 %if %{with icd}
 cp -p icd/*/libVK_*.so $RPM_BUILD_ROOT%{_libdir}
 for f in icd/*/*.json ; do
-sed -e's@"library_path": "./@"library_path": "@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/$(basename $f)
+sed -e's@"library_path": "./@"library_path": "@' $f > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/%{name}-$(basename $f)
 done
 %endif
 cd ../..
@@ -393,11 +393,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc VulkanTools/LICENSE.txt
 %attr(755,root,root) %{_libdir}/libVK_i965.so
-%{_datadir}/vulkan/icd.d/intel_icd.json
+%{_datadir}/vulkan/icd.d/%{name}-intel_icd.json
 
 %files icd-nulldrv
 %defattr(644,root,root,755)
 %doc VulkanTools/LICENSE.txt
 %attr(755,root,root) %{_libdir}/libVK_nulldrv.so
-%{_datadir}/vulkan/icd.d/nulldrv_icd.json
+%{_datadir}/vulkan/icd.d/%{name}-nulldrv_icd.json
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/bbd66d6bcd2ef86023231ffedc1a1ad4a2320d3b



More information about the pld-cvs-commit mailing list