From 93d0bbd7df69c2081c2b2347ea6c88b8e967d537 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Apr 2023 23:56:27 +0100 Subject: gentoo auto-resync : 18:04:2023 - 23:56:26 --- dev-libs/intel-compute-runtime/Manifest | 7 +- ...ntel-compute-runtime-23.05.25593.18-gcc13.patch | 237 +++++++++++++++++++++ .../intel-compute-runtime-23.05.25593.11.ebuild | 81 ------- .../intel-compute-runtime-23.05.25593.18.ebuild | 3 +- .../intel-compute-runtime-23.13.26032.8.ebuild | 82 +++++++ 5 files changed, 325 insertions(+), 85 deletions(-) create mode 100644 dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch delete mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild create mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild (limited to 'dev-libs/intel-compute-runtime') diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index 8a404a5e2705..aa504f2e320e 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,8 +1,9 @@ AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8 -DIST intel-compute-runtime-23.05.25593.11.tar.gz 6181361 BLAKE2B 4cab9f759bbcb10dd91776648d1e300f752f49f0ffcacfacf2519648b7c02b3dde1f04c4c6104896baf24cafcc9382406cd931e224f5a656718ec10629c74f80 SHA512 5bfef689dbb7c7ed2b500c4b040eed4ac43c5a5f418fb94125db51193d4269379fb1b2cd8c95e53a2e4024c3415455f2dd7a07e79b4bf84c27b29150c328627a +AUX intel-compute-runtime-23.05.25593.18-gcc13.patch 7264 BLAKE2B 2c802323331bb1859403e6f3d0c27721d2a7480048cd26c9b0e36550b49c9cbadd8d22b01c75c77fb2f0881b6d99baca9f0a69bc96a277a20cabacd9b45ae41f SHA512 c4787222c99df0c3dce49e448cb456e0ca0f6e8fccdf755862576c908a71f2a03f2886b36f45a9fd91b0ad67f49ee63d3037ec998372ac1ba02e76b1f014e9d2 DIST intel-compute-runtime-23.05.25593.18.tar.gz 6182150 BLAKE2B 81dcceb6d13e3dfbf5fb811faf406617dba7f83d908b94806b76df115b70a3906d8786ea8aaa1b92e963a0c97e843d13e10d7c4fd66885d309ce910c7ed18d56 SHA512 f249e51f78faee84e3bd253f1ea39fe06337939f54612f0f645e0e57319abe8449e1822291dbf1760e3805a60bdaad36c59df523859a5d879d39024138bc0907 DIST intel-compute-runtime-23.09.25812.14.tar.gz 6264026 BLAKE2B a346ee4b12a774532bb1e716159e8256001ef933b7e5943752d3eccc046a3a95b84b1b6679d81771653cab7182f51bf64cb9443da8a0cb38fea2cfd3d7ab620a SHA512 4e42b1ae8ee2f7b21e35d37d15339d18dc871f27ca759c97104f7987688193a62eabd07107cf337679a28341eb71119c5e3edc40ec48a1997a2ddbd213ba02ea -EBUILD intel-compute-runtime-23.05.25593.11.ebuild 1972 BLAKE2B 1a4fe6370157d251c9cd1c672327a2c7e113eed93d340c048e1c36a8308eba0fdc4d5f0d95e447f6af029dbc6a991fcd43bf8e3e51a4e8d0ff7e79b9d3f0fca9 SHA512 b3c982e873bbf738f949907cf8a909d3d9bcc5c84e02a8698d1de48b23e8fa01f42c1687bcd01c01761b2ed84340bdfb6c236be2a5a969010b009bd4c62ad84c -EBUILD intel-compute-runtime-23.05.25593.18.ebuild 1973 BLAKE2B e0af9386da9bfb53ea66d3316f3efc3a8eab9b9f723ce072048631597fa880a97da93e1bc5df3f3a4a5e5677e1b771f6a29602d74ec5fa3d7c9372bf58b9d4fd SHA512 f423e4bdeee5272cd123448901ee62ac40bbb19a97783a50a4288ba25c838908002dd3df4fd42a5e7202608f5e346a4dbb602ae013b59342c543cd26bc507c90 +DIST intel-compute-runtime-23.13.26032.8.tar.gz 6441876 BLAKE2B e795542080edb21feab1272c4227e88096741051a879301548ed9c3d74fa8453a8738763e07a77b21b1f0ab1ed9f549235c1a5c398f8733c53f34545233128de SHA512 c3e0644c3e90c0bc4c023a0213ac8d25dcacc08dde7f6e3ec677c80e1c5b9d017f495a2192b9c89f5fbadb5de538cb8e460f66956b59e60351ca2162b69357d3 +EBUILD intel-compute-runtime-23.05.25593.18.ebuild 2020 BLAKE2B 319e06b4dafc68855c2bd1fcf72842d95af685bd3e55ea0877ae058c78293b5ce1590cfb6f5dc0663df3bc0e6a290ae2e6a07e758e387944426ad43f6c5ca447 SHA512 e8ffe745f7ae10e95d3f04b5f74816baf2f2a2e3338eeff0ea913355a30ceef4823d514813a7100f5db41f301ce583c0b5ea68a71aa7dae081690c77586a645a EBUILD intel-compute-runtime-23.09.25812.14.ebuild 1994 BLAKE2B f1c6fe74a1849e190e99205219e20407ece6da07ce3d8dbd55291f17ac5b341ead62f5d6439e411d77de4bb1260f5f7b050071fc17e43b9ab52b414146f0744f SHA512 def2654a21df02aef8ec9b17b375b9243b155ef6568694dfc17a7ecc01b01944f68ffca502a71661991302d9b9210d5e42fe8d631dfdf9cf0bb9b326d9abda22 +EBUILD intel-compute-runtime-23.13.26032.8.ebuild 1993 BLAKE2B bd74ce81bb47b0d42f5231d0b0e0830e79e3662d047d65544ca44d4f475bc9064407e6f81aa103e30bc013383d8be6b85e5591c4723c79aa27c6ebf5ae23738d SHA512 56af9e2116e978d190d5cc23b05e6dbf4a5f0ca239f7c7849b5b52ead7d06cfd3a7235c2dc74933187682684215ab64be2b07e123babe0420d15a48d7c9c937a MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch new file mode 100644 index 000000000000..0e4b6d1cdb47 --- /dev/null +++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch @@ -0,0 +1,237 @@ +From beaff2b7358706badc38743f012b5a6cd7823680 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Fri, 17 Feb 2023 17:53:57 +0100 +Subject: [PATCH] Include cstdint to fix GCC 13 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: FrantiĊĦek Zatloukal +--- + shared/offline_compiler/source/ocloc_concat.h | 3 ++- + shared/source/ail/ail_configuration.h | 1 + + shared/source/compiler_interface/external_functions.h | 1 + + shared/source/device_binary_format/ar/ar_encoder.h | 3 ++- + shared/source/os_interface/linux/drm_debug.h | 3 ++- + shared/source/os_interface/linux/drm_neo.h | 1 + + shared/source/os_interface/linux/pci_path.cpp | 3 ++- + shared/source/os_interface/linux/pmt_util.cpp | 5 +++-- + shared/source/os_interface/linux/pmt_util.h | 3 ++- + shared/source/os_interface/linux/print.cpp | 3 ++- + shared/source/tbx/tbx_sockets.h | 3 ++- + shared/source/tbx/tbx_sockets_imp.h | 3 ++- + 12 files changed, 22 insertions(+), 10 deletions(-) + +diff --git a/shared/offline_compiler/source/ocloc_concat.h b/shared/offline_compiler/source/ocloc_concat.h +index c53050b26bf..7a9c9ebdd4e 100644 +--- a/shared/offline_compiler/source/ocloc_concat.h ++++ b/shared/offline_compiler/source/ocloc_concat.h +@@ -10,6 +10,7 @@ + #include "shared/source/utilities/arrayref.h" + #include "shared/source/utilities/const_stringref.h" + ++#include + #include + #include + +@@ -52,4 +53,4 @@ Usage: ocloc concat ... [-out fileNamesToConcat; + std::string fatBinaryName = "concat.ar"; + }; +-} // namespace NEO +\ No newline at end of file ++} // namespace NEO +diff --git a/shared/source/ail/ail_configuration.h b/shared/source/ail/ail_configuration.h +index 95381289d2f..0d8b349b495 100644 +--- a/shared/source/ail/ail_configuration.h ++++ b/shared/source/ail/ail_configuration.h +@@ -9,6 +9,7 @@ + + #include "igfxfmid.h" + ++#include + #include + + /* +diff --git a/shared/source/compiler_interface/external_functions.h b/shared/source/compiler_interface/external_functions.h +index 1dbe54296a8..61873b466c8 100644 +--- a/shared/source/compiler_interface/external_functions.h ++++ b/shared/source/compiler_interface/external_functions.h +@@ -7,6 +7,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/shared/source/device_binary_format/ar/ar_encoder.h b/shared/source/device_binary_format/ar/ar_encoder.h +index f30db2589be..5b3ec9dbb43 100644 +--- a/shared/source/device_binary_format/ar/ar_encoder.h ++++ b/shared/source/device_binary_format/ar/ar_encoder.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2020-2022 Intel Corporation ++ * Copyright (C) 2020-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -11,6 +11,7 @@ + #include "shared/source/utilities/arrayref.h" + #include "shared/source/utilities/const_stringref.h" + ++#include + #include + + namespace NEO { +diff --git a/shared/source/os_interface/linux/drm_debug.h b/shared/source/os_interface/linux/drm_debug.h +index 8e5180cb665..a86f55f0c14 100644 +--- a/shared/source/os_interface/linux/drm_debug.h ++++ b/shared/source/os_interface/linux/drm_debug.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2022 Intel Corporation ++ * Copyright (C) 2022-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -8,6 +8,7 @@ + #pragma once + + #include ++#include + #include + #include + +diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h +index fd8ab8e61c8..fd9a2ab726f 100644 +--- a/shared/source/os_interface/linux/drm_neo.h ++++ b/shared/source/os_interface/linux/drm_neo.h +@@ -18,6 +18,7 @@ + #include "igfxfmid.h" + + #include ++#include + #include + #include + #include +diff --git a/shared/source/os_interface/linux/pci_path.cpp b/shared/source/os_interface/linux/pci_path.cpp +index 04ade097a71..2f7f9800111 100644 +--- a/shared/source/os_interface/linux/pci_path.cpp ++++ b/shared/source/os_interface/linux/pci_path.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2021-2022 Intel Corporation ++ * Copyright (C) 2021-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -9,6 +9,7 @@ + + #include "shared/source/os_interface/linux/sys_calls.h" + ++#include + #include + #include + +diff --git a/shared/source/os_interface/linux/pmt_util.cpp b/shared/source/os_interface/linux/pmt_util.cpp +index 7b20b671be4..a8004a0ff75 100644 +--- a/shared/source/os_interface/linux/pmt_util.cpp ++++ b/shared/source/os_interface/linux/pmt_util.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2021-2022 Intel Corporation ++ * Copyright (C) 2021-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -14,6 +14,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -106,4 +107,4 @@ ssize_t PmtUtil::readTelem(std::string_view telemDir, const std::size_t count, c + return bytesRead; + } + +-} // namespace NEO +\ No newline at end of file ++} // namespace NEO +diff --git a/shared/source/os_interface/linux/pmt_util.h b/shared/source/os_interface/linux/pmt_util.h +index 28ecad3f05c..374b4767185 100644 +--- a/shared/source/os_interface/linux/pmt_util.h ++++ b/shared/source/os_interface/linux/pmt_util.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2021-2022 Intel Corporation ++ * Copyright (C) 2021-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -7,6 +7,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/shared/source/os_interface/linux/print.cpp b/shared/source/os_interface/linux/print.cpp +index 9562bad72a9..1cd173560be 100644 +--- a/shared/source/os_interface/linux/print.cpp ++++ b/shared/source/os_interface/linux/print.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2018-2022 Intel Corporation ++ * Copyright (C) 2018-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -7,6 +7,7 @@ + + #include "shared/source/os_interface/print.h" + ++#include + #include + #include + +diff --git a/shared/source/tbx/tbx_sockets.h b/shared/source/tbx/tbx_sockets.h +index 9b7f7863f05..c00b1847bc2 100644 +--- a/shared/source/tbx/tbx_sockets.h ++++ b/shared/source/tbx/tbx_sockets.h +@@ -1,11 +1,12 @@ + /* +- * Copyright (C) 2018-2021 Intel Corporation ++ * Copyright (C) 2018-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + + #pragma once ++#include + #include + + namespace NEO { +diff --git a/shared/source/tbx/tbx_sockets_imp.h b/shared/source/tbx/tbx_sockets_imp.h +index 738f26175b3..c8e2ac6f0ff 100644 +--- a/shared/source/tbx/tbx_sockets_imp.h ++++ b/shared/source/tbx/tbx_sockets_imp.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2018-2020 Intel Corporation ++ * Copyright (C) 2018-2023 Intel Corporation + * + * SPDX-License-Identifier: MIT + * +@@ -10,6 +10,7 @@ + + #include "os_socket.h" + ++#include + #include + + namespace NEO { diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild deleted file mode 100644 index cd1d6df31cc0..000000000000 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 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.1.7:=" - -DEPEND=" - ${DEPEND} - >=dev-libs/intel-metrics-library-0_pre20220930:= - dev-libs/libnl:3 - dev-libs/libxml2:2 - >=dev-util/intel-graphics-compiler-1.0.12812.26 - >=dev-util/intel-graphics-system-controller-0.8.7:= - media-libs/mesa - >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.9.4:= ) - vaapi? ( - x11-libs/libdrm[video_cards_intel] - media-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-lto - - 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 -} diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild index 745b0dcf530b..ffb2b97cbbb6 100644 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="+l0 +vaapi" RDEPEND=">=media-libs/gmmlib-22.1.7:=" @@ -43,6 +43,7 @@ DOCS=( "README.md" "FAQ.md" ) PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" + "${FILESDIR}/${PN}-23.05.25593.18-gcc13.patch" ) src_prepare() { diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild new file mode 100644 index 000000000000..42141f18aa8d --- /dev/null +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 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.3.5:=" + +DEPEND=" + ${DEPEND} + dev-libs/intel-metrics-discovery:= + dev-libs/intel-metrics-library:= + dev-libs/libnl:3 + dev-libs/libxml2:2 + >=dev-util/intel-graphics-compiler-1.0.12822.1 + >=dev-util/intel-graphics-system-controller-0.8.7:= + media-libs/mesa + >=virtual/opencl-3 + l0? ( >=dev-libs/level-zero-1.10.0:= ) + vaapi? ( + x11-libs/libdrm[video_cards_intel] + media-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-lto + + 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 +} -- cgit v1.2.3