[gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/

[Conrad Kostecki]

commit:     10feccdc2c27e62b43865cdacf2e572a26f08dde
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 18:07:49 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 18:10:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10feccdc

dev-libs/intel-compute-runtime: add 22.12.22749

Bug: https://bugs.gentoo.org/836331
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 dev-libs/intel-compute-runtime/Manifest            |  1 +
 ...intel-compute-runtime-22.12.22749-metrics.patch | 37 ++++++++++++
 .../intel-compute-runtime-22.12.22749.ebuild       | 69 ++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index c21ef1ba4fbf..ff8217dab5a1 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,2 +1,3 @@
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
 DIST intel-compute-runtime-22.11.22682.tar.gz 5220769 BLAKE2B c5cacdb0140fe9247353b9922a2e401a866d73ea9d4fa6a4312c984d4ba0751ff60d58f15b49003020d88bef13808113ba8ca84239c140fa7c26edcd401c0d9c SHA512 0e4007b152a20e85d40e71d68144a8dab1be536800650fbd1c3f5e23a0731c733d7dfa943d7ea4e1f19548313b12474bd5b9426ef7f2057a9b106a0fc9a1762a
+DIST intel-compute-runtime-22.12.22749.tar.gz 5234659 BLAKE2B 162c4781561a131af51779108817d2a39ea9676e3772a776603c1e7670b03eddd800593a6e9d77d852476b2401582f3ff87c8b9582b5fa0769ab5ec48be6ba70 SHA512 16e4c76a38284d4e1470977845d338dc05195351ac53d63528e93f1990b81d03a8f1a31c53c665fb8e19b5dc9f4ce38ff392ee1158769780de7a7cb83b2b361b

diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch
new file mode 100644
index 000000000000..f1449916ea70
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch
@@ -0,0 +1,37 @@
+From a968cb223ea60d476d191a1f61dd4791178aacb4 Mon Sep 17 00:00:00 2001
+From: Grzegorz Choinski <grzegorz.choinski@×××××.com>
+Date: Fri, 11 Mar 2022 18:41:30 +0000
+Subject: [PATCH] disable metrics discovery detection
+
+Disabling metrics discovery detection due to conflicts that the name libmd
+creates with packages from ubuntu.
+
+Signed-off-by: Grzegorz Choinski <grzegorz.choinski@×××××.com>
+---
+ cmake/find_metrics.cmake | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/find_metrics.cmake b/cmake/find_metrics.cmake
+index e97e1d20b66..89445229b30 100644
+--- a/cmake/find_metrics.cmake
++++ b/cmake/find_metrics.cmake
+@@ -28,7 +28,9 @@ function(dependency_detect COMPONENT_NAME DLL_NAME VAR_NAME REL_LOCATION IS_THIR
+       set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
+       set(ENV{PKG_CONFIG_PATH} "${LIBRARY_DIR}/${__tmp_LIBDIR}/pkgconfig/")
+     endif()
+-    pkg_check_modules(NEO__${VAR_NAME} ${DLL_NAME})
++    if(NOT DLL_NAME STREQUAL "")
++      pkg_check_modules(NEO__${VAR_NAME} ${DLL_NAME})
++    endif()
+     if(DEFINED __tmp_LIBDIR)
+       set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
+     endif()
+@@ -76,7 +78,7 @@ if(NOT NEO__METRICS_LIBRARY_INCLUDE_DIR STREQUAL "")
+ endif()
+ 
+ # Metrics Discovery Detection
+-dependency_detect("Metrics Discovery" libmd METRICS_DISCOVERY "../metrics/discovery" TRUE)
++dependency_detect("Metrics Discovery" "" METRICS_DISCOVERY "../metrics/discovery" TRUE)
+ if(NOT NEO__METRICS_DISCOVERY_INCLUDE_DIR STREQUAL "")
+   include_directories("${NEO__METRICS_DISCOVERY_INCLUDE_DIR}")
+ endif()

diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
new file mode 100644
index 000000000000..4b6c563cdd2a
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.10713
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.7.15 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-22.12.22749-metrics.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}