[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-neo/

["Marek Szuba" <marecki@gentoo.org>]

commit:     8b8f9dd8c692cd9572888626e5fa7cb22053c703
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 26 10:41:55 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 26 10:46:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8f9dd8

dev-libs/intel-neo: switch back to using bundled OpenCL headers

The version currently in the tree does not build against recent versions
of dev-util/opencl-headers, using the bundled ones is mostly harmless
because they aren't installed anywhere, and it shouldn't cause any
compatibility issues for OpenCL-aware applications (which build against
dev-util/opencl-headers via >=virtual/opencl-3) because they link
against libOpenCL provided by an ICD loader, not against NEO itself.

Closes: https://bugs.gentoo.org/729304
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/intel-neo/intel-neo-20.16.16582.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
index 4cad6048399..dfa0c9b9156 100644
--- a/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
+++ b/dev-libs/intel-neo/intel-neo-20.16.16582.ebuild
@@ -27,7 +27,6 @@ COMMON=">=virtual/opencl-3
 		x11-libs/libva
 	)"
 DEPEND="${COMMON}
-	dev-util/opencl-headers
 	media-libs/mesa"	# for Khronos OpenGL headers
 RDEPEND="${COMMON}"
 
@@ -40,9 +39,6 @@ S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
-		-DKHRONOS_HEADERS_DIR="${EPREFIX}/usr/include"
-		# CMake only sets this automatically for bundled OpenCL headers
-		-DNEO_EXTRA_DEFINES="CL_TARGET_OPENCL_VERSION=220"
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
 		-DBUILD_WITH_L0=$(usex l0)
 		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")