* [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/
@ 2022-03-28 18:12 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2022-03-28 18:12 UTC (permalink / raw
To: gentoo-commits
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@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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/
@ 2022-04-23 18:33 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2022-04-23 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 4080f133977ecb16db84c143fa07deea640594fc
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 18:15:10 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 18:33:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4080f133
dev-libs/intel-compute-runtime: drop 22.12.22749, 22.14.22890, 22.15.22905
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-libs/intel-compute-runtime/Manifest | 3 -
...intel-compute-runtime-22.12.22749-metrics.patch | 37 -----------
.../intel-compute-runtime-22.12.22749.ebuild | 72 ----------------------
.../intel-compute-runtime-22.14.22890.ebuild | 70 ---------------------
.../intel-compute-runtime-22.15.22905.ebuild | 70 ---------------------
5 files changed, 252 deletions(-)
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index e4744158e2f4..7618751b818a 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,6 +1,3 @@
DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
-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
-DIST intel-compute-runtime-22.14.22890.tar.gz 5290076 BLAKE2B 9a6ec8ed142a183d270006726d34492adea989bc2db9eff53046f4c247f7d5089e4cbb6448513b54eeaf7079f990f9a3b6d31cca53459bc2fcd1ced5d2b1bea1 SHA512 78c195832a0f55ff0bf64519234a5f70f1459263000804db1cc73a72c4c07e12c540a9fa0a574bf382713deb132be50b6e6eb7b4abfd264f707889bf02fc1af7
-DIST intel-compute-runtime-22.15.22905.tar.gz 5301399 BLAKE2B fd2d2e6e284cceba4b2de5d56cea537784ae774b047ed1b67f17f92acbc821579ab619e509aa67de9802bb94bdae215372e64575c2590b24d69a0c9c10d63b66 SHA512 9976d762e4851a48bb72e4c59ec4c557a02b34c959bd5c602eb31232d473501e6ea6fe925385a579df6a120537b1efde2c0bdc409c94b2b2072a14761b293973
DIST intel-compute-runtime-22.16.22992.tar.gz 5334525 BLAKE2B e2fd74084cddc8163eff46cf267c33206c240b8e7c513d2408dabcc0290182fcb5ce7a8909dca93cbb6fd95c2130448498845602590ff59487508b7adcb2bd65 SHA512 7a133a97f437dfe62559097e41583db60e54af6937cfcb3613f4c54340919a0ee0136cfcea1fb6005341021a9bb139c40be8d237afa2a246accd0af1a20dd297
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
deleted file mode 100644
index f1449916ea70..000000000000
--- a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index fb7f4bdf494f..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.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() {
- # See https://github.com/intel/compute-runtime/issues/531
- filter-flags -flto=* -flto
-
- 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-22.14.22890.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.14.22890.ebuild
deleted file mode 100644
index eca15c13bd28..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.14.22890.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.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" )
-
-src_configure() {
- # See https://github.com/intel/compute-runtime/issues/531
- filter-flags -flto=* -flto
-
- 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-22.15.22905.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.15.22905.ebuild
deleted file mode 100644
index eca15c13bd28..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.15.22905.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.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" )
-
-src_configure() {
- # See https://github.com/intel/compute-runtime/issues/531
- filter-flags -flto=* -flto
-
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/
@ 2022-06-28 19:59 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2022-06-28 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 17ce27a5e6dc97311ddd178fabccea3141b1ca95
Author: Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Tue Jun 28 17:06:27 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 19:59:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ce27a5
dev-libs/intel-compute-runtime: add patch to remove `-D_FORTIFY_SOURCE=2` configuration from build process
Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/26119
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...-runtime-22.24.23453-remove-fortify-sources.patch | 20 ++++++++++++++++++++
.../intel-compute-runtime-22.24.23453.ebuild | 6 +++---
.../intel-compute-runtime-22.25.23529.ebuild | 6 +++---
3 files changed, 26 insertions(+), 6 deletions(-)
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.24.23453.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
index bdc8a84baf08..077189e165cf 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.24.23453.ebuild
@@ -41,11 +41,11 @@ BDEPEND="virtual/pkgconfig"
DOCS=( "README.md" "FAQ.md" )
-src_prepare() {
- default
+PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
+src_prepare() {
# Remove '-Werror' from default
- set -e '/Werror/d' -i CMakeLists.txt || die
+ sed -e '/Werror/d' -i CMakeLists.txt || die
cmake_src_prepare
}
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
index bdc8a84baf08..077189e165cf 100644
--- 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
@@ -41,11 +41,11 @@ BDEPEND="virtual/pkgconfig"
DOCS=( "README.md" "FAQ.md" )
-src_prepare() {
- default
+PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
+src_prepare() {
# Remove '-Werror' from default
- set -e '/Werror/d' -i CMakeLists.txt || die
+ sed -e '/Werror/d' -i CMakeLists.txt || die
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/
@ 2023-04-18 20:38 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2023-04-18 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 02a40cbb8641d50543cc3aaf387b827b84edf960
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 20:36:32 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 20:36:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a40cbb
dev-libs/intel-compute-runtime: fix gcc13 compilation
Bug: https://bugs.gentoo.org/902469
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...ntel-compute-runtime-23.05.25593.18-gcc13.patch | 237 +++++++++++++++++++++
.../intel-compute-runtime-23.05.25593.18.ebuild | 3 +-
2 files changed, 239 insertions(+), 1 deletion(-)
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?= <fzatlouk@redhat.com>
+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 <fzatlouk@redhat.com>
+---
+ 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 <cstdint>
+ #include <string>
+ #include <vector>
+
+@@ -52,4 +53,4 @@ Usage: ocloc concat <fat binary> <fat binary> ... [-out <concatenated fat binary
+ std::vector<std::string> 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 <cstdint>
+ #include <string>
+
+ /*
+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 <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+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 <cstdint>
+ #include <vector>
+
+ 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 <array>
++#include <cstdint>
+ #include <string>
+ #include <utility>
+
+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 <array>
++#include <cstdint>
+ #include <limits>
+ #include <memory>
+ #include <mutex>
+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 <cstdint>
+ #include <string_view>
+ #include <unistd.h>
+
+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 <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <fcntl.h>
+ #include <map>
+ #include <sstream>
+@@ -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 <cstdint>
+ #include <map>
+ #include <poll.h>
+ #include <string>
+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 <cstdint>
+ #include <cstdio>
+ #include <iostream>
+
+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 <cstdint>
+ #include <string>
+
+ 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 <cstdint>
+ #include <iostream>
+
+ namespace NEO {
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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-18 20:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-23 18:33 [gentoo-commits] repo/gentoo:master commit in: dev-libs/intel-compute-runtime/, dev-libs/intel-compute-runtime/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2023-04-18 20:38 Conrad Kostecki
2022-06-28 19:59 Conrad Kostecki
2022-03-28 18:12 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox