WIP

Author: flightlessmango

.github/workflows/arch-package.yml

@@ -19,7 +19,7 @@ jobs:
           echo "ParallelDownloads = 10" >> /etc/pacman.conf
           echo "\n" && echo "[multilib]" >> /etc/pacman.conf
           echo "Include = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
-          pacman -Syu base-devel sudo meson python-mako glslang hub python-numpy python-matplotlib --noconfirm
+          pacman -Syu base-devel --noconfirm
       - name: makepkg
         run: |
           useradd -m builduser

.github/workflows/build-debug.yml

@@ -0,0 +1,47 @@
+name: Build debug release package
+
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install build tools
+        shell: bash
+        run: |
+          set -euxo pipefail
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          source ./build_deps.sh
+          sudo apt -o Acquire::Queue-Mode=access -y install ${DEPS_DEBIAN//,/ }
+      - name: Prepare artifact variables
+        id: git-vars
+        shell: bash
+        run: |
+          set -euxo pipefail
+          short_sha="$(git rev-parse --short=12 "$GITHUB_SHA")"
+          # For push events, this is the branch or tag name without refs/* prefix
+          ref_name="${GITHUB_REF_NAME}"
+
+          artifact_name="MangoHud-debug-${ref_name}-${short_sha}-${GITHUB_RUN_NUMBER}"
+          echo "artifact-name=$artifact_name" >> "$GITHUB_OUTPUT"
+
+      - name: Build and package
+        shell: bash
+        run: |
+          set -euxo pipefail
+          ./build-source.sh
+          ./build.sh build_dbg -Dwerror=true package release
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.git-vars.outputs.artifact-name }}
+          path: build/MangoHud-*.tar.gz
+          if-no-files-found: error
+          retention-days: 30

.github/workflows/build-package.yml

@@ -14,14 +14,8 @@ jobs:
           set -x
           sudo dpkg --add-architecture i386
           sudo apt update
-          sudo apt -y install gcc-multilib g++-multilib ninja-build python3-setuptools \
-                              python3-wheel mesa-common-dev libxnvctrl-dev libdbus-1-dev \
-                              python3-numpy python3-matplotlib unzip libxkbcommon-dev libwayland-dev wget unzip \
-                              libxkbcommon-dev:i386 libwayland-dev:i386 gh python3-mako meson pkgconf pkg-config
-          wget https://github.com/KhronosGroup/glslang/releases/download/SDK-candidate-26-Jul-2020/glslang-master-linux-Release.zip
-          unzip glslang-master-linux-Release.zip bin/glslangValidator
-          sudo install -m755 bin/glslangValidator /usr/local/bin/
-          command -v pkg-config && pkg-config --version
+          source ./build_deps.sh
+          sudo apt -o Acquire::Queue-Mode=access -y install ${DEPS_DEBIAN//,/ }
       - name: Prepare Artifact Git Info
         shell: bash
         run: |
@@ -39,15 +33,23 @@ jobs:
       - name: Build and package
         run: |
           ./build-source.sh
-          ./build.sh build -Dwerror=true package release
+          if [ -d /out ]; then
+            ./build.sh build_dbg -Dwerror=true package release
+          else
+            ./build.sh build -Dwerror=true package release
+          fi
       - name: Upload assets to release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          tag_name="${GITHUB_REF##*/}"
-          for pkg in ./build/*.tar.*; do
-            gh release upload "$tag_name" "$pkg" --clobber
-          done
+          if [ -d /out ]; then
+            cp ./build/*.tar.* /out
+          else
+            tag_name="${GITHUB_REF##*/}"
+            for pkg in ./build/*.tar.*; do
+              gh release upload "$tag_name" "$pkg" --clobber
+            done
+          fi
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

.github/workflows/build-source.yml

@@ -15,10 +15,12 @@ jobs:
         run: |
           set -x
           apt update
-          apt -y install gcc g++ ninja-build python3-pip python3-setuptools \
-                         python3-wheel pkg-config mesa-common-dev libx11-dev \
-                         libxnvctrl-dev libdbus-1-dev glslang-tools hub libxkbcommon-dev \
-                         libwayland-dev wget unzip python3-mako meson
+          source ./build_deps.sh
+          DEPS_NO_I386="$(printf '%s' "$DEPS_DEBIAN" \
+              | tr ',' '\n' \
+              | grep -v ':i386' \
+              | tr '\n' ' ')"
+          sudo apt -o Acquire::Queue-Mode=access -y install hub $DEPS_NO_I386
           ./build-source.sh
           assets=()
           for asset in ./MangoHud-*-Source*.tar.*; do

.github/workflows/mingw.yml

@@ -15,21 +15,12 @@ jobs:
     - name: 'Install prerequisites'
       run: |
         sudo apt-get update
-        sudo apt-get install -y \
-          appstream \
-          glslang-tools \
-          ninja-build \
-          python3-mako \
-          python3-setuptools \
-          python3-wheel \
-          mesa-common-dev \
-          libcmocka-dev \
-          libdbus-1-dev \
-          libglfw3-dev \
-          libwayland-dev \
-          libxnvctrl-dev \
-          libxkbcommon-dev \
-          meson
+          source ./build_deps.sh
+          DEPS_NO_I386="$(printf '%s' "$DEPS_DEBIAN" \
+              | tr ',' '\n' \
+              | grep -v ':i386' \
+              | tr '\n' ' ')"
+          sudo apt -o Acquire::Queue-Mode=access -y install $DEPS_NO_I386
     - name: 'Install clang'
       if:  ${{ (matrix.compiler == 'clang') }}
       run: |

.github/workflows/ubuntu.yml

@@ -44,6 +44,9 @@ subprojects/spdlog-*/
 subprojects/nlohmann_json-*/
 subprojects/implot-*/
 subprojects/cmocka/
+subprojects/yaml-cpp*
+pkgbuild/*
+!pkgbuild/PKGBUILD
 
 #GNU Global Metadata
 **/GPATH

.gitignore

@@ -38,6 +38,7 @@ mangohud_uninstall() {
     rm -frv "/usr/share/doc/mangohud"
     rm -fv "/usr/share/man/man1/mangohud.1"
     rm -fv "/usr/bin/mangohud"
+    rm -fv "/usr/bin/mangohud-server"
     rm -fv "/usr/bin/mangoplot"
     rm -fv "/usr/bin/mangohud.x86"
 }
@@ -73,6 +74,7 @@ mangohud_install() {
     /usr/bin/install -Dvm644 ./usr/share/man/man1/mangohud.1 /usr/share/man/man1/mangohud.1
     /usr/bin/install -Dvm644 ./usr/share/doc/mangohud/MangoHud.conf.example /usr/share/doc/mangohud/MangoHud.conf.example
     /usr/bin/install -vm755  ./usr/bin/mangohud /usr/bin/mangohud
+    /usr/bin/install -vm755  ./usr/bin/mangohud-server /usr/bin/mangohud-server
     /usr/bin/install -vm755  ./usr/bin/mangoplot /usr/bin/mangoplot
 
     ln -sv $DEFAULTLIB /usr/lib/mangohud/lib

bin/mangohud-setup.sh

@@ -15,7 +15,7 @@ cs2.sh
 RiseOfTheTombRaider.sh
 "
 
-MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_shim.so"
+MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud.so"
 
 if [ "$1" = "--version" ]; then
     echo @version@
@@ -39,6 +39,11 @@ for exe in $DISABLE_LD_PRELOAD; do
         break
     fi
 done
+# TODO This is experimental and we might break steam overlay
+is_proton=false
+if [ -n "${STEAM_COMPAT_PROTON-}" ] || [ -n "${STEAM_COMPAT_DATA_PATH-}" ]; then
+    is_proton=true
+fi
 
 if [ "$disable_preload" = true ]; then
     exec env MANGOHUD=1 "$@"
@@ -51,7 +56,11 @@ else
         (*)
             # Preload using the plain filenames of the libs, the dynamic linker will
             # figure out whether the 32 or 64 bit version should be used
-            LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
+            if [ "$is_proton" = true ]; then
+                LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}"
+            else
+                LD_PRELOAD="${MANGOHUD_LIB_NAME}${LD_PRELOAD:+$LD_PRELOAD:}"
+            fi
     esac
 
     exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@"

bin/mangohud.in

@@ -151,8 +151,9 @@ configure() {
     if [[ ! -f "build/meson32/build.ninja" && "$MACHINE" = "x86_64" ]]; then
         export CC="gcc -m32"
         export CXX="g++ -m32"
+        export LDFLAGS=-m32
         export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig:${PKG_CONFIG_PATH_32}"
-        meson setup build/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false $@ ${CONFIGURE_OPTS}
+        meson setup build/meson32 --libdir lib/mangohud/lib32 --prefix /usr -Dappend_libdir_mangohud=false -Dwith_server=false $@ ${CONFIGURE_OPTS}
     fi
 }
 
@@ -163,7 +164,7 @@ build() {
     DESTDIR="$PWD/build/release" ninja -C build/meson64 install
 
     if [ "$MACHINE" = "x86_64" ]; then
-        DESTDIR="$PWD/build/release" ninja -C build/meson32 install
+        DESTDIR="$PWD/build/release"/ ninja -C build/meson32 install
     fi
 
     sed -i 's:/usr/\\$LIB:/usr/lib/mangohud/\\$LIB:g' "$PWD/build/release/usr/bin/mangohud"
@@ -194,6 +195,7 @@ uninstall() {
     rm -rfv "/usr/lib/mangohud"
     rm -rfv "/usr/share/doc/mangohud"
     rm -fv "/usr/share/man/man1/mangohud.1"
+    rm -fv "/usr/bin/mangohud-server"
     rm -fv "/usr/share/vulkan/implicit_layer.d/mangohud.json"
     rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.json"
     rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json"
@@ -229,19 +231,20 @@ install() {
 
     echo DEFAULTLIB: $DEFAULTLIB
     /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib64/libMangoHud.so /usr/lib/mangohud/lib64/libMangoHud.so
-    /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib64/libMangoHud_opengl.so /usr/lib/mangohud/lib64/libMangoHud_opengl.so
-    /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib64/libMangoHud_shim.so /usr/lib/mangohud/lib64/libMangoHud_shim.so
+    # /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib64/libMangoHud_opengl.so /usr/lib/mangohud/lib64/libMangoHud_opengl.so
+    # /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib64/libMangoHud_shim.so /usr/lib/mangohud/lib64/libMangoHud_shim.so
     if [ "$MACHINE" = "x86_64" ]; then
       /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib32/libMangoHud.so /usr/lib/mangohud/lib32/libMangoHud.so
-      /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib32/libMangoHud_opengl.so /usr/lib/mangohud/lib32/libMangoHud_opengl.so
-      /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib32/libMangoHud_shim.so /usr/lib/mangohud/lib32/libMangoHud_shim.so
+    #   /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib32/libMangoHud_opengl.so /usr/lib/mangohud/lib32/libMangoHud_opengl.so
+    #   /usr/bin/install -Dvm644 ./build/release/usr/lib/mangohud/lib32/libMangoHud_shim.so /usr/lib/mangohud/lib32/libMangoHud_shim.so
     fi
 
     /usr/bin/install -Dvm644 ./build/release/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json /usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json
     /usr/bin/install -Dvm644 ./build/release/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json /usr/share/vulkan/implicit_layer.d/MangoHud.x86.json
     /usr/bin/install -Dvm644 ./build/release/usr/share/man/man1/mangohud.1 /usr/share/man/man1/mangohud.1
     /usr/bin/install -Dvm644 ./build/release/usr/share/doc/mangohud/MangoHud.conf.example /usr/share/doc/mangohud/MangoHud.conf.example
     /usr/bin/install -vm755  ./build/release/usr/bin/mangohud /usr/bin/mangohud
+    /usr/bin/install -vm755  ./build/release/usr/bin/mangohud-server /usr/bin/mangohud-server
     /usr/bin/install -vm755  ./build/release/usr/bin/mangoplot /usr/bin/mangoplot
 
     ln -sv $DEFAULTLIB /usr/lib/mangohud/lib
@@ -288,7 +291,7 @@ reinstall() {
 
 clean() {
     rm -rf "build"
-    rm -rf subprojects/*/
+    find subprojects -mindepth 1 -maxdepth 1 -type d ! -name packagefiles -exec rm -rf -- {} +
 }
 
 usage() {