commit: d5aad6148db7c533510b7d4ac6f57db176442302
Author: Fco Javier Felix <ffelix <AT> inode64 <DOT> com>
AuthorDate: Fri Feb 11 16:01:32 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 16:12:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5aad614
dev-libs/rocm-opencl-runtime: bump to 4.5.2
Package-Manager: Portage-3.0.28-r1, Repoman-3.0.3-r1
Signed-off-by: Fco. Javier Felix <ffelix <AT> inode64.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/rocm-opencl-runtime/Manifest | 2 +
.../rocm-opencl-runtime-4.5.2-remove-clinfo.patch | 11 +++
.../rocm-opencl-runtime-4.5.2.ebuild | 90 ++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/dev-libs/rocm-opencl-runtime/Manifest
b/dev-libs/rocm-opencl-runtime/Manifest
index 8ccfc59066a7..784d981d606a 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,3 +1,4 @@
+DIST rocclr.tar.gz 846950 BLAKE2B
beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22
SHA512
121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B
3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b
SHA512
121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B
966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a
SHA512
bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B
f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe
SHA512
e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@@ -5,3 +6,4 @@ DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B
a41ca63bdac1930599fd808d0a
DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B
5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e
SHA512
228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B
09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605
SHA512
49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B
29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07
SHA512
a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
+DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B
f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626
SHA512
6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
diff --git
a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
new file mode 100644
index 000000000000..e466c14b2a08
--- /dev/null
+++
b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
@@ -0,0 +1,11 @@
+diff -ruN ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt
ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt
+--- ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt 2021-09-27
18:33:06.000000000 +0200
++++ ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt 2021-12-15
19:04:23.315989714 +0100
+@@ -14,7 +14,6 @@
+ set(OPENCL_ICD_LOADER_HEADERS_DIR
"${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+ add_subdirectory(khronos/icd)
+ add_subdirectory(amdocl)
+-add_subdirectory(tools/clinfo)
+ add_subdirectory(tools/cltrace)
+ if(BUILD_TESTS)
+ add_subdirectory(tests/ocltst)
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
new file mode 100644
index 000000000000..318b9184f5c4
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime";
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz
-> rocclr.tar.gz
+
https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz
-> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+ >=dev-libs/rocm-comgr-${PV}
+ >=dev-libs/rocm-device-libs-${PV}
+ >=virtual/opencl-3
+ media-libs/mesa"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-${PV}
+ media-libs/glew
+ "
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch"
+ "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+)
+
+S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+S1="${WORKDIR}/ROCclr-rocm-${PV}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+ # Remove "clinfo" - use "dev-util/clinfo" instead
+ [ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+ cmake_src_prepare
+
+ hprefixify amdocl/CMakeLists.txt
+
+ local S="${S1}"
+ local CMAKE_USE_DIR="${S1}"
+ # Bug #753377
+ local PATCHES=()
+ BUILD_DIR="${S1}_build" cmake_src_prepare
+}
+
+src_configure() {
+ # configure ROCclr
+ CMAKE_USE_DIR="${S1}"
+ local mycmakeargs=(
+ -Wno-dev
+ -DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+ )
+ BUILD_DIR="${S1}_build" cmake_src_configure
+
+ # Reported upstream:
https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+ append-cflags -fcommon
+
+ CMAKE_USE_DIR="${S}"
+ local mycmakeargs=(
+ -Wno-dev
+ -DROCCLR_PATH="${S1}"
+ -DAMD_OPENCL_PATH="${S}"
+ -DROCM_PATH="${EPREFIX}/usr"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ local S="${S1}"
+ BUILD_DIR="${S1}_build" cmake_src_compile
+
+ local S="${S}"
+ cmake_src_compile
+}
+
+src_install() {
+ insinto /etc/OpenCL/vendors
+ doins config/amdocl64.icd
+
+ cd "${BUILD_DIR}" || die
+ insinto /usr/lib64
+ doins amdocl/libamdocl64.so
+ doins tools/cltrace/libcltrace.so
+}
