Merge remote-tracking branch 'upstream/cooker-0.6.0b' into cooker-0.6.0b-icenine451

es-configs/es_systems.xml

@@ -565,7 +565,7 @@
         <extension>.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP</extension>
         <command label="Dolphin (Standalone)">%EMULATOR_DOLPHIN% -b -e %ROM%</command>
         <command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
-<!--        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command> -->
+        <command label="PrimeHack (Standalone)">%EMULATOR_PRIMEHACK% -b -e %ROM%</command>
         <platform>gc</platform>
         <theme>gc</theme>
     </system>
@@ -1073,7 +1073,7 @@
         <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
         <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
         <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
-<!--        <command label="PCSX2 Legacy (Standalone)">%EMULATOR_PCSX2-LEGACY% --nogui %ROM%</command> -->
+<!--        <command label="PCSX2 Legacy (Standalone)">%EMULATOR_PCSX2-LEGACY% -REMOVEME-nogui %ROM%</command> -->
 <!--        <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> -->
         <platform>ps2</platform>
         <theme>ps2</theme>

net.retrodeck.retrodeck.appdata.xml

@@ -69,12 +69,13 @@
 
 <releases>
 
-  <release version="0.6.0b" date="2022-11-18">
+  <release version="0.6.0b" date="2022-11-21">
     <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b</url>
       <description>
         <ul>
           <li>Added Cemu</li>
           <li>Added Ryujinx</li>
+          <li>Added Primehack</li>
           <li>Fix: PCSX2-QT is now looking for saves in the correct directory ~/retrodeck/saves/ps2/memcards and not in ~/retrodeck/saves/ps2/pcsx2/memcards</li>
           <li>Updated RetroArch to v1.12.0</li>
           <li>Updated PPSSPP (SA) to v1.13.2</li>
@@ -86,7 +87,6 @@
           <li>Updated Duckstation to latest on 31/10/2022</li>
           <li>Migrated Yuzu from appimage mainline-1233</li>
           <li>Removed old PCSX2 (non-qt)</li>
-
       </ul>
     </description>
   </release>

net.retrodeck.retrodeck.yml

@@ -614,6 +614,7 @@ modules:
     sources:
       - type: git
         url: ssh://git@github.com/dolphin-emu/dolphin.git
+        #url: https://github.com/dolphin-emu/dolphin.git
         commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c
         x-checker-data:
           type: json
@@ -817,40 +818,42 @@ modules:
   # PRIMEHACK - START
   # https://github.com/flathub/io.github.shiiion.primehack
   # Disabled because it's overwriting Dolphin
-  # - name: primehack
+
-  #   buildsystem: cmake-ninja
+  - name: primehack
-  #   config-opts:
+    buildsystem: cmake-ninja
-  #     - -DCMAKE_BUILD_TYPE=Release
+    config-opts:
-  #     - -DENABLE_ALSA=OFF
+      - -DCMAKE_BUILD_TYPE=Release
-  #     - -DENABLE_SDL=ON
+      - -DENABLE_ALSA=OFF
-  #     - -DENABLE_EVDEV=ON
+      - -DENABLE_SDL=ON
-  #     - -DDISTRIBUTOR=Flathub
+      - -DENABLE_EVDEV=ON
-  #   cleanup:
+      - -DDISTRIBUTOR=Flathub
-  #     - /share/man
+    cleanup:
-  #   post-install:
+      - /share/man
-  #     - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper
+    post-install:
-  #     - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
+      - install -D primehack-wrapper /app/bin/primehack-wrapper
-  #   sources:
+    sources:
-  #     - type: git
+      - type: git
-  #       url: https://github.com/shiiion/dolphin.git
+        url: https://github.com/shiiion/dolphin.git
-  #       commit: 9ca0eb888bd6f8ed13a4efb92d808fbf0705ffa4
+        commit: efb99ebfd20b1bc16ea3e51fec409c91e354d8c2
-  #     # detects whether dolphin is running in a flatpak sandbox
+      # detects whether dolphin is running in a flatpak sandbox
-  #     # and makes it use xdg directories if it is.
+      # and makes it use xdg directories if it is.
-  #     # prevents dolphin from attempting to write conf files
+      # prevents dolphin from attempting to write conf files
-  #     # in non-writable paths, typically happens when a user
+      # in non-writable paths, typically happens when a user
-  #     # has leftover files from a previous non-flatpak install
+      # has leftover files from a previous non-flatpak install
-  #     - type: patch
+      - type: patch
-  #       path: rd-submodules/primehack/detectflatpak.patch
+        path: rd-submodules/dolphin/detectflatpak.patch
-  #     # version strings must match exactly for online multiplayer
+      # version strings must match exactly for online multiplayer
-  #     - type: patch
+      - type: patch
-  #       path: rd-submodules/primehack/nodirtyversion.patch
+        path: rd-submodules/dolphin/nodirtyversion.patch
-  #     - type: script
+      - type: file
-  #       commands:
+        path: appdata.xml
-  #         - for i in {0..9}; do
+      - type: script
-  #         - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
+        commands:
-  #         - done
+          - for i in {0..9}; do
-  #         - dolphin-emu "$@"
+          - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
-  #       dest-filename: dolphin-emu-wrapper
+          - done
+          - dolphin-emu "$@"
+        dest-filename: primehack-wrapper
 
   # PRIMEHACK - END