up to 20180210 snap

diff --git a/cmake-lib64.patch b/cmake-lib64.patch
deleted file mode 100644 (file)
index 25692aa..0000000
--- a/cmake-lib64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
--  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/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
--    ARCHIVE DESTINATION lib)
-+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- endif()

diff --git a/spirv-tools.spec b/spirv-tools.spec
index d93baeb218a8d887afebb2dff525329ecce1979d..85a549cb5f91bdeb4fa7cdebbd0b7ae63e8aa34d 100644 (file)
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -1,22 +1,21 @@
 
-%define        snap    20161219
-%define commit 37422e9dba1a3a8cb8028b779dd546d43add6ef8
+%define        snap    20180210
+%define commit 1d7b1423f939027da9a9524765a36fa71be265cd
 Summary:       Khronos SPIR-V Tools
 Summary(pl.UTF-8):     Narzędzia SPIR-V z projektu Khronos
 Name:          spirv-tools
-Version:       v2016.7
+Version:       v2018.1
 Release:       0.s%{snap}.1
 License:       Apache v2.0
 Group:         Development/Tools
 Source0:       https://github.com/KhronosGroup/SPIRV-Tools/archive/%{commit}/%{name}-s%{snap}.tar.gz
-# Source0-md5: 145629e57b35f2f398945ff4e3c7d5b0
-Patch0:                cmake-lib64.patch
-Patch1:                no-git-describe.patch
+# Source0-md5: 8547896f95ccf36e6c48183d0e2f6c87
+Patch0:                no-git-describe.patch
 URL:           https://github.com/KhronosGroup/SPIRV-Tools
 BuildRequires: cmake >= 2.8.12
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: python
-BuildRequires: spirv-headers
+BuildRequires: spirv-headers >= 1.2
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,7 +76,6 @@ Pliki nagłówkowe biblioteki SPIR-V Tools.
 %setup -q -n SPIRV-Tools-%{commit}
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build external/spirv-headers/include
@@ -111,8 +109,12 @@ 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-link.so
 %attr(755,root,root) %{_libdir}/libSPIRV-Tools-opt.so
+%attr(755,root,root) %{_libdir}/libSPIRV-Tools-shared.so
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/spirv-tools
+%{_pkgconfigdir}/SPIRV-Tools.pc
+%{_pkgconfigdir}/SPIRV-Tools-shared.pc