commit:     aecae388f667c82eebac21fe1cdcf39d6df93147
Author:     Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sat Apr 13 15:53:07 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Apr 13 15:53:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aecae388

games-util/mangohud: minor ebuild code improvement

Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>

 games-util/mangohud/mangohud-0.7.1.ebuild | 18 ++++++++++++------
 games-util/mangohud/mangohud-9999.ebuild  | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/games-util/mangohud/mangohud-0.7.1.ebuild 
b/games-util/mangohud/mangohud-0.7.1.ebuild
index 5260457e43..56583d7753 100644
--- a/games-util/mangohud/mangohud-0.7.1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1.ebuild
@@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud";
 VK_HEADERS_VER="1.2.158"
 VK_HEADERS_MESON_WRAP_VER="2"
 SPDLOG_VER="1.13.0"
+SPDLOG_WRAP_VER="1"
 IMPLOT_VER="0.16"
+IMPLOT_WRAP_VER="1"
 
 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
-       
https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> 
implot-${IMPLOT_VER}.tar.gz
-       https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> 
implot-${IMPLOT_VER}-1-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}-${SPDLOG_WRAP_VER}/get_patch
+               -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
+       
https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz
+               -> implot-${IMPLOT_VER}.tar.gz
+       
https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch
+               -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -101,11 +107,11 @@ src_unpack() {
 
        # fix build error by using upstream submodule version of spdlog
        unpack spdlog-${SPDLOG_VER}.tar.gz
-       unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+       unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
        mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
 
        unpack implot-${IMPLOT_VER}.tar.gz
-       unpack implot-${IMPLOT_VER}-1-wrap.zip
+       unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
        mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die
 }
 

diff --git a/games-util/mangohud/mangohud-9999.ebuild 
b/games-util/mangohud/mangohud-9999.ebuild
index 5260457e43..56583d7753 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud";
 VK_HEADERS_VER="1.2.158"
 VK_HEADERS_MESON_WRAP_VER="2"
 SPDLOG_VER="1.13.0"
+SPDLOG_WRAP_VER="1"
 IMPLOT_VER="0.16"
+IMPLOT_WRAP_VER="1"
 
 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
-       
https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> 
implot-${IMPLOT_VER}.tar.gz
-       https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> 
implot-${IMPLOT_VER}-1-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}-${SPDLOG_WRAP_VER}/get_patch
+               -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
+       
https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz
+               -> implot-${IMPLOT_VER}.tar.gz
+       
https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch
+               -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -101,11 +107,11 @@ src_unpack() {
 
        # fix build error by using upstream submodule version of spdlog
        unpack spdlog-${SPDLOG_VER}.tar.gz
-       unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+       unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
        mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
 
        unpack implot-${IMPLOT_VER}.tar.gz
-       unpack implot-${IMPLOT_VER}-1-wrap.zip
+       unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
        mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die
 }
 

Reply via email to