From b2d9692b4513a16760f9dbc4633cde0a3db262b1 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Sat, 6 Jan 2024 09:19:22 +0100
Subject: [PATCH] WORKFLOW: improved manifest creation

---
 automation_tools/update_mame_manifest.sh |  6 ++++--
 manifest-header.yml                      | 14 +++++--------
 net.retrodeck.mame.yml                   | 26 +++++++++++-------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/automation_tools/update_mame_manifest.sh b/automation_tools/update_mame_manifest.sh
index 892bc0f..7df9574 100755
--- a/automation_tools/update_mame_manifest.sh
+++ b/automation_tools/update_mame_manifest.sh
@@ -6,13 +6,15 @@ git clone https://github.com/XargonWan/RetroDECK --depth=1 RetroDECK
 manifest_header="manifest-header.yml"
 mame_module="mame-module.yml"
 mame_manifest="net.retrodeck.mame.yml"
+command="/app/bin/mame" 
 
-sed -n '/cleanup/q;p' RetroDECK/net.retrodeck.retrodeck.yml > "$manifest_header"
+sed -n '/command/q;p' RetroDECK/net.retrodeck.retrodeck.yml > "$manifest_header"
+echo -e "command: $command\n" >> "$manifest_header"
 sed -i '/^[[:space:]]*#/d' "$manifest_header"
 sed -i 's/[[:space:]]*#.*$//' "$manifest_header"
+sed -n '/finish-args:/,${/cleanup:/q;p;}' RetroDECK/net.retrodeck.retrodeck.yml >> "$manifest_header"
 
 sed -i 's/net.retrodeck.retrodeck/net.retrodeck.mame/' "$manifest_header"
-sed -i 's/retrodeck\.sh/\/app\/bin\/mame/' "$manifest_header"
 
 cat "$manifest_header" > "$mame_manifest"
 cat "$mame_module" >> "$mame_manifest"
diff --git a/manifest-header.yml b/manifest-header.yml
index 7f40c3c..8a903ae 100644
--- a/manifest-header.yml
+++ b/manifest-header.yml
@@ -6,15 +6,6 @@ sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm16
 command: /app/bin/mame
 
-add-extensions:
-  org.ppsspp.PPSSPP.Locale:
-    directory: share/locale
-    bundle: true
-    no-autodownload: false
-    subdirectories: false
-    autodelete: true
-    locale-subset: true
-
 finish-args:
   - --socket=fallback-x11
   - --socket=wayland
@@ -32,8 +23,13 @@ finish-args:
   - --talk-name=org.freedesktop.login1.Manager
   - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
+  #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home
+  # Dolphin
   - --allow=bluetooth
+  # PPSSPP
+  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
   - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.mame
   - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame
+  # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch
   - --unset-env=QEMU_AUDIO_DRV
 
diff --git a/net.retrodeck.mame.yml b/net.retrodeck.mame.yml
index a3451f9..b786317 100644
--- a/net.retrodeck.mame.yml
+++ b/net.retrodeck.mame.yml
@@ -6,15 +6,6 @@ sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm16
 command: /app/bin/mame
 
-add-extensions:
-  org.ppsspp.PPSSPP.Locale:
-    directory: share/locale
-    bundle: true
-    no-autodownload: false
-    subdirectories: false
-    autodelete: true
-    locale-subset: true
-
 finish-args:
   - --socket=fallback-x11
   - --socket=wayland
@@ -32,25 +23,32 @@ finish-args:
   - --talk-name=org.freedesktop.login1.Manager
   - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
+  #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home
+  # Dolphin
   - --allow=bluetooth
+  # PPSSPP
+  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
   - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.mame
   - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame
+  # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch
   - --unset-env=QEMU_AUDIO_DRV
 
 modules:
 
+  # https://sdlmame.wallyweek.org/download/
   - name: mame
     buildsystem: simple
     build-options:
       no-debuginfo: true
       strip: true
+    env:
+      CC: clang
+      CXX: clang++
+      LD: lld
     build-commands:
       - make
-          -j echo $(nproc)
+          -j ${FLATPAK_BUILDER_N_JOBS}
           CFLAGS+=-Wno-error=restrict
-          CC=clang
-          CXX=clang++
-          LD=lld
           USE_QTDEBUG=0 
           USE_WAYLAND=1
           USE_SYSTEM_LIB_FLAC=1
@@ -85,4 +83,4 @@ modules:
       - type: patch
         path: mame-patches/sound.patch
       - type: patch
-        path: mame-patches/ym3802.patch
+        path: mame-patches/ym3802.patch
\ No newline at end of file