From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D336C138350 for ; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 258FEE0D48; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CCA9E0D49 for ; Wed, 1 Apr 2020 21:15:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3898934FB23 for ; Wed, 1 Apr 2020 21:15:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3703150 for ; Wed, 1 Apr 2020 21:15:11 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1585775697.f0cb6e744add38bf4d3a05c0703dabb1f8ee4e5d.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/opencl/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/opencl/opencl-2.ebuild X-VCS-Directories: virtual/opencl/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: f0cb6e744add38bf4d3a05c0703dabb1f8ee4e5d X-VCS-Branch: master Date: Wed, 1 Apr 2020 21:15:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d1e669d-7df9-4102-bf8d-93a6185a8cd4 X-Archives-Hash: 608070978b8a8120386f550a906ccd03 commit: f0cb6e744add38bf4d3a05c0703dabb1f8ee4e5d Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 1 20:43:11 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 1 21:14:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0cb6e74 virtual/opencl: add dev-libs/ocl-icd as the fallback provider Advantages: * keyworded x86 * supports multilib on amd64 * all OpenCL-aware software should compile and link fine against it * should make it easier for user to deploy out-of-tree OpenCL providers (side note: all actual OpenCL providers currently in the tree except x11-drivers/nvidia-drivers actually *require* this to work), should they choose to do so Disadvantages: * essentially a hack to ensure the integrity of the dependency tree on x86 and amd64/abi_x86_32 - most of the actual OpenCL providers currently in the tree are 64-bit only anyway Signed-off-by: Marek Szuba gentoo.org> virtual/opencl/opencl-2.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild index 2e7f0791234..50fcd113e31 100644 --- a/virtual/opencl/opencl-2.ebuild +++ b/virtual/opencl/opencl-2.ebuild @@ -12,6 +12,9 @@ CARDS=( amdgpu i965 nvidia r600 radeonsi ) IUSE="${CARDS[@]/#/video_cards_}" # intel-neo and intel-ocl-sdk are amd64-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? ( @@ -28,4 +31,5 @@ RDEPEND="app-eselect/eselect-opencl 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}] )"