gentoo Easter resync : 12.04.2020

3 files changed, 48 insertions, 7 deletions

diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
index 9c203a55d7b0..5b6c64f44c80 100644
--- a/virtual/opencl/Manifest
+++ b/virtual/opencl/Manifest
@@ -1,2 +1,3 @@
-EBUILD opencl-2.ebuild 953 BLAKE2B 1af76c8aae4748ee325b0b50015d94c1cbd4f31a6d3f5c97464c35f3ac9e95d84e570c62500b490adc38845c5a360fd84509b07ae64359637b1e5249f6698b8b SHA512 51a3239ac560219a58ae512c2e92966c6f1690f14acc98c104d4397680ad01c2a33d642fa1f1cc0b3f988a4a3c75d794aa4c894e2d2928abb2f9502fa9ca5af8
+EBUILD opencl-2.ebuild 1258 BLAKE2B 8719496fdf06af7e5049c5bbf78360fc7bf2b330ce82c49ac3561a0516aeffaa5de1c374335867a97c1efc3f144247abc6150461b2dcea6df01bf2c40fa68123 SHA512 9de56a00eeda95723e37b93cc5ae8b249748f22b72a5264438195887fa7f6b35561bba8bc5a5d0f8dfe99290aec19a1fd19294fef0d2ebfe5abbaad98edef9a4
+EBUILD opencl-3-r1.ebuild 1371 BLAKE2B 89c16720018c0f4ba5ef323439db375d0504bc326973fc7a223c40588cfc078be33b5c44d519eb7ca1dcbaba5646236693c211a557375e19cc5a172ecde8b71d SHA512 69226356684150dcb86c260ef47dcb45d5e7e36fc68cce395b9870145bd08918d4a9a8fe2757621c9148f1f472cfa29b6d7b8154c23ed2aa68cd9909305aa429
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild
index cbacc93b3193..51ea03746dee 100644
--- a/virtual/opencl/opencl-2.ebuild
+++ b/virtual/opencl/opencl-2.ebuild
@@ -11,21 +11,25 @@ KEYWORDS="amd64 x86"
 CARDS=( amdgpu i965 nvidia r600 radeonsi )
 IUSE="${CARDS[@]/#/video_cards_}"
 
-# intel-neo and intel-ocl-sdk are amd64-only
+# intel-neo, intel-ocl-sdk and rocm-opencl-runtime are abi_x86_64-only
+# ocl-icd is essentially a dummy/you-are-on-your-own provider - it installs
+# header files to include in the source code and a library to link against
+# but does not support any actual devices
 RDEPEND="app-eselect/eselect-opencl
 	|| (
-		video_cards_i965? ( || (
+		video_cards_i965? (
 			abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) )
-			dev-libs/beignet ) )
+		)
 		video_cards_amdgpu? ( || (
-			dev-libs/rocm-opencl-runtime
-			dev-libs/amdgpu-pro-opencl ) )
+			abi_x86_64? ( !abi_x86_32? ( dev-libs/rocm-opencl-runtime ) )
+			dev-libs/amdgpu-pro-opencl[${MULTILIB_USEDEP}] ) )
 		video_cards_nvidia? ( || (
-			>=x11-drivers/nvidia-drivers-290.10-r2[uvm]
+			>=x11-drivers/nvidia-drivers-290.10-r2[uvm(-)]
 			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] ) )
 		video_cards_r600? (
 			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] )
 		video_cards_radeonsi? (
 			>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] )
 		abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) )
+		dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 	)"
diff --git a/virtual/opencl/opencl-3-r1.ebuild b/virtual/opencl/opencl-3-r1.ebuild
new file mode 100644
index 000000000000..3a288d129429
--- /dev/null
+++ b/virtual/opencl/opencl-3-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for OpenCL API"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="|| ( dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+	dev-libs/opencl-icd-loader[${MULTILIB_USEDEP}] )"
+
+pkg_postinst() {
+	elog
+	elog "In order to take advantage of OpenCL you will need a runtime for your hardware."
+	elog "Currently included in Gentoo are:"
+	elog
+	elog " * open:"
+	elog "    - dev-libs/intel-neo - integrated Intel GPUs from Broadwell onwards. 64-bit only;"
+	elog "    - dev-libs/rocm-opencl-runtime - AMD GPUs supported by the amdgpu kernel driver."
+	elog "      Image support still requires a proprietary extension [1]. 64-bit only;"
+	elog "    - media-libs/mesa[opencl] - some older AMD GPUs; see [2]. 32-bit support;"
+	elog
+	elog " * proprietary:"
+	elog "    - dev-libs/amdgpu-pro-opencl - AMD Polaris GPUs. 32-bit support;"
+	elog "    - dev-util/intel-ocl-sdk - Intel CPUs (*not* GPUs). 64-bit only;"
+	elog "    - x11-drivers/nvidia-drivers[uvm] - Nvidia GPUs; specific package versions"
+	elog "      required for older devices [3]. 32-bit support."
+	elog
+	elog " [1] dev-libs/hsa-ext-rocr"
+	elog " [2] https://dri.freedesktop.org/wiki/GalliumCompute/"
+	elog " [3] https://www.nvidia.com/en-us/drivers/unix/legacy-gpu/"
+	elog
+}