diff options
Diffstat (limited to 'graphics/mangohud')
-rw-r--r-- | graphics/mangohud/README | 6 | ||||
-rw-r--r-- | graphics/mangohud/doinst.sh | 5 | ||||
-rw-r--r-- | graphics/mangohud/mangohud.SlackBuild | 52 | ||||
-rw-r--r-- | graphics/mangohud/mangohud.info | 22 | ||||
-rw-r--r-- | graphics/mangohud/slack-desc | 2 |
5 files changed, 48 insertions, 39 deletions
diff --git a/graphics/mangohud/README b/graphics/mangohud/README index e9caaf0449..f0410f70b4 100644 --- a/graphics/mangohud/README +++ b/graphics/mangohud/README @@ -14,8 +14,4 @@ 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. +nlohmann_json. diff --git a/graphics/mangohud/doinst.sh b/graphics/mangohud/doinst.sh new file mode 100644 index 0000000000..4110f5514d --- /dev/null +++ b/graphics/mangohud/doinst.sh @@ -0,0 +1,5 @@ +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/graphics/mangohud/mangohud.SlackBuild b/graphics/mangohud/mangohud.SlackBuild index f087509562..a46883284c 100644 --- a/graphics/mangohud/mangohud.SlackBuild +++ b/graphics/mangohud/mangohud.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for mangohud -# Copyright 2022 Steven Voges <svoges.sbo@gmail.com> +# Copyright 2022-2023 Steven Voges <Oregon, USA> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,17 +26,15 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mangohud SRCNAM=MangoHud -VERSION=${VERSION:-0.6.7.1} -SRCVER=${SRCVER:-0.6.7-1} -IMGUIVER=${IMGUIVER:-1.81} -SPDLOGVER=${SPDLOGVER:-1.8.5} +VERSION=${VERSION:-0.6.9.1} +SRCVER=${SRCVER:-0.6.9-1} +IMGUI=${IMGUI:-1.81} +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} -SYSVULKAN=${SYSVULKAN:-enabled} -MANGOAPP=${MANGOAPP:-true} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -51,7 +49,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -70,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 @@ -78,16 +84,19 @@ cd $TMP rm -rf $SRCNAM-$SRCVER tar xvf $CWD/$SRCNAM-$SRCVER.tar.?z cd $SRCNAM-$SRCVER/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 +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 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 +#Fix install_tag warnings that may become errors in the future. +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 \ @@ -107,7 +116,7 @@ cd build --mandir=/usr/man \ --prefix=/usr \ --sysconfdir=/etc \ - -Duse_system_vulkan=$SYSVULKAN \ + -Duse_system_spdlog=enabled \ -Dwith_xnvctrl=$XNVCTRL \ -Dmangoapp=$MANGOAPP ninja @@ -131,9 +140,9 @@ if [ "$COMPAT32" = "yes" ]; then --mandir=/usr/man \ --prefix=/usr \ --sysconfdir=/etc \ - -Duse_system_vulkan=$SYSVULKAN \ + -Duse_system_spdlog=enabled \ -Dwith_xnvctrl=$XNVCTRL \ - -Dmangoapp=$MANGOAPP + -Dmangoapp=false ninja DESTDIR=$PKG ninja install cd .. @@ -155,6 +164,7 @@ rm -rf $PKG/usr/share/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/graphics/mangohud/mangohud.info b/graphics/mangohud/mangohud.info index c67b250176..2c56637691 100644 --- a/graphics/mangohud/mangohud.info +++ b/graphics/mangohud/mangohud.info @@ -1,20 +1,18 @@ PRGNAM="mangohud" -VERSION="0.6.7.1" +VERSION="0.6.9.1" HOMEPAGE="https://github.com/flightlessmango/MangoHud" -DOWNLOAD="https://github.com/flightlessmango/MangoHud/archive/v0.6.7-1/MangoHud-0.6.7-1.tar.gz \ +DOWNLOAD="https://github.com/flightlessmango/MangoHud/archive/v0.6.9-1/MangoHud-0.6.9-1.tar.gz \ + https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.158/Vulkan-Headers-1.2.158.tar.gz \ + https://github.com/mesonbuild/wrapdb/releases/download/vulkan-headers_1.2.158-2/vulkan-headers_1.2.158-2_patch.zip \ https://github.com/ocornut/imgui/archive/v1.81/imgui-1.81.tar.gz \ - 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="61f3a5e392cb08fc1c263ea89781b0d4 \ + https://github.com/mesonbuild/wrapdb/releases/download/imgui_1.81-1/imgui_1.81-1_patch.zip" +MD5SUM="572b748eabd3b61443301991b177eb9b \ + 44245ecbc0c428b1c8db58089eb59821 \ + 4c47a8c306c495f94d2ec2fe8f611178 \ 9b48ac38829b538233f99c0aa8cacf50 \ - ea266ae77ac14290ceb2eafa56c1de83 \ - 8755cdbc857794730a022722a66d431a \ - 73a3c3149a4aa2b105aeef3a1d45bcb0 \ - 3cea575f0b559e2609507a5ee6469dea" + ea266ae77ac14290ceb2eafa56c1de83" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="glfw3 %README%" +REQUIRES="glfw3 nlohmann_json spdlog" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" diff --git a/graphics/mangohud/slack-desc b/graphics/mangohud/slack-desc index 28ac83f9e1..e8c616c788 100644 --- a/graphics/mangohud/slack-desc +++ b/graphics/mangohud/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -mangohud: mangohud (Vulkan/OpenGL Overlay) +mangohud: mangohud (Performance Overlay) mangohud: mangohud: MangoHud is a Vulkan and OpenGL overlay for monitoring FPS, mangohud: temperatures, CPU/GPU load and more. |