From 4174f5eac4708cb8d7352e74f6490115dd954ca9 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Tue, 25 Feb 2020 10:03:58 +0100 Subject: virtual/opencl: pull in dev-libs/beignet again for now The fact that Beignet is the only Intel OpenCL provider supporting the 32-bit x86 ABI causes problems when it is removed from virtual/opencl. Have to think of an exit strategy for once beignet has actually been removed, in the meantime just have virtual/opencl use it again. This reverts commit cdb150723eded0c5d2c8fbaaf3246ccb5b6690bc. Bug: https://bugs.gentoo.org/710724 Signed-off-by: Marek Szuba --- virtual/opencl/opencl-2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'virtual') diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild index 736c52bcc8b0..81e5238f3c14 100644 --- a/virtual/opencl/opencl-2.ebuild +++ b/virtual/opencl/opencl-2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,9 +14,9 @@ IUSE="${CARDS[@]/#/video_cards_}" # intel-neo and intel-ocl-sdk are amd64-only RDEPEND="app-eselect/eselect-opencl || ( - video_cards_i965? ( + video_cards_i965? ( || ( abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) - ) + dev-libs/beignet ) ) >=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] video_cards_amdgpu? ( || ( dev-libs/rocm-opencl-runtime -- cgit v1.2.3-65-gdbad