From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F8C81382C5 for ; Fri, 26 Jun 2020 10:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35612E0919; Fri, 26 Jun 2020 10:47:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D3A0E0919 for ; Fri, 26 Jun 2020 10:47:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1273C34F0A4 for ; Fri, 26 Jun 2020 10:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92D032B8 for ; Fri, 26 Jun 2020 10:47:20 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1593168413.8b8f9dd8c692cd9572888626e5fa7cb22053c703.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-neo/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/intel-neo/intel-neo-20.16.16582.ebuild X-VCS-Directories: dev-libs/intel-neo/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 8b8f9dd8c692cd9572888626e5fa7cb22053c703 X-VCS-Branch: master Date: Fri, 26 Jun 2020 10:47:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73238237-5555-48d1-a984-9f34ea0c3bf7 X-Archives-Hash: 78cefd3fec5e873ebdbd2bcb885d688e commit: 8b8f9dd8c692cd9572888626e5fa7cb22053c703 Author: Marek Szuba gentoo org> AuthorDate: Fri Jun 26 10:41:55 2020 +0000 Commit: Marek Szuba gentoo 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 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")