differentiate debug and release artifacts for flatpaks

.github/workflows/validate.yml

@@ -160,6 +160,9 @@ jobs:
   build-flatpak:
     name: Build Flatpak
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        preset: ["Flatpak-Debug", "Flatpak-Release"]
     env:
       FLATPAK_ID: io.github.hedge_dev.unleashedrecomp
 
@@ -185,7 +188,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: /tmp/ccache
-          key: ccache-${{ runner.os }}
+          key: ccache-${{ runner.os }}-${{ matrix.preset }}
 
       - name: Prepare Project
         run: cp ./private/* ./UnleashedRecompLib/private
@@ -198,13 +201,13 @@ jobs:
         run: |
           echo "commit_message=$(git log -1 --pretty=%s)" >> $GITHUB_ENV
           export CCACHE_DIR=/tmp/ccache
-          flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo --ccache builddir ./flatpak/${{ env.FLATPAK_ID }}.json
+          flatpak-builder --user --force-clean --install-deps-from=flathub --repo=repo --ccache builddir ./flatpak/${{ env.FLATPAK_ID }}-${{ matrix.preset }}.json
           flatpak build-bundle repo ./${{ env.FLATPAK_ID }}.flatpak ${{ env.FLATPAK_ID }} --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: UnleashedRecomp-Flatpak
+          name: UnleashedRecomp-${{ matrix.preset }}
           path: ./${{ env.FLATPAK_ID }}.flatpak
   build-macos:
     name: Build macOS

UnleashedRecomp/patches/aspect_ratio_patches.cpp

@@ -1686,13 +1686,3 @@ void EndingTextPositionMidAsmHook(PPCRegister& r31, PPCRegister& f13)
     else if (align == ALIGN_LEFT)
         f13.f64 += 133.0 * (1.0 - g_aspectRatioNarrowScale);
 }
-
-// Offsets calculated by converting the 4:3 values to 16:9 space and then substracting the differences from the original 16:9 position.
-// Afterward fact checked by overlaying a capture from the original hardware at 4:3 and a capture from recomp at 4:3.
-void AdvertiseLogoPlacementMidAsmHook(PPCRegister& f0, PPCRegister& f13, PPCRegister& f12, PPCRegister& f11)
-{
-    f0.f64 += -133.0f / 1280.0f * (1.0 - g_aspectRatioNarrowScale);
-    f13.f64 += 3.5f / 720.0f * (1.0 - g_aspectRatioNarrowScale);
-    f12.f64 += -133.0f / 1280.0f * (1.0 - g_aspectRatioNarrowScale);
-    f11.f64 += 3.5f / 720.0f * (1.0 - g_aspectRatioNarrowScale);
-}

UnleashedRecompLib/config/SWA.toml

@@ -1153,8 +1153,3 @@ registers = ["f1"]
 name = "CEvilSonicContext_CStateWall_LeaveRotationMidAsmHook"
 address = 0x82406774
 registers = ["f1"]
-
-[[midasm_hook]]
-name = "AdvertiseLogoPlacementMidAsmHook"
-address = 0x82B729A0
-registers = ["f0", "f13", "f12", "f11"]

flatpak/io.github.hedge_dev.unleashedrecomp-Flatpak-Debug.json

@@ -0,0 +1,48 @@
+{
+  "id": "io.github.hedge_dev.unleashedrecomp",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "24.08",
+  "sdk": "org.freedesktop.Sdk",
+  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm18" ],
+  "finish-args": [
+    "--share=network",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--socket=pulseaudio",
+    "--device=all",
+    "--filesystem=host",
+    "--filesystem=/media",
+    "--filesystem=/run/media",
+    "--filesystem=/mnt"
+  ],
+  "modules": [
+    {
+      "name": "UnleashedRecomp",
+      "buildsystem": "simple",
+      "build-commands": [
+        "cmake --preset linux-debug -DUNLEASHED_RECOMP_FLATPAK=ON -DSDL2MIXER_VORBIS=VORBISFILE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache",
+        "cmake --build out/build/linux-debug --target UnleashedRecomp",
+        "mkdir -p /app/bin",
+        "cp out/build/linux-debug/UnleashedRecomp/UnleashedRecomp /app/bin/UnleashedRecomp",
+        "install -Dm644 UnleashedRecompResources/images/game_icon.png /app/share/icons/hicolor/128x128/apps/${FLATPAK_ID}.png",
+        "install -Dm644 flatpak/io.github.hedge_dev.unleashedrecomp.metainfo.xml /app/share/metainfo/${FLATPAK_ID}.metainfo.xml",
+        "install -Dm644 flatpak/io.github.hedge_dev.unleashedrecomp.desktop /app/share/applications/${FLATPAK_ID}.desktop"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "../"
+        }
+      ],
+      "build-options": {
+        "no-debuginfo": true,
+        "strip": false,
+        "append-path": "/usr/lib/sdk/llvm18/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
+        "build-args": [
+          "--share=network"
+        ]
+      }
+    }
+  ]
+}