commit: 168e6f806428925708cfc5af4c2508409848b80d Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Apr 6 15:46:17 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Apr 6 15:53:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168e6f80
Revert "dev-util/intel-graphics-compiler-legacy: split into legacy" This reverts commit 4b447e6c5ec3357238646ec9caffe1fa700ff044. As per pms, pkg-slotmove cannot be done per version based. Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/intel-graphics-compiler-legacy/Manifest | 1 - ...hics-compiler-legacy-1.0.8365-disable-git.patch | 37 ---------------------- ...-graphics-compiler-legacy-1.0.9-no_Werror.patch | 10 ------ .../intel-graphics-compiler-legacy/metadata.xml | 28 ---------------- dev-util/intel-graphics-compiler/Manifest | 1 + ...s-compiler-1.0.8173-opencl-clang_version.patch} | 0 .../intel-graphics-compiler-1.0.17791.18.ebuild} | 11 +++---- dev-util/intel-graphics-compiler/metadata.xml | 6 ---- 8 files changed, 5 insertions(+), 89 deletions(-) diff --git a/dev-util/intel-graphics-compiler-legacy/Manifest b/dev-util/intel-graphics-compiler-legacy/Manifest deleted file mode 100644 index f54872639d35..000000000000 --- a/dev-util/intel-graphics-compiler-legacy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST intel-graphics-compiler-legacy-1.0.17791.18.tar.gz 10746999 BLAKE2B d85c7888e4be962fc90ba6e2686aeba14d7ebe32c7dececdfddb0ba3726df82e43167dfc1bd0a2c4a0f72a6de481a270a4dcb6b4d5a40d785dac6c4628a27e2d SHA512 c814f667c558eebfbe1af68614c4eff7259b2d3626e317eb936e185b33b4aba7b225f33276ab09e9582164e5573b6cc52c230ab82e4689db41b3b2f4368367ec diff --git a/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.8365-disable-git.patch b/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.8365-disable-git.patch deleted file mode 100644 index 4a9a8988c5b4..000000000000 --- a/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.8365-disable-git.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d0f801a178755504c2f8956841823b2aa6a124c4 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <[email protected]> -Date: Sat, 28 Aug 2021 00:57:59 +0200 -Subject: [PATCH] IGC: CMakeLists: drop git - -Dropping git, as we don't have any git release. - -Signed-off-by: Conrad Kostecki <[email protected]> ---- - visa/iga/IGALibrary/CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/visa/iga/IGALibrary/CMakeLists.txt b/visa/iga/IGALibrary/CMakeLists.txt -index 061476d94..2fd44807c 100644 ---- a/visa/iga/IGALibrary/CMakeLists.txt -+++ b/visa/iga/IGALibrary/CMakeLists.txt -@@ -14,17 +14,6 @@ set(CMAKE_CXX_STANDARD 14) - - ############################################## - # compute the version string from the git repo --execute_process( -- COMMAND git rev-parse --short HEAD -- OUTPUT_VARIABLE GIT_COMMIT -- OUTPUT_STRIP_TRAILING_WHITESPACE -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) --# --execute_process( -- COMMAND git diff-index --quiet HEAD -- -- RESULT_VARIABLE GIT_DIRTY -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -- - set(IGA_VERSION_SUFFIX "") - if(GIT_COMMIT) - set(IGA_VERSION_DIRTY_TAG "") --- -2.33.0 - diff --git a/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.9-no_Werror.patch b/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.9-no_Werror.patch deleted file mode 100644 index 433b0e9caaed..000000000000 --- a/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.9-no_Werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/IGC/CMakeLists.txt -+++ b/IGC/CMakeLists.txt -@@ -2769,7 +2769,6 @@ - -march=corei7 - -mstackrealign - -fms-extensions -- -Werror - -Wno-unused-parameter - -Wno-missing-field-initializers - -Wwrite-strings diff --git a/dev-util/intel-graphics-compiler-legacy/metadata.xml b/dev-util/intel-graphics-compiler-legacy/metadata.xml deleted file mode 100644 index 570345e03a01..000000000000 --- a/dev-util/intel-graphics-compiler-legacy/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>[email protected]</email> - <name>Jan Henke</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>[email protected]</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - <name>Conrad Kostecki</name> - </maintainer> - <longdescription> - This is the legacy version of intel-graphics-compiler, - which works for all Intel GPUs from Gen5 up to Gen11. - For newer Intel GPUs starting with Gen12, please use - <pkg>dev-util/intel-graphics-compiler</pkg> instead. - </longdescription> - <use> - <flag name="vc">Enable VectorCompiler for a better performance.</flag> - </use> - <upstream> - <remote-id type="github">intel/intel-graphics-compiler</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index 638137aa0f12..f6f2a2cb543f 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1 +1,2 @@ +DIST intel-graphics-compiler-1.0.17791.18.tar.gz 10746999 BLAKE2B d85c7888e4be962fc90ba6e2686aeba14d7ebe32c7dececdfddb0ba3726df82e43167dfc1bd0a2c4a0f72a6de481a270a4dcb6b4d5a40d785dac6c4628a27e2d SHA512 c814f667c558eebfbe1af68614c4eff7259b2d3626e317eb936e185b33b4aba7b225f33276ab09e9582164e5573b6cc52c230ab82e4689db41b3b2f4368367ec DIST intel-graphics-compiler-2.10.2.tar.gz 10962136 BLAKE2B f92dda1c9ff9c8aa636287fe72494f752900468c60c5b65c2d8547a7f2292b124e3dfdf6e9eea6bf3f64751a3b09d9e96679ef63bea7c832e43e07f6a28c889f SHA512 4cd1799e5bb06ff26045545a1640484a08dd79caf0a5d05856878aa9da65237a0b3aa64cad28d843d426ba89dc85cf8622d88886805aac36fa79dc63b59e8167 diff --git a/dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.8173-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch similarity index 100% rename from dev-util/intel-graphics-compiler-legacy/files/intel-graphics-compiler-legacy-1.0.8173-opencl-clang_version.patch rename to dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch diff --git a/dev-util/intel-graphics-compiler-legacy/intel-graphics-compiler-legacy-1.0.17791.18.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild similarity index 92% rename from dev-util/intel-graphics-compiler-legacy/intel-graphics-compiler-legacy-1.0.17791.18.ebuild rename to dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild index 4c83f4390983..6c7109555242 100644 --- a/dev-util/intel-graphics-compiler-legacy/intel-graphics-compiler-legacy-1.0.17791.18.ebuild +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17791.18.ebuild @@ -11,10 +11,10 @@ PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic llvm-r1 python-any-r1 -DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel legacy graphics hardware" +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/-legacy/}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN/-legacy/}-${MY_P}" +SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MY_P}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT" SLOT="0/1.0.1" @@ -34,10 +34,7 @@ DEPEND=" ) " -RDEPEND=" - !dev-util/intel-graphics-compiler - ${DEPEND} -" +RDEPEND="${DEPEND}" BDEPEND=" $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml index 5e408167abef..35c67387290c 100644 --- a/dev-util/intel-graphics-compiler/metadata.xml +++ b/dev-util/intel-graphics-compiler/metadata.xml @@ -13,12 +13,6 @@ <email>[email protected]</email> <name>Conrad Kostecki</name> </maintainer> - <longdescription> - This is the current version of intel-graphics-compiler, - which works for all Intel GPUs from Gen12 and newer. - For older Intel GPUs from Gen5 up to Gen11, please use - <pkg>dev-util/intel-graphics-compiler-legacy</pkg> instead. - </longdescription> <use> <flag name="vc">Enable VectorCompiler for a better performance.</flag> </use>
