Package: spirv-headers Version: 1.3-1 Severity: normal Tags: patch Attached is a patch which implements the following improvements to spirv-headers:
1) Add a "/usr/include/SPIRV" symlink which points at the most current version of the headers. This is required for other repositories (i.e. Vulkan-ValidationLayers and Vulkan[-]Tools) to build using this package as a buildep. 2) Added a third level of upstream versioning to represent the number of git commits since the latest API version was first created (this would make the current upstream version string "1.3.32" from a ToT upstream build). Also added a script to generate this version string from git.
diff --git a/debian/changelog b/debian/changelog index 9cb2329..6650a2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spirv-headers (1.3.32-1) UNRELEASED; urgency=medium + + * Add SPIRV symlink so upstream packages will build. + * Add semantic version (# of git commits since 1.3) to version string + + -- Brett Johnson <br...@linuxturtle.net> Wed, 25 Jul 2018 10:28:30 -0600 + spirv-headers (1.3-1) unstable; urgency=medium * New upstream version. diff --git a/debian/control b/debian/control index c5fa5a0..6218b7b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: spirv-headers Section: libdevel Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Build-Depends: debhelper (>=10), +Build-Depends: debhelper (>=9), Standards-Version: 4.1.3 Homepage: https://github.com/KhronosGroup/SPIRV-Headers Vcs-Git: https://salsa.debian.org/git/xorg-team/vulkan/spirv-headers.git diff --git a/debian/git-version.sh b/debian/git-version.sh new file mode 100755 index 0000000..c474e9a --- /dev/null +++ b/debian/git-version.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# Script to output a version string with the number of commits since the common +# ancestor appended to the manually hardcoded API version +API_VERSION="1.3" + +# There are no tags, so manually hardcode commit ID where API_VERSION was created. +COMMON_ANCESTOR="02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea" + +NB_OF_COMMITS=`git log --oneline $COMMON_ANCESTOR..upstream-unstable | wc -l` +echo "$API_VERSION.$NB_OF_COMMITS" diff --git a/debian/spirv-headers.links b/debian/spirv-headers.links new file mode 100644 index 0000000..181d4c9 --- /dev/null +++ b/debian/spirv-headers.links @@ -0,0 +1 @@ +usr/include/spirv/unified1 usr/include/SPIRV
