From c14ddc0730011aea97afb1403926797849690998 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 6 Nov 2024 09:44:33 +0900
Subject: [PATCH] RPCS3: migrating to our repo

---
 automation_tools/automation_task_list.cfg |  3 +-
 net.retrodeck.retrodeck.yml               | 43 +++++++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index 0a64243b..ef41c1de 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -25,4 +25,5 @@ hash^RETRODECKSOLARUSLATEST^https://github.com/RetroDECK/org.solarus_games.solar
 hash^RETRODECKGZDOOMLATEST^https://github.com/RetroDECK/org.zdoom.GZDoom/releases/latest/download/RetroDECK-gzdoom-Artifact.tar.gz
 hash^RETRODECKMAMELATEST^https://github.com/RetroDECK/MAME/releases/latest/download/RetroDECK-MAME-Artifact.tar.gz
 hash^PORTMASTERLATESTSHA^https://github.com/PortsMaster/PortMaster-GUI/releases/latest/download/retrodeck.portmaster.zip
-hash^RACITRAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/citra_libretro.so.zip
\ No newline at end of file
+hash^RACITRAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/citra_libretro.so.zip
+hash^RETRODECKRPCS3LATEST^https://github.com/RetroDECK/net.rpcs3.RPCS3/releases/latest/download/RetroDECK-Artifact.tar.gz
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 7477de99..4d90d81f 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1,6 +1,6 @@
 app-id: net.retrodeck.retrodeck
 runtime: org.kde.Platform
-runtime-version: "6.8"
+runtime-version: "6.7"
 sdk: org.kde.Sdk
 base: org.electronjs.Electron2.BaseApp            # Needed for Steam ROM Manager
 base-version: "22.08"
@@ -411,23 +411,36 @@ modules:
   # RPCS3
   # https://rpcs3.net/download
 
-  - name: rpcs3
+  # - name: rpcs3
+  #   buildsystem: simple
+  #   build-commands:
+  #     - chmod +x *.AppImage
+  #     - ./*.AppImage --appimage-extract
+  #     - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" 
+  #     - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg   # Needed for a ffmpeg bufgix
+  #     - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib"
+  #     - cp -r "squashfs-root/usr/bin/"* "${FLATPAK_DEST}/bin/"
+  #     - cp -r "squashfs-root/usr/share/"* "${FLATPAK_DEST}/share/"
+  #     #TODO: - cp -r squashfs-root/usr/optional* # maybe already included in flatpak runtime
+  #     #TODO: - cp -r squashfs-root/usr/plugins* # maybe already included in qt
+  #     #TODO: Do we need this wrapper? squashfs-root/apprun-hooks/linuxdeploy-plugin-qt-hook.sh
+  #   sources:
+  #     - type: file
+  #       url: https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build-cd8954db140855101d94a33c0dd7f4d72bdf5a35/rpcs3-v0.0.33-17066-cd8954db_linux64.AppImage
+  #       sha256: 2d258b557c17ebba4bea927be4032cfcbc230c26b8f090b796daa5935faa4a8b
+
+  - name: retrodeck-rpcs3
     buildsystem: simple
     build-commands:
-      - chmod +x *.AppImage
-      - ./*.AppImage --appimage-extract
-      - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug" 
-      - mkdir -p ${FLATPAK_DEST}/lib/ffmpeg   # Needed for a ffmpeg bufgix
-      - mv "squashfs-root/usr/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib"
-      - cp -r "squashfs-root/usr/bin/"* "${FLATPAK_DEST}/bin/"
-      - cp -r "squashfs-root/usr/share/"* "${FLATPAK_DEST}/share/"
-      #TODO: - cp -r squashfs-root/usr/optional* # maybe already included in flatpak runtime
-      #TODO: - cp -r squashfs-root/usr/plugins* # maybe already included in qt
-      #TODO: Do we need this wrapper? squashfs-root/apprun-hooks/linuxdeploy-plugin-qt-hook.sh
+      - mkdir -p "${FLATPAK_DEST}/retrodeck/tmplib" "${FLATPAK_DEST}/retrodeck/tmplib/debug"
+      - cp -rL "files/lib/"* "${FLATPAK_DEST}/retrodeck/tmplib"
+      - rm -rf "files/lib"
+      - cp -r files/* "${FLATPAK_DEST}"
+      - chmod +x "${FLATPAK_DEST}/bin/"*
     sources:
-      - type: file
-        url: https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build-cd8954db140855101d94a33c0dd7f4d72bdf5a35/rpcs3-v0.0.33-17066-cd8954db_linux64.AppImage
-        sha256: 2d258b557c17ebba4bea927be4032cfcbc230c26b8f090b796daa5935faa4a8b
+      - type: archive
+        url: https://github.com/RetroDECK/net.rpcs3.RPCS3/releases/latest/download/RetroDECK-Artifact.tar.gz
+        sha256: RETRODECKRPCS3LATEST
 
   # MELONDS
   # https://github.com/RetroDECK/net.kuribo64.melonDS