| 1 |
commit: 4174f5eac4708cb8d7352e74f6490115dd954ca9 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 25 09:03:58 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 25 09:06:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174f5ea |
| 7 |
|
| 8 |
virtual/opencl: pull in dev-libs/beignet again for now |
| 9 |
|
| 10 |
The fact that Beignet is the only Intel OpenCL provider supporting the |
| 11 |
32-bit x86 ABI causes problems when it is removed from virtual/opencl. |
| 12 |
Have to think of an exit strategy for once beignet has actually been |
| 13 |
removed, in the meantime just have virtual/opencl use it again. |
| 14 |
|
| 15 |
This reverts commit cdb150723eded0c5d2c8fbaaf3246ccb5b6690bc. |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/710724 |
| 18 |
|
| 19 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 20 |
|
| 21 |
virtual/opencl/opencl-2.ebuild | 6 +++--- |
| 22 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/virtual/opencl/opencl-2.ebuild b/virtual/opencl/opencl-2.ebuild |
| 25 |
index 736c52bcc8b..81e5238f3c1 100644 |
| 26 |
--- a/virtual/opencl/opencl-2.ebuild |
| 27 |
+++ b/virtual/opencl/opencl-2.ebuild |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-# Copyright 1999-2020 Gentoo Authors |
| 30 |
+# Copyright 1999-2019 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
EAPI=6 |
| 34 |
@@ -14,9 +14,9 @@ IUSE="${CARDS[@]/#/video_cards_}" |
| 35 |
# intel-neo and intel-ocl-sdk are amd64-only |
| 36 |
RDEPEND="app-eselect/eselect-opencl |
| 37 |
|| ( |
| 38 |
- video_cards_i965? ( |
| 39 |
+ video_cards_i965? ( || ( |
| 40 |
abi_x86_64? ( !abi_x86_32? ( dev-libs/intel-neo ) ) |
| 41 |
- ) |
| 42 |
+ dev-libs/beignet ) ) |
| 43 |
>=media-libs/mesa-9.1.6[opencl,X(+),${MULTILIB_USEDEP}] |
| 44 |
video_cards_amdgpu? ( || ( |
| 45 |
dev-libs/rocm-opencl-runtime |
Archives