commit: 8d4c451d2aa0b9df348d983bf5028b0bc199e38f
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 01:41:44 2024 +0000
Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 01:43:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d4c451d
games-util/mangohud: propragate spdlog fix to 9999
* improve comments for spdlog fix
* add myself as proxy mantainer
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/Manifest | 2 ++
games-util/mangohud/mangohud-0.7.0-r1.ebuild | 4 +++-
games-util/mangohud/mangohud-9999.ebuild | 12 ++++++++++--
games-util/mangohud/metadata.xml | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index 4d69654697..ad59a61752 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,6 +1,8 @@
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.13.0-1-wrap.zip 2959 BLAKE2B
13744264cfab96ff51f033300182b8937959e7bf74851d7cff26b7e9c05109518b0623a71bfc326951d86c43d104a1bb1700cd45e69ebd41683726e9764f630b
SHA512
59c5d50ee1c14a1b43aa3000a591d9fd2bc4c9ff043b23d25be896ca9a34c1c392c26240ed58a5e877231c09fd1b28012f58b3c403d0370cf5dd9169587a8de4
+DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B
8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929
SHA512
44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
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
diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
index 67a1c765e9..f6022d6d7a 100644
--- a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -96,7 +96,8 @@ 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
+
+ # fix build error by using upstream submodule version of spdlog
unpack spdlog-${SPDLOG_VER}.tar.gz
unpack spdlog-${SPDLOG_VER}-1-wrap.zip
mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
@@ -112,6 +113,7 @@ src_prepare() {
}
src_configure() {
+ # disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
-Duse_system_spdlog=disabled
diff --git a/games-util/mangohud/mangohud-9999.ebuild
b/games-util/mangohud/mangohud-9999.ebuild
index 3fba65ec23..31854ad3e4 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -18,6 +18,7 @@ VK_HEADERS_MESON_WRAP_VER="2"
IMPLOT_VER="0.16"
IMPLOT_MESON_WRAP_VER="1"
+SPDLOG_VER="1.13.0"
SRC_URI="
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
@@ -28,6 +29,8 @@ SRC_URI="
-> implot-${IMPLOT_VER}.tar.gz
https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_MESON_WRAP_VER}/get_patch
-> implot-${IMPLOT_VER}-${IMPLOT_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
@@ -61,7 +64,6 @@ RDEPEND="
${PYTHON_DEPS}
~media-libs/imgui-1.81[opengl,vulkan]
dev-cpp/nlohmann_json
- dev-libs/spdlog
dev-util/glslang
media-fonts/lato
media-libs/vulkan-loader
@@ -107,6 +109,11 @@ src_unpack() {
cd "${S}/subprojects/implot-${IMPLOT_VER}" || die
eapply "${FILESDIR}/implot-v0.16-fix-imgui-dep.patch"
+
+ # fix build error by using upstream submodule 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() {
@@ -119,9 +126,10 @@ src_prepare() {
}
src_configure() {
+ # disable system spdlog in favor of the submodule version
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)
diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml
index ef677c607a..467717705c 100644
--- a/games-util/mangohud/metadata.xml
+++ b/games-util/mangohud/metadata.xml
@@ -5,7 +5,11 @@
<email>[email protected]</email>
<name>Adel KARA SLIMANE</name>
</maintainer>
- <upstream>
+ <maintainer type="person">
+ <email>[email protected]</email>
+ <name>Gonçalo Negrier Duarte</name>
+ </maintainer>
+ <upstream>
<remote-id type="github">flightlessmango/MangoHud</remote-id>
<bugs-to>https://github.com/flightlessmango/MangoHud/issues</bugs-to>
</upstream>
