gentoo resync : 25.08.2020

6 files changed, 185 insertions, 3 deletions

diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index fc8854a2616a..eb862759787e 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -6,13 +6,18 @@ AUX rocm-opencl-runtime-3.0.0-change-install-location.patch 5316 BLAKE2B 3c87706
 AUX rocm-opencl-runtime-3.5.0-amdocl64icd.patch 469 BLAKE2B a52e51631a1ed03df156f2fe360539cdc144f11945e947014f1d3dac3ab17f56512f6e37ae99c8bcfa1d43558b977988ab9281a92e31a41ca11fda498c1be302 SHA512 d90c2cdad51b841026ff1d0d4a1466b49280b6513667b16f666a9261cd7dd7d0a72e27f99383f7bffacbf661b6d1be8f9531d2a12dfe19ad5c85d661f35205af
 AUX rocm-opencl-runtime-3.5.0-change-install-location.patch 2513 BLAKE2B e8e1e79b5bf962d490f2c72ee1e8e74cb200917e4db0744029ce227863d6733c6c16005b9116e599bc52ab79f0b130a81c9cfe1dee88db9a9af22846c616ebae SHA512 d80e7d0c74620011205a0bf5c0bad8935ee950d6774ff46fa88cddf35f259c366558a0f5d40992f7b178ad2bcecb23d6a160cd6158b102d62f345f1b099ddca4
 AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae4234422acdc1fdf0bd82a0469f63239e709c0626e3918d34e6a023b70452eed98aea1725a3638ee8f46d54d08ca885bf114ad3a7689baaa18794a6d5c983b9 SHA512 27682bb65e281744556c2a99c38ae7b3e22e3306ff10ceb98d8c3204950982b17521309dd11d36e1a07ca33b8448dae1270fa31004db9841025ff9a9e9af3d4c
+AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
+AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
+AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
 DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
 DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
 DIST rocm-opencl-runtime-3.1.0.tar.gz 969782 BLAKE2B efe3cba6122273900fec80f577c45b5a93816cfd3cadbffaa36df258ea163ecc9d47530da0aa012fd7797c431506deb96fd3642c160470e2b78af75bc9fd56f6 SHA512 1665c30349547e6404563b1b1dd4258af5ab8106a66d65d6f94e7eb3ef51b2da9bc71878330c0c7ec21842e17a97e910a36be9b06fbdeab3de84bebe3a65c9db
 DIST rocm-opencl-runtime-3.3.0.tar.gz 969871 BLAKE2B 5dae88abc5861752b45f2b7e72a4d774786d0363a6da633d2ca1386a002374243a0655e8c5bc4aaa7a7db528f3c9bd5e6e1298561d3b06ce935865b6f0106172 SHA512 10c892cebca3db031b69ef3e1521fa11e49f40b18b621983f4f0902c9f563ff178d543fd1a05f6217f817838499436adaac883f7b474b64a54ce9eeb482382e5
 DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014
+DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
 EBUILD rocm-opencl-runtime-3.0.0.ebuild 1735 BLAKE2B ea3ec1080283cf20b89858d6c2fd3332ffdb243794160422b16e61baf27d42b53c69aecc078844715629851d6f98247034996aac74f2f9ac2b66382b5a039359 SHA512 e1c6bdcdd37b6417d9acb4757f035fb682c5bdd7a6430caa91bed29e9ebfef2294a3695abb07a9d5a991feea38f924d059078ea445ee9d48df517a4299b04d20
 EBUILD rocm-opencl-runtime-3.1.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a
 EBUILD rocm-opencl-runtime-3.3.0.ebuild 1682 BLAKE2B 87674f8450ca486e7e4a920e2a7d203e3bbacc9011dc156bd81bdce4f46bba49457d4a986abef9225c6377034a7b389dabc0aedd130f4c1a350d6671f4dbd88d SHA512 af7fccf88b355e01e3cde7e4a44e33a220475c0bb36ecc96c15a7599fe7a3140db0a1b781ea8df719a8e4ed36e3a3e9573b2b09f17a3023d509ff9f2175cf63a
-EBUILD rocm-opencl-runtime-3.5.0.ebuild 1750 BLAKE2B d9065faa253dd5545bb6cf6769b4af2ff033ca40be8519bb11b583d9ba9fddc7f0fd4c442de176fe7cc760cb0e2cd42d1acdba6d35bc3d3cd1f96c793158add2 SHA512 08a7d605f0b8513159f4bab48f6459a4ecd17f6813efa5fa5a44296f7882fa40659f27cdcbed83d3f774aa15bb3088e322fdfbe22aab9aa0534949a1e187c958
+EBUILD rocm-opencl-runtime-3.5.0-r1.ebuild 1914 BLAKE2B 85002f6a55491553e26e9f711447b48aa84d35aebd94c1ca89ec47b85bd24eaa143742b52da69f40e1ff5d446b8c1178d944e07c193a1717b277159235d475b8 SHA512 5fc5a2100e72b0210efe0d7336992fe8619fa46789dcc7c34489986e9c11b1343880c83b0f0a986021264102f3cb52f4a68e84d2aecaf8fa977d556d51a23237
+EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch
new file mode 100644
index 000000000000..357b97c7f49e
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch
@@ -0,0 +1,11 @@
+--- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
++++ b/amdocl/CMakeLists.txt	2020-08-23 10:44:34.929831772 +0200
+@@ -23,6 +23,8 @@
+ include_directories(${CMAKE_SOURCE_DIR}/khronos)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers)
+ include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2)
++include_directories(/usr/include/rocclr)
++include_directories(/usr/include/rocclr/compiler/lib/include/)
+ 
+ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
+    (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch
new file mode 100644
index 000000000000..6541c69bd48a
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch
@@ -0,0 +1,10 @@
+--- a/amdocl/CMakeLists.txt	2020-08-23 10:11:28.227839351 +0200
++++ b/amdocl/CMakeLists.txt	2020-08-23 10:12:03.697839216 +0200
+@@ -76,3 +76,7 @@
+ add_library(amdocl64 SHARED ${amdocl64_src})
+ 
+ target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl ${ADDITIONAL_LIBRARIES})
++
++file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
++install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
++
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch
new file mode 100644
index 000000000000..77ce5e9bd332
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch
@@ -0,0 +1,79 @@
+--- a/CMakeLists.txt	2020-08-23 10:14:54.337838565 +0200
++++ b/CMakeLists.txt	2020-08-23 10:18:26.993837753 +0200
+@@ -14,6 +14,8 @@
+ #example command:
+ # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install ..
+ 
++include (GNUInstallDirs)
++
+ set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+ option(BUILD_SHARED_LIBS "Build shared libs" ON)
+ 
+@@ -60,7 +62,7 @@
+ 
+ add_subdirectory(khronos/icd)
+ add_subdirectory(amdocl)
+-add_subdirectory(tools/clinfo)
++#add_subdirectory(tools/clinfo)
+ add_subdirectory(tools/cltrace)
+ if(BUILD_TESTS)
+   add_subdirectory(tests/ocltst)
+@@ -96,34 +98,34 @@
+ ###--- Packaging ------------------------------------------------------------###
+ 
+ # MAIN package
+-install(PROGRAMS $<TARGET_FILE:clinfo>
+-        DESTINATION bin
+-        COMPONENT MAIN)
+-install(PROGRAMS $<TARGET_FILE:cltrace>
+-        DESTINATION lib
+-        COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_FILE:clinfo>
++#        DESTINATION bin
++#        COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_FILE:cltrace>
++#        DESTINATION lib
++#        COMPONENT MAIN)
+ install(PROGRAMS $<TARGET_FILE:amdocl64>
+-        DESTINATION lib
+-        COMPONENT MAIN)
+-install(PROGRAMS $<TARGET_FILE:OpenCL>
+-        DESTINATION lib
+-        COMPONENT MAIN)
+-install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
+-        DESTINATION lib
++        DESTINATION lib64
+         COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_FILE:OpenCL>
++#        DESTINATION lib
++#        COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
++#        DESTINATION lib
++#        COMPONENT MAIN)
+ 
+ # DEV package
+-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
+-        DESTINATION include
+-        COMPONENT DEV
+-        USE_SOURCE_PERMISSIONS
+-        PATTERN cl_d3d10.h EXCLUDE
+-        PATTERN cl_d3d11.h EXCLUDE
+-        PATTERN cl_dx9_media_sharing.h EXCLUDE
+-        PATTERN cl_egl.h EXCLUDE)
+-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
+-        DESTINATION lib
+-        COMPONENT DEV)
++#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL"
++#        DESTINATION include
++#        COMPONENT DEV
++#        USE_SOURCE_PERMISSIONS
++#        PATTERN cl_d3d10.h EXCLUDE
++#        PATTERN cl_d3d11.h EXCLUDE
++#        PATTERN cl_dx9_media_sharing.h EXCLUDE
++#        PATTERN cl_egl.h EXCLUDE)
++#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
++#        DESTINATION lib
++#        COMPONENT DEV)
+ 
+ #############################
+ # Packaging steps
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
index 40557c217c17..28188cb2bb61 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0-r1.ebuild
@@ -53,8 +53,16 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=yes
-		-DROCclr_DIR=/usr/include/rocclr
-		-DLIBROCclr_STATIC_DIR=/usr/lib64/cmake/rocclr
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib64/cmake/rocclr"
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
new file mode 100644
index 000000000000..5a1a4386433c
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocclr-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+	"${FILESDIR}/${PN}-3.7.0-add-rocclr-include-directories.patch"
+	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
+	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}