1 files changed, 16 insertions, 9 deletions
diff --git a/graphics/mangohud/mangohud.SlackBuild b/graphics/mangohud/mangohud.SlackBuild
index 7f0af7689e56f..a46883284c460 100644
--- a/graphics/mangohud/mangohud.SlackBuild
+++ b/graphics/mangohud/mangohud.SlackBuild
@@ -26,17 +26,15 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mangohud
 SRCNAM=MangoHud
-VERSION=${VERSION:-0.6.9}
-SRCVER=${SRCVER:-0.6.9}
+VERSION=${VERSION:-0.6.9.1}
+SRCVER=${SRCVER:-0.6.9-1}
 IMGUI=${IMGUI:-1.81}
-SPDLOG=${SPDLOG:-1.8.5}
 VULKANHEADERS=${VULKANHEADERS:-1.2.158}
+XNVCTRL=${XNVCTRL:-disabled}
+MANGOAPP=${MANGOAPP:-true}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-COMPAT32=${COMPAT32:-no}
-XNVCTRL=${XNVCTRL:-disabled}
-MANGOAPP=${MANGOAPP:-true}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,6 +67,15 @@ else
   LIBDIRSUFFIX=""
 fi
 
+#Test for multilib
+COMPAT32=${COMPAT32@L}
+COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )"
+cd $COMPATTMP
+echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c"
+gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 && COMPAT32=${COMPAT32:-yes}
+cd - >/dev/null 2>&1
+rm -rf "$COMPATTMP"
+
 set -e
 
 rm -rf $PKG
@@ -81,10 +88,7 @@ tar xvf $CWD/Vulkan-Headers-$VULKANHEADERS.tar.gz
 unzip $CWD/vulkan-headers_$VULKANHEADERS-2_patch.zip
 tar xvf $CWD/imgui-$IMGUI.tar.gz
 unzip $CWD/imgui_$IMGUI-1_patch.zip
-tar xvf $CWD/spdlog-$SPDLOG.tar.gz
-unzip $CWD/spdlog_$SPDLOG-1_patch.zip
 cd ..
-chown -R root:root .
 
 #Slackware 15.0 ships meson 59.4, and mangohud requires 60.0, so we patch it.
 sed -i "s/0.60.0/0.59.4/g" meson.build
@@ -92,6 +96,7 @@ sed -i "s/0.60.0/0.59.4/g" meson.build
 sed -i "/install_tag/d" data/meson.build
 sed -i "/install_tag/d" src/meson.build
 
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
@@ -111,6 +116,7 @@ cd build
     --mandir=/usr/man \
     --prefix=/usr \
     --sysconfdir=/etc \
+     -Duse_system_spdlog=enabled \
      -Dwith_xnvctrl=$XNVCTRL \
      -Dmangoapp=$MANGOAPP
   ninja
@@ -134,6 +140,7 @@ if [ "$COMPAT32" = "yes" ]; then
       --mandir=/usr/man \
       --prefix=/usr \
       --sysconfdir=/etc \
+       -Duse_system_spdlog=enabled \
        -Dwith_xnvctrl=$XNVCTRL \
        -Dmangoapp=false
     ninja