From df0dd63d433b2d3325679014524b205434f698d7 Mon Sep 17 00:00:00 2001 From: Nick Sarnie Date: Fri, 23 Mar 2018 21:55:47 -0400 Subject: [PATCH] dev-util/spirv-tools: Revbump and add a header that includes git SHA1 for vulkan-loader Closes: https://github.com/gentoo/gentoo/pull/7599 --- .../spirv-tools/spirv-tools-2018.2-r1.ebuild | 36 +++++++++++++++++++ dev-util/spirv-tools/spirv-tools-9999.ebuild | 9 +++++ 2 files changed, 45 insertions(+) create mode 100644 dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild diff --git a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild new file mode 100644 index 000000000000..79312b8aeabe --- /dev/null +++ b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-multilib cmake-utils + +DESCRIPTION="Provides an API and commands for processing SPIR-V modules" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" +SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="" +DEPEND="dev-util/spirv-headers" + +S="${WORKDIR}/SPIRV-Tools-${PV}" + +UPSTREAM_COMMIT="8d8a71278bf9e83dd0fb30d5474386d30870b74d" + +multilib_src_configure() { + local mycmakeargs=( + "-DSPIRV-Headers_SOURCE_DIR=/usr/" + ) + + cmake-utils_src_configure +} + +multilib_src_install() { + default + echo "${UPSTREAM_COMMIT}" > "${PN}-commit.h" || die + insinto /usr/include/"${PN}" + doins "${PN}-commit.h" || die +} diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index e6ecb91d83e6..e0e2f53d0e21 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -23,3 +23,12 @@ multilib_src_configure() { cmake-utils_src_configure } + +multilib_src_install() { + default + + # create a header file with the commit hash of the current revision + # vulkan-tools needs this to build + local revision="$(git-r3_peek_remote_ref)" &> /dev/null + echo "${revision}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die +} -- 2.26.2