gentoo resync : 06.04.2022

4 files changed, 133 insertions, 18 deletions

diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index f03864800796..4b5288fbaf1f 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,6 +1,9 @@
 AUX intel-compute-runtime-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
+AUX intel-compute-runtime-22.12.22749-metrics.patch 1567 BLAKE2B 51f69ba75dca353b059b4dfaf8b98ebf221e03417247caa528511fb5b66d40d4950cec0eb3c7cd23f6722f2743a9e8bed110f065661b50fb36c8e9f65c440acf SHA512 d71e25194d2dc13284c6939c094bd9fed08adee4b8185078e20ba9aa128e5b2cdf5efcc6d2723687101144ec70d934b1b8fc1698e1295579603783a2e4220df3
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
-DIST intel-compute-runtime-21.50.21939.tar.gz 5106368 BLAKE2B 3a8613c7178975bf930f0ccbed06d31952f05c8316e7735db759a7bcc8b81b5bd3040af62bae6e63fc9781ce2e6e8f035751cd6696b4c7cfbb6025f3d4fcfd8b SHA512 cabcb0fb9816ca8e6b93fa069c73926ccdaf3803c073b11f62477f80d38af49a7b4e814765a40e3daae50a6159560872c5b5123f64e68a570556c80d47a120c9
+DIST intel-compute-runtime-22.12.22749.tar.gz 5234659 BLAKE2B 162c4781561a131af51779108817d2a39ea9676e3772a776603c1e7670b03eddd800593a6e9d77d852476b2401582f3ff87c8b9582b5fa0769ab5ec48be6ba70 SHA512 16e4c76a38284d4e1470977845d338dc05195351ac53d63528e93f1990b81d03a8f1a31c53c665fb8e19b5dc9f4ce38ff392ee1158769780de7a7cb83b2b361b
+DIST intel-compute-runtime-22.13.22789.tar.gz 5252140 BLAKE2B 81fe85e75b1f6257771950dd2716e48f8db61dbe62f747c13ed00be7385c9e6a2f2cd2a5d50cf4253962d13bd1fdb4449a5e646fe3a8b10af228f746b9880210 SHA512 e4d22d8f73463300424b2df9a9634f0b5ac341131de33e57d46ffd52ce0b3fbdbf62cf591876d2143ca14caeba42ec95f5aef201eb9895e5d36b2279b15e661c
 EBUILD intel-compute-runtime-21.46.21636-r1.ebuild 1387 BLAKE2B 7a927c6d9cf7d1d4b80b4586fbd989e2cdf8877036c79df2db01054152d5db346f63856b0a37cd4e3bb800d38f918daaf44fc34d4306fb0f06287954ad281c3a SHA512 0fc688519ac6251963974264a7ecdd1f721c4ed02338e6358a25f84a036a81cca4a8e44c7191f5082cd3d687e7064e559f018b722267a33dcfbc889b756955bc
-EBUILD intel-compute-runtime-21.50.21939.ebuild 1388 BLAKE2B 23f2f41c1fe8831bd41f0cf16a50aa3b3b9daa6147eec61935757c3c09174af829c853b9d611cdd0983b1d3bfc5d4b13f5290132f11b0d675d617027deefd23d SHA512 14107ee44ab961b472423d393fad05944f613ba5d207b967ff9b832ab9c981ba32392761670d105f2ce524aaea10453b4919072273ded6a1c289e409406d35b0
+EBUILD intel-compute-runtime-22.12.22749.ebuild 1703 BLAKE2B b5bfcd69ed035bd4c07d74424def5b1f2d284f84d4cd8335d92efece424cd2131a8642d2b62ab70b2b7b886c89c4e6b5ec48caf615b12364566c3c2c69f99727 SHA512 72eb8e2a5f0644242946d3057a57a8c70e525f0cfb465cb4f0bdce5d1e104b54e8e1411a976db5030c33f260551c9d478dec371f63d3b7326585dcfc342d76ba
+EBUILD intel-compute-runtime-22.13.22789.ebuild 1644 BLAKE2B 6f6d93437ecc6904ee436f1c126c67a65ecf44039ed3de0e68f014841006458208d7e7276d93a3bcbfbe1f3d27ef55a29754bd928f8fc3f7cbb9063634773631 SHA512 fc63c5e226862c5c8ebfe7870cbf3af2797cff83c07c18a7dddb492eb2c7f343f2edffa337c9ee4dfc0eee2ea63359c75d1976168279519a176a5c06f4a74b09
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
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@intel.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@intel.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
+}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
index 211c859a70c9..a58424820a2a 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
-
+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"
@@ -18,43 +19,48 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+l0 +vaapi"
 
-RDEPEND="
+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.9389
+	>=dev-util/intel-graphics-compiler-1.0.10713
 	>=dev-util/intel-graphics-system-controller-0.2.4
-	>=media-libs/gmmlib-21.2.1:=
+	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.6.2 )
+	l0? ( >=dev-libs/level-zero-1.7.15 )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		x11-libs/libva
 	)
 "
 
-# for Khronos OpenGL headers
-DEPEND="
-	${RDEPEND}
-	media-libs/mesa
-"
-
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
-PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.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="ON"
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
 	)
 
 	cmake_src_configure