[packages/spirv-tools] Up to latest snapshot, as used by Vulkan SDK 1.0.5

jajcus jajcus at pld-linux.org
Sat Mar 12 19:19:00 CET 2016


commit d0e0a7d3072f023c7dcb86dfdc195a2b0794951e
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sat Mar 12 19:16:26 2016 +0100

    Up to latest snapshot, as used by Vulkan SDK 1.0.5
    
    also: use proper commit hash for built-in version string
    instead of getting it from PLD repository

 no-git-describe.patch |  9 +++++++++
 spirv-tools.spec      | 11 ++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 43d65ee..9baac19 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -1,6 +1,6 @@
 
-%define	snap	20160222
-%define commit	9413fbbf587b23541c4339943325a474641cd605
+%define	snap	20150312
+%define commit	476989e7b715529aa8063016dc44e31bbf3e08bc
 %define	_ver	%(echo %{version} | tr _ -)
 Summary:	SPIR-V Tools
 Name:		spirv-tools
@@ -9,8 +9,9 @@ Release:	1
 License:	MIT-like
 Group:		Applications
 Source0:	https://github.com/KhronosGroup/SPIRV-Tools/archive/%{commit}/%{name}-s%{snap}.tar.gz
-# Source0-md5:	d11ec2de7a44a68535b0dbd62f0cc5b6
+# Source0-md5:	c86bbabd5b1efea51c49a46099499f7d
 Patch0:		cmake-lib64.patch
+Patch1:		no-git-describe.patch
 URL:		https://github.com/KhronosGroup/SPIRV-Tools
 BuildRequires:	cmake
 Requires:	%{name}-libs = %{version}-%{release}
@@ -54,6 +55,7 @@ Pliki nagłówkowe biblioteki %{name}.
 %prep
 %setup -q -n SPIRV-Tools-%{commit}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -61,6 +63,9 @@ cd build
 %cmake \
 	../
 
+# we know better than utils/update_build_version.py
+echo '"spirv-tools %{commit}\\n"' > build-version.inc
+
 %{__make}
 
 %install
diff --git a/no-git-describe.patch b/no-git-describe.patch
new file mode 100644
index 0000000..19b5f70
--- /dev/null
+++ b/no-git-describe.patch
@@ -0,0 +1,9 @@
+diff -dur SPIRV-Tools-476989e7b715529aa8063016dc44e31bbf3e08bc.orig/utils/update_build_version.py SPIRV-Tools-476989e7b715529aa8063016dc44e31bbf3e08bc/utils/update_build_version.py
+--- SPIRV-Tools-476989e7b715529aa8063016dc44e31bbf3e08bc.orig/utils/update_build_version.py	2016-03-11 21:30:38.000000000 +0100
++++ SPIRV-Tools-476989e7b715529aa8063016dc44e31bbf3e08bc/utils/update_build_version.py	2016-03-12 19:14:32.499715318 +0100
+@@ -82,5 +82,3 @@
+         sys.exit(0)
+     open(OUTFILE, 'w').write(new_content)
+ 
+-if __name__ == '__main__':
+-    main()
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list