gentoo auto-resync : 22:02:2023 - 02:26:50

3 files changed, 117 insertions, 0 deletions

diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 0d41459849cf..8c470524c8f9 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,12 +1,15 @@
 AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a777971e4db95a7ac719944f8533d7cb045e2092c452af35c2d5fd7e696ec848ed4777e9653f77627e4ca0fe36f4beffc9a39e3c7a13bda7973af6722238857 SHA512 8aaef1aaf0a6cedcd66e55ee8df0d89d40f3827b28243cc434dbbcadb568d8c1317a0968b57ad0b2a88de4479023a00b1b3b9a65fd34105cebe56fdeb3c30f1b
 AUX intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch 6543 BLAKE2B a3d0daac6434c5b96e57496a8c94973d416f9c8e9a917316adb6245cf016a393c8cef36d324fac3be2fc4e29622270a717f3a2d013965e45142053a46b667404 SHA512 d9e853c60905a5903004538ab22edc8b7275d00313ef5bf6f2975b82da19987c7e739d030bb3203e10bef82f1169723dd4e2d8e09d2034eede95d8affee2b900
+AUX intel-graphics-compiler-1.0.13230.7-spirv-tools.patch 1124 BLAKE2B 41dde36f81227f4d8306ad069492969350de001af6aef17002accbd41a1d7da4a976ee9edff74162b1daeeb5b4a55567ebc32d2de24d7430261512dfd3c99449 SHA512 84db5643791883dca792e6df77d42670055364c571531041f2d3224d4f957aa51215735cc6b996a5ac4d684864ca59c54e65039026eec3d3e06f668f2f1def7c
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.12260.1.tar.gz 8887984 BLAKE2B 626b5f2bd189ba9b2933b9d65227ca1552484f73f7398b2a763744d21a4ea189987e4eb08e9e7f09898fb49568b59a2c45298363495c1759fec9927a95cf4478 SHA512 4223e9c8213c7e6cf3539d955394a0a4a39cb8d2114ce18ccaeeb0b36a91ca6fc6a314fa9d9db24929fa7cd6b86ff8b82f369f35dd80e5df49b23ac9cd3a519b
 DIST intel-graphics-compiler-1.0.12504.5.tar.gz 8941924 BLAKE2B 6441cc50c2449524c800c73736f8963bc0011c6b87eefa03575cf09d00a8e812c9961bd50fb9801b77452da2d993e76196beb0a2093a249a87d7182e1c1e8707 SHA512 32a94b213a591f9ceb8ca08674c9fb8994b50818c51a6bfd412c4cd30bb9433b938eb7b49ba0afac9f2900a3dcbc7dd79e3e66fb444c7fd5723b6b50c5d1ab89
 DIST intel-graphics-compiler-1.0.12812.26.tar.gz 8796229 BLAKE2B 8880f0efa47ea90de403c32a9a66fe0f2d1cd6b71b2c57ea38d01f2836892dc36e4e859b19def015f22eb0415be2ff8999a49256830059499b0ae654482cd21f SHA512 13a9f57cf744c38145e2b3d45099a6d54b6d792780dc3a2ab352484975c899f1a5c4f6072c96e786ce3bdf4690bdcf04cecebcf56f9bef4409e3cc3f27ec8458
+DIST intel-graphics-compiler-1.0.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac
 EBUILD intel-graphics-compiler-1.0.12260.1-r1.ebuild 2502 BLAKE2B d71fff183834eb157c9f655858f8694cc8dab919330c973cd2e680e62b7a4e12f9d7034df5f4f49c24db751e74dca31abb39e1b3b9cb058d665889cf4a372ca0 SHA512 3b7a2e670fbd325c28be1f201b6b04289d53ccd9d7f430e32726909e0c2b32f6a6ed39cf7498fe5c7130930ea90f43f7003d341f1fc376818ffc74fd55073ec9
 EBUILD intel-graphics-compiler-1.0.12504.5-r2.ebuild 2545 BLAKE2B 10cf449debd7a1971ac8dfe583110dca2116e2b499033e086a9ebc70c0f31145f9311db289b6a1d361b1c78b28d52b9c4e9e2a6380ea22698c38a4c6987c7ccd SHA512 46b3fdd179183635c0d51435c87bc97f3962e6a92346dc465e413598fca52322693e8aad32d066f01651dc61b82aa0169bf87d16c094504604c22ce1e6f692c5
 EBUILD intel-graphics-compiler-1.0.12812.26-r1.ebuild 2546 BLAKE2B 11eceb3f39ff375f6f5e8d52efe3cb7bb5b058800b64e0839f3df4bb6361d9aa5163beaf828fe1deb166ffe0d948ac72b1766bf502f119f009a4df85619370fa SHA512 a0bfb1a06f71e53b57f4ecf8dc65a8530ffa80a2cc57e1922f078e3d5028be763478080cd8a073541eae4d3415dd9f3482de116bb9d56a717386b43aab305730
+EBUILD intel-graphics-compiler-1.0.13230.7.ebuild 2543 BLAKE2B 97ab198c044ba103224f22d579fe2f937723aa929b0ca87d58f78c73e3df536e1f9184153d3fc1deca42130c798ae0039e5657ec7d8cdd7e17e788da06bfe8c4 SHA512 6088e6c373738ce726590c2f6b508139484b7be3e0eb891f6229f07754c7f3b070f25390f5fbca6fba732a956b51ff874a5e6177e1712dfaffb2a2c537dddb25
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
new file mode 100644
index 000000000000..d33f9eb2021f
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
@@ -0,0 +1,26 @@
+From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001
+From: Jakub Czarnecki <jakub.czarnecki@intel.com>
+Date: Thu, 26 Jan 2023 11:35:03 +0000
+Subject: [PATCH]  Preinstalled SPIRV-Tools CMakeFile - target fix
+
+Added checking if SPIRV-Tools isn't already set as target before adding
+it as a custom target to avoid errors.
+---
+ external/SPIRV-Tools/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index 9afa5746c4d..3b768c1b772 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
++++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+  set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
+ 
+  set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
+- add_custom_target(SPIRV-Tools)
++ if(NOT TARGET SPIRV-Tools)
++  add_custom_target(SPIRV-Tools)
++ endif()
+  set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
+  set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
+ 
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
new file mode 100644
index 000000000000..4a48c5cff382
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.11.0
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+	"${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}