From d9573dbfe5602022431ce4e910e4ca540fc9d56f Mon Sep 17 00:00:00 2001
From: ashuntu <ashton.nelson@canonical.com>
Date: Thu, 20 Jun 2024 09:09:31 -0500
Subject: [PATCH 1/2] Update MangoHUD to 0.6.9-1

---
 snap/snapcraft.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index baf8a16..2faa671 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -123,7 +123,7 @@ hooks:
       - opengl
 
 environment:
-  LD_LIBRARY_PATH: $SNAP/graphics/lib/i386-linux-gnu:$SNAP/graphics/usr/lib:$SNAP/usr/lib/i386-linux-gnu:$SNAP/lib/i386-linux-gnu:$SNAP/usr/lib/i386-linux-gnu/pulseaudio${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+  LD_LIBRARY_PATH: $SNAP/graphics/lib/i386-linux-gnu:$SNAP/graphics/usr/lib:$SNAP/usr/lib/i386-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/lib/i386-linux-gnu:$SNAP/usr/lib/i386-linux-gnu/pulseaudio${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
   LIBGL_DRIVERS_PATH: $SNAP/graphics/usr/lib/i386-linux-gnu/dri:$SNAP/graphics/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH:+:$LIBGL_DRIVERS_PATH}
 
 parts:
@@ -215,7 +215,7 @@ parts:
   ninja:
     plugin: nil
     source: https://github.com/ninja-build/ninja.git
-    source-tag: "v1.11.0"
+    source-tag: "v1.12.1"
     override-build: |
       rm -rf build
       rm -f ninja
@@ -237,7 +237,7 @@ parts:
     after: [ninja]
     plugin: nil
     source: https://github.com/mesonbuild/meson.git
-    source-tag: "1.0.1"
+    source-tag: "1.4.1"
     override-build: |
       python3 -m pip install .
       mkdir -p $CRAFT_PART_INSTALL/usr/lib/python3/dist-packages
@@ -254,7 +254,7 @@ parts:
   mangohud:
     after: [meson-deps]
     source: https://github.com/flightlessmango/MangoHud.git
-    source-tag: "v0.6.8"
+    source-tag: "v0.6.9-1"
     plugin: meson
     organize:
       snap/steam/current/usr: usr
@@ -284,12 +284,13 @@ parts:
   mangohud64:
     after: [meson-deps, mangohud]
     source: https://github.com/flightlessmango/MangoHud.git
-    source-tag: "v0.6.8"
+    source-tag: "v0.6.9-1"
     plugin: meson
     organize:
       snap/steam/current/usr: usr
     meson-parameters:
       - --prefix=/usr
+      - --libdir=lib/x86_64-linux-gnu
       - -Dappend_libdir_mangohud=false
     stage:
       - -usr/bin/mangohud

From cf5dfe09898f2db3591fd06f8d28866ec2921b4e Mon Sep 17 00:00:00 2001
From: Zoe Spellman <zoe.spellman@canonical.com>
Date: Fri, 12 Jul 2024 04:47:50 -0700
Subject: [PATCH 2/2] fix: no LD_PRELOAD error (with caveats)

---
 snap/snapcraft.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2faa671..1a1572a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -254,7 +254,7 @@ parts:
   mangohud:
     after: [meson-deps]
     source: https://github.com/flightlessmango/MangoHud.git
-    source-tag: "v0.6.9-1"
+    source-tag: "v0.7.2"
     plugin: meson
     organize:
       snap/steam/current/usr: usr
@@ -280,11 +280,19 @@ parts:
       - libxnvctrl-dev
       - mesa-common-dev
       - python3-mako
+      - libwayland-dev:i386
+      - libwayland-dev
+      - libxkbcommon-dev:i386
+      - libxkbcommon-dev
+    # Fixes the $LIB being escaped for some reason
+    override-build: |
+        craftctl default
+        sed -i 's/\/usr\/\\\$LIB/\$SNAP\/usr\/lib\/x86_64-linux-gnu/' $CRAFT_PART_INSTALL/usr/bin/mangohud
 
   mangohud64:
     after: [meson-deps, mangohud]
     source: https://github.com/flightlessmango/MangoHud.git
-    source-tag: "v0.6.9-1"
+    source-tag: "v0.7.2"
     plugin: meson
     organize:
       snap/steam/current/usr: usr
@@ -296,6 +304,8 @@ parts:
       - -usr/bin/mangohud
       - -usr/share/vulkan/implicit_layer.d/MangoHud.json
       - -usr/share/vulkan/implicit_layer.d/libMangoApp.json
+      - -usr/share/doc/mangohud/MangoHud.conf.example
+      - -usr/share/man/man1/mangohud.1 
 
   gamemode:
     after: [meson-deps]