4 files changed, 69 insertions, 19 deletions
diff --git a/graphics/mangohud/README b/graphics/mangohud/README
index 744dab131595b..e9caaf0449b2c 100644
--- a/graphics/mangohud/README
+++ b/graphics/mangohud/README
@@ -10,3 +10,12 @@ Vulkan-Headers. Since Slackware ships with vulkan-sdk, we
 enable system headers by default. To disable this feature
 and restore default behavior, pass SYSVULKAN=disabled to
 the build script.
+
+This SlackBuild defaults to building mangoapp as well. To
+disable this behavior, pass MANGOAPP=false to the build
+script. This removes the dependency on glfw3 and
+nlohmann_json's include.zip
+
+If you would like multilib support, pass COMPAT32=yes to
+the build script. Please note that this only adds 32bit
+support for mangohud, NOT mangoapp.
diff --git a/graphics/mangohud/mangohud.SlackBuild b/graphics/mangohud/mangohud.SlackBuild
index 8b295e869320a..148bdbdfaa12e 100644
--- a/graphics/mangohud/mangohud.SlackBuild
+++ b/graphics/mangohud/mangohud.SlackBuild
@@ -25,13 +25,17 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mangohud
-VERSION=${VERSION:-0.6.6_1}
-RLSVRS=${RLSVRS:-0.6.6-1}
+SRCNAM=MangoHud
+VERSION=${VERSION:-0.6.7}
+IMGUIVER=${IMGUIVER:-1.81}
+SPDLOGVER=${SPDLOGVER:-1.8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
+COMPAT32=${COMPAT32:-no}
 XNVCTRL=${XNVCTRL:-disabled}
 SYSVULKAN=${SYSVULKAN:-enabled}
+MANGOAPP=${MANGOAPP:-true}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,14 +77,16 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf MangoHud-$VERSION
-rm -rf MangoHud-$RLSVRS
-tar xvf $CWD/MangoHud-$RLSVRS.tar.?z
-cd MangoHud-$RLSVRS/subprojects
-tar xvf $CWD/imgui-1.81.tar.gz
-unzip $CWD/imgui_1.81-1_patch.zip
-tar xvf $CWD/spdlog-1.8.5.tar.gz
-unzip $CWD/spdlog_1.8.5-1_patch.zip
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z
+cd $SRCNAM-$VERSION/subprojects
+tar xvf $CWD/imgui-$IMGUIVER.tar.gz
+unzip $CWD/imgui_$IMGUIVER-1_patch.zip
+tar xvf $CWD/spdlog-$SPDLOGVER.tar.gz
+unzip $CWD/spdlog_$SPDLOGVER-1_patch.zip
+if [ "$MANGOAPP" = "true" ]; then
+  unzip $CWD/include.zip -d nlohmann_json-3.10.5
+fi
 cd ..
 chown -R root:root .
 
@@ -104,11 +110,36 @@ cd build
     --prefix=/usr \
     --sysconfdir=/etc \
      -Duse_system_vulkan=$SYSVULKAN \
-     -Dwith_xnvctrl=$XNVCTRL
+     -Dwith_xnvctrl=$XNVCTRL \
+     -Dmangoapp=$MANGOAPP
   ninja
   DESTDIR=$PKG ninja install
 cd ..
 
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir build32
+  cd build32
+    CC="gcc -m32" \
+    CXX="g++ -m32" \
+    CFLAGS="$SLKCFLAGS" \
+    CXXFLAGS="$SLKCFLAGS" \
+    LDFLAGS="-L/usr/lib" \
+    PKG_CONFIG_PATH="/usr/lib/pkgconfig" \
+    meson .. \
+      --buildtype=release \
+      --infodir=/usr/info \
+      --libdir=/usr/lib \
+      --localstatedir=/var \
+      --mandir=/usr/man \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+       -Duse_system_vulkan=$SYSVULKAN \
+       -Dmangoapp=$MANGOAPP
+    ninja
+    DESTDIR=$PKG ninja install
+  cd ..
+fi
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -116,9 +147,13 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md meson_options.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+mv $PKG/usr/share/doc/$PRGNAM/$SRCNAM.conf.example \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
+rm -rf $PKG/usr/share/doc
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/graphics/mangohud/mangohud.info b/graphics/mangohud/mangohud.info
index d7d862c54e89c..48757439571f1 100644
--- a/graphics/mangohud/mangohud.info
+++ b/graphics/mangohud/mangohud.info
@@ -1,14 +1,20 @@
 PRGNAM="mangohud"
-VERSION="0.6.6_1"
+VERSION="0.6.7"
 HOMEPAGE="https://github.com/flightlessmango/MangoHud"
-DOWNLOAD="https://github.com/flightlessmango/MangoHud/archive/v0.6.6-1/MangoHud-0.6.6-1.tar.gz \
+DOWNLOAD="https://github.com/flightlessmango/MangoHud/archive/v0.6.7/MangoHud-0.6.7.tar.gz \
           https://github.com/ocornut/imgui/archive/v1.81/imgui-1.81.tar.gz \
-          https://github.com/gabime/spdlog/archive/v1.8.5/spdlog-1.8.5.tar.gz"
-MD5SUM="a7949eea27f27acbc93a70416747c295 \
+          https://github.com/mesonbuild/wrapdb/releases/download/imgui_1.81-1/imgui_1.81-1_patch.zip \
+          https://github.com/gabime/spdlog/archive/v1.8.5/spdlog-1.8.5.tar.gz \
+          https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.8.5-1/spdlog_1.8.5-1_patch.zip \
+          https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip"
+MD5SUM="0a749dce36dc158d12bd9d77b3e0815e \
         9b48ac38829b538233f99c0aa8cacf50 \
-        8755cdbc857794730a022722a66d431a"
+        ea266ae77ac14290ceb2eafa56c1de83 \
+        8755cdbc857794730a022722a66d431a \
+        73a3c3149a4aa2b105aeef3a1d45bcb0 \
+        3cea575f0b559e2609507a5ee6469dea"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="glfw3 %README%"
 MAINTAINER="Steven Voges"
 EMAIL="svoges.sbo@gmail.com"
diff --git a/graphics/mangohud/slack-desc b/graphics/mangohud/slack-desc
index 01a887e6ee3f5..28ac83f9e1150 100644
--- a/graphics/mangohud/slack-desc
+++ b/graphics/mangohud/slack-desc
@@ -11,7 +11,7 @@ mangohud:
 mangohud: MangoHud is a Vulkan and OpenGL overlay for monitoring FPS,
 mangohud: temperatures, CPU/GPU load and more.
 mangohud:
-mangohud:
+mangohud: Homepage: https://github.com/flightlessmango/MangoHud
 mangohud:
 mangohud:
 mangohud: