From 85dcd2945de81f9db0a7a90a25da68e674d15370 Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Wed, 23 Nov 2016 14:05:42 +0100 Subject: [PATCH] 20161027 snapshot for vulkan-sdk 1.0.32.0 SPIR-V headers moved to a separate package Version numbering updated to match README.md --- cmake-lib64.patch | 27 +++++++++++++++++++-------- spirv-tools.spec | 26 +++++++++++--------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/cmake-lib64.patch b/cmake-lib64.patch index b2a31ac..25692aa 100644 --- a/cmake-lib64.patch +++ b/cmake-lib64.patch @@ -1,7 +1,7 @@ -diff -dur SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b.orig/source/CMakeLists.txt SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b/source/CMakeLists.txt ---- SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b.orig/source/CMakeLists.txt 2016-03-29 20:51:02.000000000 +0200 -+++ SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b/source/CMakeLists.txt 2016-04-08 09:48:47.000000000 +0200 -@@ -73,5 +73,5 @@ +diff -dur -x '*~' -x '*.orig' SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/source/CMakeLists.txt SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/source/CMakeLists.txt +--- SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/source/CMakeLists.txt 2016-10-27 22:09:06.000000000 +0200 ++++ SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/source/CMakeLists.txt 2016-11-23 14:01:19.000000000 +0100 +@@ -191,5 +191,5 @@ install(TARGETS ${SPIRV_TOOLS} RUNTIME DESTINATION bin @@ -9,11 +9,22 @@ diff -dur SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b.orig/source/CMake - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -diff -dur SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b.orig/tools/CMakeLists.txt SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b/tools/CMakeLists.txt ---- SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b.orig/tools/CMakeLists.txt 2016-03-29 20:51:02.000000000 +0200 -+++ SPIRV-Tools-6836e17f243eebfc4a2950faee49ed3a0015b20b/tools/CMakeLists.txt 2016-04-08 09:49:34.000000000 +0200 -@@ -47,6 +47,6 @@ +diff -dur -x '*~' -x '*.orig' SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/source/opt/CMakeLists.txt SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/source/opt/CMakeLists.txt +--- SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/source/opt/CMakeLists.txt 2016-10-27 22:09:06.000000000 +0200 ++++ SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/source/opt/CMakeLists.txt 2016-11-23 14:02:37.000000000 +0100 +@@ -64,5 +64,5 @@ + install(TARGETS SPIRV-Tools-opt + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") +diff -dur -x '*~' -x '*.orig' SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/tools/CMakeLists.txt SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/tools/CMakeLists.txt +--- SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2.orig/tools/CMakeLists.txt 2016-10-27 22:09:06.000000000 +0200 ++++ SPIRV-Tools-b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2/tools/CMakeLists.txt 2016-11-23 14:01:19.000000000 +0100 +@@ -49,6 +49,6 @@ + set(SPIRV_INSTALL_TARGETS spirv-as spirv-dis spirv-val spirv-opt spirv-cfg) install(TARGETS ${SPIRV_INSTALL_TARGETS} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib diff --git a/spirv-tools.spec b/spirv-tools.spec index 3729397..b802468 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,22 +1,20 @@ -%define snap 20160614 -%define commit 37e4600c3efad7b1cfdc1df70a977be82eb3c811 -%define headers_commit 34d319db9d6cefe93191b921f5f1593378a98c4c +%define snap 20161027 +%define commit b371439d6fbc6b7b7cd5b4ef7046faa6cdf0e9e2 %define _ver %(echo %{version} | tr _ -) Summary: SPIR-V Tools Name: spirv-tools -Version: 1.0_rev3.s%{snap} +Version: v2016.6.s%{snap} Release: 1 License: MIT-like Group: Applications Source0: https://github.com/KhronosGroup/SPIRV-Tools/archive/%{commit}/%{name}-s%{snap}.tar.gz -# Source0-md5: 323d546700f9d1e72a34f77fec4bacfb -Source1: https://github.com/KhronosGroup/SPIRV-Headers/archive/%{headers_commit}/spirv-headers-%{headers_commit}.tar.gz -# Source1-md5: 94c7722f2be6182e9cf9bc29c6034f02 +# Source0-md5: 7312ed45ce0e279aa5829c867ce227e1 Patch0: cmake-lib64.patch Patch1: no-git-describe.patch URL: https://github.com/KhronosGroup/SPIRV-Tools BuildRequires: cmake +BuildRequires: spirv-headers Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -47,6 +45,7 @@ modules. Summary: Header files for %{name} library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name} Group: Development/Libraries +Requires: spirv-headers Requires: %{name}-libs = %{version}-%{release} %description devel @@ -56,15 +55,15 @@ Header files for %{name} library. Pliki nagłówkowe biblioteki %{name}. %prep -%setup -q -n SPIRV-Tools-%{commit} -a1 - -mv SPIRV-Headers-* external/spirv-headers +%setup -q -n SPIRV-Tools-%{commit} %patch0 -p1 %patch1 -p1 %build -install -d build +install -d build external/spirv-headers/include +ln -s /usr/include/spirv external/spirv-headers/include/spirv + cd build %cmake \ ../ @@ -76,15 +75,12 @@ echo '"spirv-tools %{commit}\\n"' > build-version.inc %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_includedir}/spirv cd build %{__make} install \ DESTDIR=$RPM_BUILD_ROOT cd .. -cp -a external/spirv-headers/include/spirv/* $RPM_BUILD_ROOT%{_includedir}/spirv - %clean rm -rf $RPM_BUILD_ROOT @@ -99,8 +95,8 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libSPIRV-Tools.so +%attr(755,root,root) %{_libdir}/libSPIRV-Tools-opt.so %files devel %defattr(644,root,root,755) -%{_includedir}/spirv %{_includedir}/spirv-tools -- 2.44.0