From 9d8d087779fe22883a6969f8b953065e2aee776d Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Sun, 21 Jan 2024 14:38:12 +0100
Subject: dev-util/spirv-llvm-translator: also depend on newer spirv-headers

Closes: https://bugs.gentoo.org/922616
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 .../spirv-llvm-translator-17.0.0-r1.ebuild         | 59 ----------------------
 .../spirv-llvm-translator-17.0.0-r2.ebuild         | 59 ++++++++++++++++++++++
 2 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild
 create mode 100644 dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild

(limited to 'dev-util')

diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild
deleted file mode 100644
index 31e879a61af7..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT="17"
-MY_PN="SPIRV-LLVM-Translator"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic llvm multiprocessing
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/spirv-tools
-	sys-devel/llvm:${SLOT}=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/spirv-headers-1.3.261
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lit
-		sys-devel/clang:${SLOT}
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.0.0-intel-capability.patch" )
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
-		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild
new file mode 100644
index 000000000000..8805557f442f
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-17.0.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT="17"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic llvm multiprocessing
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/spirv-tools
+	sys-devel/llvm:${SLOT}=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/spirv-headers-1.3.275
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lit
+		sys-devel/clang:${SLOT}
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-17.0.0-intel-capability.patch" )
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${ESYSROOT}/usr/include/spirv"
+		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	lit -vv "-j${LIT_JOBS:-$(makeopts_jobs)}" "${BUILD_DIR}/test" || die
+}
-- 
cgit v1.2.3-65-gdbad