gentoo auto-resync : 21:04:2024 - 12:05:28

3 files changed, 69 insertions, 2 deletions

diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index c34691cb91dd..21bd3d976646 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,6 @@
+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
 EBUILD level-zero-1.16.1.ebuild 708 BLAKE2B 1df2181b8e7096b46b6220eb70fdba8f6defc1c69ff6dd71415c27fa50e8581ae07d40884044dcbee82888a31e6294e2ccc7bb4b888ef4fe398b1de36d4bf415 SHA512 73ac2820957a7a3b508bb1f7472ecdcf9550d091331f63c5e8cffcade3993c33ab69383de5bb6a66a67390e604deb326128c7e608118105eab642d9322a30ad4
-EBUILD level-zero-1.16.14.ebuild 737 BLAKE2B cf27cf65beac58bd5d745b172780399d6481a8db7563e949fbbea328a8133ee8f04da7c6871c68becdc2bc38a4989a60900292e1b23673ac6b348a816c2b2de9 SHA512 031f720608bab8377c3e54f448bca466c2f1e4fb90a774e9b1b3e36d5dad68cceaacc5c9b6f4b4a81e11c6a2d05b5678ef58296643dd80f6d21cf80da74aa0c7
+EBUILD level-zero-1.16.14-r1.ebuild 841 BLAKE2B 953e48b6d6cbabd5f2ecbbe60a2bdeb81e6db93a647cd090e8aebfd88c977af15de34ae4dd5afec91a0a10949a6ba5bfb4ba29107ef1ad2665d86448cf982751 SHA512 ddcfda3f82fd09e617a175446df9c7de4ca23e6ec5eba6c0efb1636b694cb9c1d6300ea0df90133d254d847975e8cc1942e8d6f9325e9fa2d5653f7bf0d14e4f
 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
new file mode 100644
index 000000000000..4d9264e0c49c
--- /dev/null
+++ b/dev-libs/level-zero/files/level-zero-1.16.14-spdlog-libfmt.patch
@@ -0,0 +1,60 @@
+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.14.ebuild b/dev-libs/level-zero/level-zero-1.16.14-r1.ebuild
index 4afcd285ad24..64493a4f0926 100644
--- a/dev-libs/level-zero/level-zero-1.16.14.ebuild
+++ b/dev-libs/level-zero/level-zero-1.16.14-r1.ebuild
@@ -13,7 +13,13 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 
-DEPEND="dev-libs/spdlog:="
+RDEPEND="
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16.14-spdlog-libfmt.patch" )
 
 src_prepare() {
 	# Don't hardcore -Werror