[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/

[Gonçalo Negrier Duarte]

commit:     007ed1306557352091482b32f406f06cf96e0bbf
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 20:56:08 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Tue Feb  6 20:59:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=007ed130

games-util/mangohud-0.7.0-r1: fix build error because of system spdlog

* @AdelKS to my knowladge dosen't exist anyway to add submodule using
  git-r3 so probably 9999 need to drop

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 games-util/mangohud/Manifest                                     | 2 ++
 .../mangohud/{mangohud-0.7.0.ebuild => mangohud-0.7.0-r1.ebuild} | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index d9d337f7d4..4d69654697 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,5 +1,7 @@
 DIST implot-0.16-1-meson-wrap.zip 1226 BLAKE2B 
4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18
 SHA512 
6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7
 DIST implot-0.16.tar.gz 137983 BLAKE2B 
aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7
 SHA512 
117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa9bbbb91ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919
 DIST mangohud-0.7.0.tar.gz 14892372 BLAKE2B 
436a7834743aac3f95d55031194fddd79861061010cf5eb25e81cf5eceacf4015b607a191931a85715ca0d58c8e314841d536ce83e7767a39869ab789d376c7a
 SHA512 
1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7
+DIST spdlog-1.8.5-1-wrap.zip 2211 BLAKE2B 
709d961280d83a82bbd440bdf4bafd7692227ecef38dbfc5380d971c41168017f927972855617cdd1cd36a1b8d1ed7fbb94c50a16265d593cfd132195a6cd5ab
 SHA512 
580c724059306191a2e0decbb733ffa9e667354edb6cb08a72afb7ca4f2ef6eb2d52952a59ede631f3097394373f412179adc3aaf522067980a67bfa03c71b49
+DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 
2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43
 SHA512 
77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
 DIST vulkan-headers-1.2.158-2-meson-wrap.zip 1107 BLAKE2B 
35e4bb1f7410a009243fe7d4a4ba6cede7f01e0b56ad6ff72ad30c00c2452bd6d2a4fb44ab92c296147e2506a92acc6de1f817cb5433b96d66652cbcd8885595
 SHA512 
30cbbb90580399839e1bba8881b9b8cc33fdeead93f37d5f3398c9d53fb3ab050ca2562fd68f376fa4ee0825ee3787f560d70d55a170c780dd575ff2eeb66efd
 DIST vulkan-headers-1.2.158.tar.gz 831647 BLAKE2B 
792d7e895e27c4a8fbc93fc4d9c9e696d2ceb946e745709c050c0693b77afbeb6411a4267fc59508ddeb58167d469349fedc1c5d4b4a7415b590c97248b244bc
 SHA512 
f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91

diff --git a/games-util/mangohud/mangohud-0.7.0.ebuild 
b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
similarity index 88%
rename from games-util/mangohud/mangohud-0.7.0.ebuild
rename to games-util/mangohud/mangohud-0.7.0-r1.ebuild
index 4735f458e9..67a1c765e9 100644
--- a/games-util/mangohud/mangohud-0.7.0.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -15,12 +15,15 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud";
 
 VK_HEADERS_VER="1.2.158"
 VK_HEADERS_MESON_WRAP_VER="2"
+SPDLOG_VER="1.8.5"
 
 SRC_URI="
        
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
                -> vulkan-headers-${VK_HEADERS_VER}.tar.gz
        
https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch
                -> 
vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
+       
https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> 
spdlog-${SPDLOG_VER}.tar.gz
+       https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> 
spdlog-${SPDLOG_VER}-1-wrap.zip
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -93,6 +96,10 @@ src_unpack() {
        unpack vulkan-headers-${VK_HEADERS_VER}.tar.gz
        unpack 
vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
        mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || 
die
+       # fix build error by using specify version of spdlog
+       unpack spdlog-${SPDLOG_VER}.tar.gz
+       unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+       mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
 }
 
 src_prepare() {
@@ -107,7 +114,7 @@ src_prepare() {
 src_configure() {
        local emesonargs=(
                -Dappend_libdir_mangohud=false
-               -Duse_system_spdlog=enabled
+               -Duse_system_spdlog=disabled
                -Dinclude_doc=false
                $(meson_feature video_cards_nvidia with_nvml)
                $(meson_feature xnvctrl with_xnvctrl)