Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-neo/
Date: Fri, 26 Jun 2020 10:47:27
Message-Id: 1593168413.8b8f9dd8c692cd9572888626e5fa7cb22053c703.marecki@gentoo
1 commit: 8b8f9dd8c692cd9572888626e5fa7cb22053c703
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 26 10:41:55 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 26 10:46:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8f9dd8
7
8 dev-libs/intel-neo: switch back to using bundled OpenCL headers
9
10 The version currently in the tree does not build against recent versions
11 of dev-util/opencl-headers, using the bundled ones is mostly harmless
12 because they aren't installed anywhere, and it shouldn't cause any
13 compatibility issues for OpenCL-aware applications (which build against
14 dev-util/opencl-headers via >=virtual/opencl-3) because they link
15 against libOpenCL provided by an ICD loader, not against NEO itself.
16
17 Closes: https://bugs.gentoo.org/729304
18 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
19
20 dev-libs/intel-neo/intel-neo-20.16.16582.ebuild | 4 ----
21 1 file changed, 4 deletions(-)
22
23 diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
24 index 4cad6048399..dfa0c9b9156 100644
25 --- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
26 +++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
27 @@ -27,7 +27,6 @@ COMMON=">=virtual/opencl-3
28 x11-libs/libva
29 )"
30 DEPEND="${COMMON}
31 - dev-util/opencl-headers
32 media-libs/mesa" # for Khronos OpenGL headers
33 RDEPEND="${COMMON}"
34
35 @@ -40,9 +39,6 @@ S="${WORKDIR}"/${MY_P}
36
37 src_configure() {
38 local mycmakeargs=(
39 - -DKHRONOS_HEADERS_DIR="${EPREFIX}/usr/include"
40 - # CMake only sets this automatically for bundled OpenCL headers
41 - -DNEO_EXTRA_DEFINES="CL_TARGET_OPENCL_VERSION=220"
42 -DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
43 -DBUILD_WITH_L0=$(usex l0)
44 -DDISABLE_LIBVA=$(usex vaapi "no" "yes")