gentoo resync : 29.12.2022

7 files changed, 145 insertions, 14 deletions

diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index bf12e6c7b9a0..a0da22aba31e 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,9 +1,12 @@
-DIST intel-compute-runtime-22.13.22789.tar.gz 5252140 BLAKE2B 81fe85e75b1f6257771950dd2716e48f8db61dbe62f747c13ed00be7385c9e6a2f2cd2a5d50cf4253962d13bd1fdb4449a5e646fe3a8b10af228f746b9880210 SHA512 e4d22d8f73463300424b2df9a9634f0b5ac341131de33e57d46ffd52ce0b3fbdbf62cf591876d2143ca14caeba42ec95f5aef201eb9895e5d36b2279b15e661c
-DIST intel-compute-runtime-22.16.22992.tar.gz 5334525 BLAKE2B e2fd74084cddc8163eff46cf267c33206c240b8e7c513d2408dabcc0290182fcb5ce7a8909dca93cbb6fd95c2130448498845602590ff59487508b7adcb2bd65 SHA512 7a133a97f437dfe62559097e41583db60e54af6937cfcb3613f4c54340919a0ee0136cfcea1fb6005341021a9bb139c40be8d237afa2a246accd0af1a20dd297
-DIST intel-compute-runtime-22.17.23034.tar.gz 5345890 BLAKE2B 0cd4b9c117978c9127ff1b9e985ab097e672b228a0bba39ad868881af94e821683afb45f394951776f0ecb725872a4624b35be50e2022fec06b1d77d58227fc9 SHA512 d34a63263f073c8fe6d61f105b753468d856de965b605c54ae4e8931bcb81293378f501b796cf84938857f7e08288f4650299cd76d56483f552846fc4b93b2b9
-DIST intel-compute-runtime-22.18.23063.tar.gz 5355944 BLAKE2B ee4d79370c10f2aa1fcd0209a1403a89da1ff5a21dd8b39fb40ac33416b1adaef08713382ee89ad88e64b74d5edcb02e3877898e2301b5454a14b8910ebde009 SHA512 a94a3a7c331ea8bb059740ffaec6e139c17216be23c86cc9e880d247ff12dcb93357ee90b9863b9ddcea59dc1a3d377b32600675a145c29f12c810c13a9e3a61
-EBUILD intel-compute-runtime-22.13.22789-r2.ebuild 1747 BLAKE2B 1f4eae591c1398e1efa0a671cfde34712d7c6adf51a63ae967fa96392a2697476c3eb26ad3576d0dd77dd649956eee03f9b1c309204325ef3da2195c878031c9 SHA512 d881aad689d8300586aac590ccfb3093ec060e109cd3efe546db39d257be2312a0a7df9def2248329c2897912668b18af8312f425349287e68abe9eb65690efc
-EBUILD intel-compute-runtime-22.16.22992-r2.ebuild 1748 BLAKE2B 1a1073dd4af801ada3fb4112e52bfc77f2ad576e1500c13b27b83ad513e4d2f8d626bf2e478d8232ea09d56a8e0433097d494445fa32ff4dfff0776ce6d4cd45 SHA512 b3600ca8963b6d0bcfe55dd312bd776d932f68c0d3fc6a9efe1533a2f9f9cbef8d923fb311a09f1c082fc89e2abccf667124a798b32db7ebdc43652765c44239
-EBUILD intel-compute-runtime-22.17.23034.ebuild 1776 BLAKE2B d2109900d72ed93c553a8c29b1141329d0411dbe58f6c7d5cd0e1a7da5eb71be142ae74d5fad20a9cbdc74aa57aeff5e0526cc1a6e890df2319f37cc38de6627 SHA512 89895e7dde54e3471cc67d264d5823c0d96b1dbcbd94d0319495ee7fe1439e3772f42f9078fb5f9f418ae1a8a123606a2619c265c2f3f817c11b1d7530c97ac9
-EBUILD intel-compute-runtime-22.18.23063.ebuild 1903 BLAKE2B 56af3b2e462391efc8ce1316ac7d38241f29f3ce1e876970a98592fa38bc82249b06f9267288742f468aea137a33f989bf66e933ef642732818253986a96b696 SHA512 881f88fc730234977c6a6ff45594893248b364f4272644db289d1e55cabad6c8dc7fcff3be42d8edfb61f891569b1818049c81e77aebc902756b9ce53518d1e4
+AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
+DIST intel-compute-runtime-22.21.23269.tar.gz 5475347 BLAKE2B dbac36c1720ee2a2475b64c3b61d144501fa4031ceb0eb69a3313cb78b5588926d029ad1916e2229fb8dea8d3450936da5b4e25b47814c854b05ec0bdb940943 SHA512 9ae38956dbff9764d85b5447cc03f7616319de463ddbf0dc5d4c8e8f8869f197b6045e446c81a902d8a5e7681e05cb5ac63e345b6bdcb74366b83619c52eb012
+DIST intel-compute-runtime-22.22.23355.tar.gz 5498680 BLAKE2B 81368ca9a5151305a5eb656ecca6a8d51129df2f567631d72fc5965c66b367e843bcf7b89a201702aa78e430d60e706079eba48a11cfd2b6a82e7a34d7ac5789 SHA512 72813ebd5de38d31f9ceb8087c38337d1bd0bb35256b86f3f3d7f3adc5ebe73b3cdc04bf653a522e25098b38c3b867f62fc3590eedf17e11d2fc03c2aa2b22e2
+DIST intel-compute-runtime-22.23.23405.tar.gz 5515173 BLAKE2B eafb5a4ed8a221bc5290576a137f371f2f9d3cebbe1e689f3d1ce41f9430a5242d82ae78799f523f29685c3a731570e4a6766f804faa0f6bb7bae365cb5d6573 SHA512 38ffadd9130717acb0e8d6492b2bb4d8d5c962b151784a92c85d6249cbab1014dcd418bf5110eccc1640334c1ab0d171b7028d2f0d95d606733b42a319bf2f0b
+DIST intel-compute-runtime-22.24.23453.tar.gz 5521386 BLAKE2B c025539c0d2a0ac492ddc5893c0d077523bbc0c0e1dcdb3d086ff381b36f26d0a7b24aecb0ba04e915e443eafecbaf171ef54fc0c455e57b0ae622ef164f4056 SHA512 fb57348ef4cad48b7d09bf8db64a874a63bdbbd586323c25b7c9cf7461bfd62c1cd061c4b989c52466e5d364fde9dec2335bf7e244baadd573888ba904ba867c
+DIST intel-compute-runtime-22.25.23529.tar.gz 5542277 BLAKE2B da718987fd3f3239b6cfc60914f02cc67b7174cb92f3a12e5d8f78b39631892b1c69368eb89590c3a7dfc9e930eb8254ec33c43028073cffac06bd3f718164bb SHA512 5ad80357a27cba76b95099ce5a0edc5271d7328769d6e84039fa94f94be99f02cf4890ee05702db18e28beba6fadea46aa2f0eb236ed8c27cb95bee075f2f6d6
+EBUILD intel-compute-runtime-22.21.23269.ebuild 1904 BLAKE2B 5ae9938b50ead43d244d4f3ea2bad42d595da7b8e60c4f817a80abb562bed48336ff7fc0135e82ad3e1eab3367234fc10782473de618e49a627bf771f80ccd1b SHA512 a885b8a43eae56cd9d980e9b576ba9f64c463ea71e87223d18c88721288623e8d35405b820c0f9bb15d539f03cf616fa01e3b33aa81605991f904079434c5d18
+EBUILD intel-compute-runtime-22.22.23355.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.23.23405.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.24.23453.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
+EBUILD intel-compute-runtime-22.25.23529.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
new file mode 100644
index 000000000000..dc0ab96dde0c
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.24.23453-remove-fortify-sources.patch
@@ -0,0 +1,20 @@
+diff --git a/compute-runtime-22.24.23453/CMakeLists.txt b/compute-runtime-22.24.23453/CMakeLists.txt
+index f227808..83075f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -702,7 +702,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+   else()
+     if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
+     else()
+       # gcc, g++ only
+@@ -711,7 +710,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+       else()
+         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+       endif()
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -D_FORTIFY_SOURCE=2")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
+       set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,noexecstack")
+       set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-z,relro")
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789-r2.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
index 783bebea072d..0bbb025dbde7 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789-r2.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
@@ -23,10 +23,10 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	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-compiler-1.0.11061-r1
 	>=dev-util/intel-graphics-system-controller-0.2.4:=
 	media-libs/mesa
 	>=virtual/opencl-3
@@ -41,11 +41,21 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+src_prepare() {
+	default
+
+	# Remove '-Werror' from default
+	set -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
 
 	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_WITH_L0="$(usex l0)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
index da3d3664772f..bdc8a84baf08 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.18.23063.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.22.23355.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
 	>=dev-util/intel-graphics-compiler-1.0.11061-r1
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
index ff30036f8e54..bdc8a84baf08 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.23.23405.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
 	>=dev-util/intel-graphics-compiler-1.0.11061-r1
@@ -41,6 +41,15 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+src_prepare() {
+	default
+
+	# Remove '-Werror' from default
+	set -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.16.22992-r2.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
index f83c1f978986..077189e165cf 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.16.22992-r2.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
@@ -23,10 +23,10 @@ RDEPEND=">=media-libs/gmmlib-22.0.2:="
 
 DEPEND="
 	${DEPEND}
-	dev-libs/intel-metrics-library
+	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-compiler-1.0.11061-r1
 	>=dev-util/intel-graphics-system-controller-0.2.4:=
 	media-libs/mesa
 	>=virtual/opencl-3
@@ -41,11 +41,21 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
+PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	# See https://github.com/intel/compute-runtime/issues/531
 	filter-flags -flto=* -flto
 
 	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_WITH_L0="$(usex l0)"
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
new file mode 100644
index 000000000000..077189e165cf
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.25.23529.ebuild
@@ -0,0 +1,79 @@
+# 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 flag-o-matic
+
+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.11061-r1
+	>=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.24.23453-remove-fortify-sources.patch" )
+
+src_prepare() {
+	# Remove '-Werror' from default
+	sed -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-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"
+		-Wno-dev
+
+		# 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"
+	)
+
+	cmake_src_configure
+}