[packages/spirv-tools] Up to 20160329 snapshot

jajcus jajcus at pld-linux.org
Fri Apr 8 09:54:59 CEST 2016


commit 8036bc88727a8bdfb645d4f7a782198611b38027
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Apr 8 09:54:37 2016 +0200

    Up to 20160329 snapshot
    
    For vulkan-sdk 1.0.8

 cmake-lib64.patch | 23 ++++++++++++++++-------
 spirv-tools.spec  |  7 ++++---
 2 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 5d53c87..aef06b4 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -1,6 +1,6 @@
 
-%define	snap	20160312
-%define commit	476989e7b715529aa8063016dc44e31bbf3e08bc
+%define	snap	20160329
+%define commit	6836e17f243eebfc4a2950faee49ed3a0015b20b
 %define	_ver	%(echo %{version} | tr _ -)
 Summary:	SPIR-V Tools
 Name:		spirv-tools
@@ -9,7 +9,7 @@ Release:	1
 License:	MIT-like
 Group:		Applications
 Source0:	https://github.com/KhronosGroup/SPIRV-Tools/archive/%{commit}/%{name}-s%{snap}.tar.gz
-# Source0-md5:	c86bbabd5b1efea51c49a46099499f7d
+# Source0-md5:	3137f99a7137cfbb2aa0973d6ac5d0ff
 Patch0:		cmake-lib64.patch
 Patch1:		no-git-describe.patch
 URL:		https://github.com/KhronosGroup/SPIRV-Tools
@@ -54,6 +54,7 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %prep
 %setup -q -n SPIRV-Tools-%{commit}
+
 %patch0 -p1
 %patch1 -p1
 
diff --git a/cmake-lib64.patch b/cmake-lib64.patch
index 7b489f9..b2a31ac 100644
--- a/cmake-lib64.patch
+++ b/cmake-lib64.patch
@@ -1,14 +1,23 @@
-diff -dur SPIRV-Tools-spirv-1.0-rev3.orig/CMakeLists.txt SPIRV-Tools-spirv-1.0-rev3/CMakeLists.txt
---- SPIRV-Tools-spirv-1.0-rev3.orig/CMakeLists.txt	2016-02-17 22:01:39.000000000 +0100
-+++ SPIRV-Tools-spirv-1.0-rev3/CMakeLists.txt	2016-02-19 20:48:37.671140267 +0100
-@@ -276,8 +276,8 @@
+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 @@
  
- install(TARGETS ${SPIRV_INSTALL_TARGETS}
+ 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 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 @@
  
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv-tools/libspirv.h
-   DESTINATION include/spirv-tools/)
+   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()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/spirv-tools.git/commitdiff/8036bc88727a8bdfb645d4f7a782198611b38027



More information about the pld-cvs-commit mailing list