| 1 |
commit: 0eafd4cd77602ccc5a1b0a487be6a2b47c402706 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 30 12:51:24 2017 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 30 12:57:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eafd4cd |
| 7 |
|
| 8 |
dev-libs/beignet: do not try enabling OpenCL 2.0 support on unsupported ABIs |
| 9 |
|
| 10 |
Beignet CMake scripts handle this the right way so let's work with them instead |
| 11 |
of against them. Now if USE=ocl20 it will get enabled for abi_x86_64 and |
| 12 |
gracefully fall back to 1.2 for the others, whereas USE=-ocl20 still explicitly |
| 13 |
disables it for all ABIs. |
| 14 |
|
| 15 |
With many thanks to aballier. |
| 16 |
|
| 17 |
Gentoo-Bug: 622964 |
| 18 |
|
| 19 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 20 |
|
| 21 |
.../beignet/{beignet-9999.ebuild => beignet-1.3.1-r1.ebuild} | 11 ++++++----- |
| 22 |
dev-libs/beignet/beignet-9999.ebuild | 2 +- |
| 23 |
2 files changed, 7 insertions(+), 6 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-1.3.1-r1.ebuild |
| 26 |
similarity index 91% |
| 27 |
copy from dev-libs/beignet/beignet-9999.ebuild |
| 28 |
copy to dev-libs/beignet/beignet-1.3.1-r1.ebuild |
| 29 |
index e842fbc1517..44c6896db12 100644 |
| 30 |
--- a/dev-libs/beignet/beignet-9999.ebuild |
| 31 |
+++ b/dev-libs/beignet/beignet-1.3.1-r1.ebuild |
| 32 |
@@ -26,8 +26,9 @@ else |
| 33 |
fi |
| 34 |
|
| 35 |
COMMON="media-libs/mesa |
| 36 |
- sys-devel/clang:= |
| 37 |
- sys-devel/llvm:= |
| 38 |
+ sys-devel/clang:0= |
| 39 |
+ >=sys-devel/llvm-3.6:0= |
| 40 |
+ ocl20? ( >=sys-devel/llvm-3.9:0= ) |
| 41 |
>=x11-libs/libdrm-2.4.70[video_cards_intel] |
| 42 |
x11-libs/libXext |
| 43 |
x11-libs/libXfixes" |
| 44 |
@@ -39,8 +40,8 @@ DEPEND="${COMMON} |
| 45 |
virtual/pkgconfig" |
| 46 |
|
| 47 |
PATCHES=( |
| 48 |
- "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch |
| 49 |
- "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch |
| 50 |
+ "${FILESDIR}"/no-debian-multiarch.patch |
| 51 |
+ "${FILESDIR}"/${P}-oclicd_no_upstream_icdfile.patch |
| 52 |
"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch |
| 53 |
"${FILESDIR}"/llvm-terminfo.patch |
| 54 |
) |
| 55 |
@@ -80,7 +81,7 @@ multilib_src_configure() { |
| 56 |
local mycmakeargs=( |
| 57 |
-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" |
| 58 |
-DOCLICD_COMPAT=$(usex ocl-icd) |
| 59 |
- -DENABLE_OPENCL_20=$(usex ocl20) |
| 60 |
+ $(usex ocl2 "" "-DENABLE_OPENCL_20=OFF") |
| 61 |
) |
| 62 |
|
| 63 |
cmake-utils_src_configure |
| 64 |
|
| 65 |
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild |
| 66 |
index e842fbc1517..9e1ae6ff87f 100644 |
| 67 |
--- a/dev-libs/beignet/beignet-9999.ebuild |
| 68 |
+++ b/dev-libs/beignet/beignet-9999.ebuild |
| 69 |
@@ -80,7 +80,7 @@ multilib_src_configure() { |
| 70 |
local mycmakeargs=( |
| 71 |
-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" |
| 72 |
-DOCLICD_COMPAT=$(usex ocl-icd) |
| 73 |
- -DENABLE_OPENCL_20=$(usex ocl20) |
| 74 |
+ $(usex ocl2 "" "-DENABLE_OPENCL_20=OFF") |
| 75 |
) |
| 76 |
|
| 77 |
cmake-utils_src_configure |
Archives