summaryrefslogtreecommitdiff
path: root/dev-libs/level-zero
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/level-zero')
-rw-r--r--dev-libs/level-zero/Manifest13
-rw-r--r--dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch60
-rw-r--r--dev-libs/level-zero/level-zero-1.16.1.ebuild25
-rw-r--r--dev-libs/level-zero/level-zero-1.16.15.ebuild33
-rw-r--r--dev-libs/level-zero/level-zero-1.17.42.ebuild (renamed from dev-libs/level-zero/level-zero-1.16.14-r1.ebuild)17
-rw-r--r--dev-libs/level-zero/level-zero-1.17.45.ebuild (renamed from dev-libs/level-zero/level-zero-1.17.0.ebuild)15
6 files changed, 23 insertions, 140 deletions
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index f7029da00cf9..46fc4c9ab708 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,10 +1,5 @@
-AUX level-zero-1.16.14-spdlog-libfmt.patch 1826 BLAKE2B c679d84673e93c346b1f9109bdef2aebe60b7081dfd79a48a47763dab7f5031864a9127a36b50174e07fcd4a435911257e7cc6a48434a5f792320e7c377788e2 SHA512 1ca69647c4d66459cc3df617f503b73f58ed19da86d58540884533b4e186f83bd1a4db3e3503babc8531126898aa8366eded7f683c2c02df2fdfbd4b0c9e5d1d
-DIST level-zero-1.16.1.tar.gz 999641 BLAKE2B 845964416526428d4848ccc3beebf0eac426ba39ce292cea3dced13803dbeb1d4393930b46a60fc2c59dc9e2f4bba1188b211a57574c58fb7180c44b7a8a028b SHA512 c53b5663494613b7a536816bf8367895aa055ce74d9abc8e8aacc3efb7c081de60480d03693861e2b348698b7da6224ac21fb590bf9311d342a19ca4f416b051
-DIST level-zero-1.16.14.tar.gz 1001744 BLAKE2B a02d3b04a127bb43a3b2507c00f6c536d319d11e6196ad347f3d82a22d11f094118b5115589f463945b8763c9fb5c22a09965c637e72b14c7364813f8d69e05f SHA512 8c80d75909398245c0173a4198748d1a1e469e21a09138f60b314061ff556e7f529807e02c6ec1f3a47f2871e17c24b7be6d363810a25fee11e73b5c97c7c62a
-DIST level-zero-1.16.15.tar.gz 1001798 BLAKE2B 176a2152f9dbc292d221b3a75f7fbf28b863eb2fc3d83e54d3b0b7d504cde866ce376bd57d30b64f4619297732480c7a9add60538953a0cb600af43e465eaf65 SHA512 37f1770f1bfa71fa08d56afed53a4dd1107ff36d8790f7bb0f921237d9d0e90076ef22349e8f289cf8f154ca0e1e0fff6a7dcd55b71468989322b9892962b874
-DIST level-zero-1.17.0.tar.gz 1003951 BLAKE2B 10b7f7513b42e9f4c7671957959c0f7ff1ba3a05c2f39f23964b415e1b1984ae40d13be92c1a2587711181ac35b46d9f1132637aa41c2dfceef2f39f96ac35f6 SHA512 97b9d06b5cd84b1644ca252ac5009d1350f8c72aeb908a3b93bf8e07f91354589ce4fffdd8069b301eac6b704489ca04022aa4a44a7269bc0da3ace7103b5802
-EBUILD level-zero-1.16.1.ebuild 708 BLAKE2B 1df2181b8e7096b46b6220eb70fdba8f6defc1c69ff6dd71415c27fa50e8581ae07d40884044dcbee82888a31e6294e2ccc7bb4b888ef4fe398b1de36d4bf415 SHA512 73ac2820957a7a3b508bb1f7472ecdcf9550d091331f63c5e8cffcade3993c33ab69383de5bb6a66a67390e604deb326128c7e608118105eab642d9322a30ad4
-EBUILD level-zero-1.16.14-r1.ebuild 841 BLAKE2B 953e48b6d6cbabd5f2ecbbe60a2bdeb81e6db93a647cd090e8aebfd88c977af15de34ae4dd5afec91a0a10949a6ba5bfb4ba29107ef1ad2665d86448cf982751 SHA512 ddcfda3f82fd09e617a175446df9c7de4ca23e6ec5eba6c0efb1636b694cb9c1d6300ea0df90133d254d847975e8cc1942e8d6f9325e9fa2d5653f7bf0d14e4f
-EBUILD level-zero-1.16.15.ebuild 841 BLAKE2B 953e48b6d6cbabd5f2ecbbe60a2bdeb81e6db93a647cd090e8aebfd88c977af15de34ae4dd5afec91a0a10949a6ba5bfb4ba29107ef1ad2665d86448cf982751 SHA512 ddcfda3f82fd09e617a175446df9c7de4ca23e6ec5eba6c0efb1636b694cb9c1d6300ea0df90133d254d847975e8cc1942e8d6f9325e9fa2d5653f7bf0d14e4f
-EBUILD level-zero-1.17.0.ebuild 841 BLAKE2B 953e48b6d6cbabd5f2ecbbe60a2bdeb81e6db93a647cd090e8aebfd88c977af15de34ae4dd5afec91a0a10949a6ba5bfb4ba29107ef1ad2665d86448cf982751 SHA512 ddcfda3f82fd09e617a175446df9c7de4ca23e6ec5eba6c0efb1636b694cb9c1d6300ea0df90133d254d847975e8cc1942e8d6f9325e9fa2d5653f7bf0d14e4f
+DIST level-zero-1.17.42.tar.gz 1152554 BLAKE2B a9b2054a620735490d1ff0f0a7e35e96bfe80531cf738e11ae3316bc0ce06108304e6f55ca57c2392a7854d7015bf2bcab93aa9778784ec546da41e174a08298 SHA512 c16c8269c82888c80c226e2e67641a3dbe0dd49b7e00ce5b2b8f90ab1233ac4bba1032f0b00c9dd702b85e1f635210bc383ec0c7e74651514ac104f5d9e8300c
+DIST level-zero-1.17.45.tar.gz 1152376 BLAKE2B 24ed5569431cd116808f48f2b718666baa8ecbdf0f69b56e7ca5a25fe5266cba48ba05c06946abd4a57562c8342aefc7f9c34b707435b793fe723412f64180d6 SHA512 83d97ffe43c21286a845bb9d11504414972c944d9b06975ba9e7680802a92a260b6246f3605ed32e5e5dec358972fbb5cab49543559dc36cb164a9c3b6a69d73
+EBUILD level-zero-1.17.42.ebuild 847 BLAKE2B 178c502c126bd22af06daba8f63f7ac2b5c808147017f3e2583d1fe0ff3ac6ed70b1bbc9c6d1e3935007be8304d0b09f125bffe15802272944363d846c4b4ab8 SHA512 6fcf7d58fed14661f1c5600dfe1a19bec1802453cb3b747d94ac8a8288f1b8ad9b4f0d3a470605aa18ee46005dc69dda442191d617d13d82dee62620533ce47a
+EBUILD level-zero-1.17.45.ebuild 848 BLAKE2B 2a96f2e41da5a7b2fb463e9ef09bb0286fb5175685201df2ca0b6f59cfc0ffb2cd6e2116d9e42fb4abf9e0fc523349c66a513fb0ce137a1784910c131da56342 SHA512 c48c444f22d0e98e6dffe1342c0b6c404cf0964079106848cc2e92bdf878df1c602ad3b01afcd94970b4696833cb6c88926ab39a4831775deb17cf12094a04dc
MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch b/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch
deleted file mode 100644
index 4d9264e0c49c..000000000000
--- a/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Find the system copy of spdlog which then tells us how to link
-against both it & libfmt correctly, rather than accidentally
-picking up system spdlog headers and nothing else (defines, needed
-libraries, etc) when (for some reason?) FetchContent fails and we don't
-realise it.
-
-TODO: Figure out why FetchContent(?) failing doesn't kill the build
-TODO: Add a proper option for this to use the system copy/not
-
-Bug: https://bugs.gentoo.org/930157
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,9 +57,6 @@ elseif(Git_FOUND)
- endif()
- endif()
-
--include(FetchContent)
--set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src")
--
- # Update other relevant variables to include the patch
- set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- set(CMAKE_PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-@@ -166,7 +163,6 @@ endif()
-
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/wrapper/include)
--include_directories(${SPDLOG_ROOT}/include)
-
- include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
-
-diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt
-index cb6cfb1..4e486d8 100644
---- a/source/utils/CMakeLists.txt
-+++ b/source/utils/CMakeLists.txt
-@@ -1,23 +1,11 @@
- # Copyright (C) 2024 Intel Corporation
- # SPDX-License-Identifier: MIT
-
--include(FetchContent)
--set(SPDLOG_REPO https://github.com/gabime/spdlog)
--set(SPDLOG_TAG v1.13.0)
--FetchContent_Declare(
-- spdlog
-- GIT_REPOSITORY ${SPDLOG_REPO}
-- GIT_TAG ${SPDLOG_TAG}
--)
--FetchContent_makeAvailable(spdlog)
-+find_package(spdlog)
-
- add_library(utils
-- STATIC
- "logging.h"
- "logging.cpp"
- )
-
--target_include_directories(utils
-- PUBLIC
-- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include
--)
-+target_link_libraries(utils spdlog::spdlog)
diff --git a/dev-libs/level-zero/level-zero-1.16.1.ebuild b/dev-libs/level-zero/level-zero-1.16.1.ebuild
deleted file mode 100644
index 2633bc02fc74..000000000000
--- a/dev-libs/level-zero/level-zero-1.16.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
-HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-
-src_prepare() {
- # Don't hardcore -Werror
- sed -e 's/-Werror//g' -i CMakeLists.txt || die
-
- cmake_src_prepare
-
- # According to upstream, release tarballs should contain this file but at least
- # some of them do not. Fortunately it is trivial to make one ourselves.
- echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
-}
diff --git a/dev-libs/level-zero/level-zero-1.16.15.ebuild b/dev-libs/level-zero/level-zero-1.16.15.ebuild
deleted file mode 100644
index 64493a4f0926..000000000000
--- a/dev-libs/level-zero/level-zero-1.16.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
-HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-libs/libfmt:=
- dev-libs/spdlog:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" )
-
-src_prepare() {
- # Don't hardcore -Werror
- sed -e 's/-Werror//g' -i CMakeLists.txt || die
-
- cmake_src_prepare
-
- # According to upstream, release tarballs should contain this file but at least
- # some of them do not. Fortunately it is trivial to make one ourselves.
- echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
-}
diff --git a/dev-libs/level-zero/level-zero-1.16.14-r1.ebuild b/dev-libs/level-zero/level-zero-1.17.42.ebuild
index 64493a4f0926..68249c1101f3 100644
--- a/dev-libs/level-zero/level-zero-1.16.14-r1.ebuild
+++ b/dev-libs/level-zero/level-zero-1.17.42.ebuild
@@ -11,16 +11,11 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
-RDEPEND="
- dev-libs/libfmt:=
- dev-libs/spdlog:=
-"
+RDEPEND="dev-libs/spdlog:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" )
-
src_prepare() {
# Don't hardcore -Werror
sed -e 's/-Werror//g' -i CMakeLists.txt || die
@@ -31,3 +26,11 @@ src_prepare() {
# some of them do not. Fortunately it is trivial to make one ourselves.
echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEM_SPDLOG="ON"
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/level-zero/level-zero-1.17.0.ebuild b/dev-libs/level-zero/level-zero-1.17.45.ebuild
index 64493a4f0926..4034c8711d28 100644
--- a/dev-libs/level-zero/level-zero-1.17.0.ebuild
+++ b/dev-libs/level-zero/level-zero-1.17.45.ebuild
@@ -13,14 +13,9 @@ LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-RDEPEND="
- dev-libs/libfmt:=
- dev-libs/spdlog:=
-"
+RDEPEND="dev-libs/spdlog:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" )
-
src_prepare() {
# Don't hardcore -Werror
sed -e 's/-Werror//g' -i CMakeLists.txt || die
@@ -31,3 +26,11 @@ src_prepare() {
# some of them do not. Fortunately it is trivial to make one ourselves.
echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEM_SPDLOG="ON"
+ )
+
+ cmake_src_configure
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-25 14:21:05 +0000