Added Ryujinx, Cemu, Yuzu Appimage. Removed: pcsx2, yuzu (compiled)

2024-11-22 05:55:38 +00:00 · 2022-11-14 10:43:51 +00:00 · 2022-11-14 10:43:51 +00:00 · 0ef4833cb9
parent 4460f12eca
commit 0ef4833cb9
3 changed files with 55 additions and 547 deletions
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@ -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% --nogui %ROM%</command> -->
 <!--        <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> -->
        <platform>ps2</platform>
        <theme>ps2</theme>
@ -1375,7 +1375,7 @@
        <path>%ROMPATH%/switch</path>
        <extension>.nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP</extension>
        <command label="Yuzu (Standalone)">%EMULATOR_YUZU% -f -g %ROM%</command>
-        <!-- <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command> -->
+        <command label="Ryujinx (Standalone)">%EMULATOR_RYUJINX% %ROM%</command>
        <platform>switch</platform>
        <theme>switch</theme>
    </system>
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@ -69,20 +69,23 @@

 <releases>

-  <release version="0.5.4b" date="2022-11-02">
-    <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.5.4b</url>
+  <release version="0.6.0b" date="2022-11-18">
+    <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.0b</url>
      <description>
        <ul>
+          <li>Added Cemu</li>
+          <li>Added Ryujinx</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>
-          <li>Updated Yuzu to mainline-0-1222</li>
          <li>Updated Citra (SA) to nightly-1802</li>
          <li>Updated PCSX2-QT to nightly v1.7.3501</li>
          <li>Updated Dolphin (SA) to latest on 31/10/2022</li>
          <li>Updated Xemu to v0.7.71</li>
          <li>Updated RPCS3 to latest on 31/10/2022</li>
          <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>
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -78,7 +78,7 @@ modules:
      - |
        git checkout ${GITHUB_REF_NAME}
        mkdir -p ${FLATPAK_DEST}/retrodeck/
-        VERSION="cooker-0.5.4b"
+        VERSION="0.6.0b-cooker"
        if [[ $VERSION == *"cooker"* ]];
        then
          VERSION="cooker-"$(git rev-parse --short HEAD)
@ -88,7 +88,7 @@ modules:
    sources:
      - type: git
        url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.5.4b
+        branch: cooker-0.6.0b

  - name: xmlstarlet
    config-opts:
@ -450,282 +450,41 @@ modules:
        commands:
          - cp -a $FLATPAK_DEST/share/ppsspp/assets .

-  # PPSSPP Flathub Workaround - START
-  # This workaround disables the PPSSPP libraries (disable-submodules: true) and install them separately
-  # This is only to make it buildable by the flathub builder as normaly it seems not to be needed
-      #   disable-submodules: true
-      # - type: git
-      #   dest: SDL/macOS
-      #   commit: f19a1d54b8a5af6cc378ea307e0ec676922eb4cc
-      #   url: https://github.com/hrydgard/ppsspp-mac-sdl
-      # - type: git
-      #   dest: assets/debugger
-      #   commit: 36ad6b19b22de2075a01a4f0c765e3ef514dc38f
-      #   url: https://github.com/unknownbrackets/ppsspp-debugger.git
-      # - type: git
-      #   dest: dx9sdk
-      #   commit: 7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93
-      #   url: https://github.com/hrydgard/minidx9.git
-      # - type: git
-      #   dest: ext/SPIRV-Cross
-      #   commit: 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
-      #   url: https://github.com/KhronosGroup/SPIRV-Cross.git
-      # - type: git
-      #   dest: ext/armips
-      #   commit: 7885552b208493a6a0f21663770c446c3ba65576
-      #   url: https://github.com/Kingcom/armips.git
-      # - type: git
-      #   dest: ext/discord-rpc
-      #   commit: 963aa9f3e5ce81a4682c6ca3d136cddda614db33
-      #   url: https://github.com/discordapp/discord-rpc.git
-      # - type: git
-      #   dest: ext/glslang
-      #   commit: dc11adde23c455a24e13dd54de9b4ede8bdd7db8
-      #   url: https://github.com/hrydgard/glslang.git
-      # - type: git
-      #   dest: ext/miniupnp
-      #   commit: 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
-      #   url: https://github.com/hrydgard/miniupnp.git
-      # - type: git
-      #   dest: ext/native/tools/prebuilt
-      #   commit: cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a
-      #   url: https://github.com/hrydgard/ppsspp-freetype.git
-      # - type: git
-      #   dest: ext/rapidjson
-      #   commit: 73063f5002612c6bf64fe24f851cd5cc0d83eef9
-      #   disable-submodules: true
-      #   url: https://github.com/Tencent/rapidjson.git
-      # - type: git
-      #   dest: ext/zstd
-      #   commit: a488ba114ec17ea1054b9057c26a046fc122b3b6
-      #   url: https://github.com/facebook/zstd.git
-      # - type: git
-      #   dest: ffmpeg
-      #   commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7
-      #   url: https://github.com/hrydgard/ppsspp-ffmpeg.git
-      # - type: git
-      #   dest: pspautotests
-      #   commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92
-      #   url: https://github.com/hrydgard/pspautotests.git
-  # PPSSPP Flathub Workaround - END
  # PPSSPP - END

-  - name: debug-pre-yuzu
-    buildsystem: simple
-    build-commands:
-      - df -h
-
  # Yuzu - START
  # https://github.com/flathub/org.yuzu_emu.yuzu
  # WHEN UPADTING: remember to update rd-submodules/yuzu contents

-  - name: libzip
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    sources:
-      - type: archive
-        url: https://github.com/nih-at/libzip/archive/v1.9.2.tar.gz
-        sha256: 7f28eaec7a02ca099ea9dad88fc8023f7f6ddfca54b780040ff7fdb39d9efb3c
-        x-checker-data:
-          type: anitya
-          project-id: 10649
-          url-template: https://github.com/nih-at/libzip/archive/v$version.tar.gz
-  - name: zstd
-    buildsystem: meson
-    subdir: build/meson
-    config-opts:
-      - '-Dbin_programs=false'
-      - '-Dbin_contrib=false'
-    sources:
-      - type: archive
-        url: https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz
-        sha256: 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
-        x-checker-data:
-          type: anitya
-          project-id: 12083
-          url-template: https://github.com/facebook/zstd/releases/download/v$version/zstd-$version.tar.gz
-  - name: fmt
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-      - -DFMT_TEST=OFF
-    sources:
-      - type: archive
-        url: https://github.com/fmtlib/fmt/releases/download/8.1.1/fmt-8.1.1.zip
-        sha256: 23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d
-        x-checker-data:
-          type: anitya
-          project-id: 11526
-          versions:
-            <: 9.0.0
-          url-template: https://github.com/fmtlib/fmt/releases/download/$version/fmt-$version.zip
-  - name: glslang
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-    sources:
-      - type: archive
-        url: https://github.com/KhronosGroup/glslang/archive/11.12.0.tar.gz
-        sha256: 7795a97450fecd9779f3d821858fbc2d1a3bf1dd602617d95b685ccbcabc302f
-        x-checker-data:
-          type: anitya
-          stable-only: true
-          project-id: 205796
-          url-template: https://github.com/KhronosGroup/glslang/archive/$version.tar.gz
-  - name: catch2
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCATCH_INSTALL_EXTRAS=ON
-      - -DCATCH_BUILD_TESTING=OFF
-    builddir: true
-    sources:
-      - type: archive
-        url: https://github.com/catchorg/Catch2/archive/v2.13.10.tar.gz
-        sha256: d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
-        x-checker-data:
-          type: anitya
-          stable-only: true
-          versions:
-            <: 3.0.0
-          project-id: 7680
-          url-template: https://github.com/catchorg/Catch2/archive/v$version.tar.gz
-  - name: nlohmann-json
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-      - -DJSON_BuildTests=OFF
-    sources:
-      - type: archive
-        url: https://github.com/nlohmann/json/archive/v3.11.2.tar.gz
-        sha256: d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273
-        x-checker-data:
-          type: anitya
-          project-id: 11152
-          url-template: https://github.com/nlohmann/json/archive/v$version.tar.gz
-  - name: boost
+  - name: Yuzu
    buildsystem: simple
    build-commands:
-      - ./bootstrap.sh --with-libraries=context,container,system,headers
-      - ./b2 -j $FLATPAK_BUILDER_N_JOBS install --prefix=/app
+      - chmod +x yuzu*.AppImage
+      - ./yuzu*.AppImage --appimage-extract
+      - mkdir -p "${FLATPAK_DEST}/yuzu"
+      - cp -r squashfs-root/* "${FLATPAK_DEST}/yuzu"
+      - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
+    sources:
+      - type: file
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1233/yuzu-mainline-20221113-f8aba8b9d.AppImage
+        sha256: 77c4684d95dcaf2f116cf94f65b61c7e0d83b493245ea89aa6d3a2a5fb7eb330
+
+  # Yuzu - END
+
+  # Ryujinx - START
+  # https://ryujinx.org/download
+
+  - name: Ryujinx
+    buildsystem: simple
+    build-commands:
+      - mv Ryujinx ${FLATPAK_DEST}/bin/Ryujinx
+      - chmod 777 ${FLATPAK_DEST}/bin/Ryujinx
    sources:
      - type: archive
-        url: >-
-          https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
-        sha256: 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
-        x-checker-data:
-          type: anitya
-          project-id: 6845
-          url-template: >-
-            https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_80_0.tar.bz2
-  - name: nv-codec-headers
-    make-install-args:
-      - PREFIX=/app
-    no-autogen: true
-    cleanup:
-      - '*'
-    sources:
-      - type: git
-        url: https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
-        tag: n11.1.5.2
-        commit: f8ae7a49bfef2f99d2c931a791dc3863fda67bf3
-        x-checker-data:
-          type: git
-          tag-pattern: ^n([\d.]+)$
+        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.335/ryujinx-1.1.335-linux_x64.tar.gz
+        sha256: 9a175bcc5ea0e67e8b8b0ff944eb1fa316e6ff6336f91b09b719b2ccac7ecee5

-  - name: yuzu
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-      - -DENABLE_QT_TRANSLATION=ON
-      - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=ON
-      - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
-      - -DYUZU_USE_QT_WEB_ENGINE=ON
-      - -DYUZU_USE_BUNDLED_FFMPEG=ON
-      - -DDISPLAY_VERSION=1225
-      - -DBUILD_TAG=mainline-1225
-      - -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline
-      #- -DCMAKE_PREFIX_PATH=/run/build/yuzu/_flatpak_build/externals/qt5_5_15_2
-    build-options:
-      env:
-        TITLEBARFORMATIDLE: yuzu {}
-        TITLEBARFORMATRUNNING: yuzu {} | {}
-        LDFLAGS: -L/app/lib -Wl,-z,relro,-z,now -Wl,--as-needed
-    cleanup:
-      - /share/man
-      - /share/pixmaps
-    post-install:
-      - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher
-    sources:
-      #- disable-submodules: true # FLATHUB WORKAROUND
-      - type: git
-        url: https://github.com/yuzu-emu/yuzu-mainline.git
-        tag: mainline-0-1225
-        commit: 05efef9ec3a831617dd83e4228e458a209b1aad2
-        disable-shallow-clone: true
-        x-checker-data:
-          type: git
-          tag-pattern: ^(mainline-0-\d+)$
-      - type: file
-        path: rd-submodules/yuzu/yuzu-launcher.sh
-      - type: file
-        path: rd-submodules/yuzu/compatibility_list.json
-        dest: dist/compatibility_list
-
-  # # Yuzu - END
-
-  # # Ryujinx - START
-  # # https://github.com/flathub/org.ryujinx.Ryujinx
-
-  # - name: Ryujinx
-  #   buildsystem: simple
-  #   build-options:
-  #     append-path: /usr/lib/sdk/dotnet6/bin
-  #     append-ld-library-path: /usr/lib/sdk/dotnet6/lib
-  #     arch:
-  #       x86_64:
-  #         env:
-  #           RUNTIME: linux-x64
-  #     env:
-  #       PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/sdk/dotnet6/lib/pkgconfig
-  #       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
-  #       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
-  #       RYUJINX_VERSION: 1.1.209
-  #       RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
-  #       RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
-  #       RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
-  #   build-commands:
-  #   - |
-  #     export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
-  #     sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" Ryujinx.Common/ReleaseInformations.cs
-  #     sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" Ryujinx.Common/ReleaseInformations.cs
-  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" Ryujinx.Common/ReleaseInformations.cs
-  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" Ryujinx.Common/ReleaseInformations.cs
-  #     sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" Ryujinx.Common/ReleaseInformations.cs
-  #     mkdir -p /app/bin
-  #     dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants=DISABLE_UPDATER --self-contained --source nuget-sources
-  #     if [ $? -ne 0 ]; then
-  #         exit 1;
-  #     fi;
-  #     cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net6.0/$RUNTIME/publish/* /app/bin/
-  #     mkdir -p /app/lib/ffmpeg
-  #     ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
-  #     wget https://raw.githubusercontent.com/flathub/org.ryujinx.Ryujinx/master/ryujinx-wrapper
-  #     install -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
-  #     install -Dm644 distribution/linux/ryujinx-logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg
-  #     install -Dm644 distribution/linux/ryujinx-mime.xml /app/share/mime/packages/$FLATPAK_ID.mime.xml
-  #   sources:
-  #   - rd-submodules/ryujinx/nuget_sources.json
-  #   - type: git
-  #     url: https://github.com/Ryujinx/Ryujinx.git
-  #     commit: 66e7fdb8710ff24bfb80c9c638ce2e6fa9563068
-
-  # # Ryujinx - END
+  # Ryujinx - END

  # CITRA - START
  # https://github.com/flathub/org.citra_emu.citra
@ -760,221 +519,12 @@ modules:

  # CITRA - END

-  # PCSX2 (Deprecated)- START
-  # https://github.com/flathub/net.pcsx2.PCSX2
-
-  - name: wxWidgets
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-    cleanup:
-      - /bin
-      - /include
-      - /lib/wx/include
-    sources:
-      - type: git
-        url: https://github.com/wxWidgets/wxWidgets.git
-        tag: v3.2.0
-        commit: 5b5ec3804a31a3765d60ff351bbdf79eddb1e1f9
-        x-checker-data:
-          type: git
-          tag-pattern: ^v([\d.]+)$
-    
-  - name: libaio
-    no-autogen: true
-    make-install-args:
-      - prefix=${FLATPAK_DEST}
-    sources:
-      - type: git
-        url: https://pagure.io/libaio.git
-        tag: libaio-0.3.113
-        commit: 1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448
-        x-checker-data:
-          type: git
-          tag-pattern: ^libaio-([\d.]+)$
-    cleanup:
-      - /include
-      - /lib/*.a
-
-  - name: portaudio
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-    cleanup:
-      - /include
-      - /share/doc
-      - /lib/cmake
-      - /lib/pkgconfig
-      - /lib/*.a
-    sources:
-      - type: git
-        url: https://github.com/PortAudio/portaudio.git
-        tag: v19.7.0
-        commit: 147dd722548358763a8b649b3e4b41dfffbcfbb6
-        x-checker-data:
-          type: git
-          tag-pattern: ^v([\d.]+)$
-
-  - name: soundtouch
-    buildsystem: cmake-ninja
-    sources:
-      - type: git
-        url: https://codeberg.org/soundtouch/soundtouch.git
-        tag: 2.3.1
-        commit: e1f315f5358d9db5cee35a7a2886425489fcefe8
-        x-checker-data:
-          type: git
-          tag-pattern: ^([\d.]+)$
-    cleanup:
-      - /bin
-      - /include
-      - /lib/cmake
-      - /lib/pkgconfig
-      - /share/doc
-      - /lib/*.a
-
-  - name: png++
-    disabled: true
-    buildsystem: simple
-    build-commands:
-      - make
-      - make prefix=/app install
-    sources:
-      - type: archive
-        url: https://download.savannah.nongnu.org/releases/pngpp/png++-0.2.10.tar.gz
-        sha256: 998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1
-
-  - name: libpcap
-    buildsystem: cmake-ninja
-    sources:
-      - type: git
-        url: https://github.com/the-tcpdump-group/libpcap.git
-        tag: libpcap-1.10.1
-        commit: c7642e2cc0c5bd65754685b160d25dc23c76c6bd
-        x-checker-data:
-          type: git
-          tag-pattern: ^libpcap-([\d.]+)$
-    cleanup:
-      - /bin
-      - /include
-      - /share/man
-      - /lib/pkgconfig
-      - /lib/*.a
-
-  - name: pcsx2
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=Release
-      - -DPACKAGE_MODE=TRUE
-      - -DXDG_STD=TRUE
-      - -DDISABLE_BUILD_DATE=TRUE
-      - -DDISABLE_PCSX2_WRAPPER=TRUE
-      - -DDISABLE_ADVANCE_SIMD=TRUE
-      - -DSDL2_API=TRUE
-      #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland
-      - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE'
-    cleanup:
-      - /share/pixmaps
-      - /share/man
-      - /share/doc
-    sources:
-      - type: git
-        url: https://github.com/PCSX2/pcsx2.git
-        tag: v1.7.3229
-        commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3
-
-  # PCSX2 Flathub Workaround - START
-  # This workaround disables the PCSX2 libraries (disable-submodules: true) and install them separately
-  # This is only to make it buildable by the flathub builder as normaly it seems not to be needed
-        disable-submodules: true
-      - type: git
-        dest: 3rdparty/xz/xz
-        url: https://github.com/PCSX2/xz.git
-        commit: 3d566cd519017eee1a400e7961ff14058dfaf33c
-      - type: git
-        dest: 3rdparty/gtest
-        url: https://github.com/google/googletest.git
-        commit: e2239ee6043f73722e7aa812a459f54a28552929
-      - type: git
-        dest: 3rdparty/fmt/fmt
-        url: https://github.com/fmtlib/fmt.git
-        commit: b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9
-      - type: git
-        dest: 3rdparty/libchdr/libchdr
-        url: https://github.com/rtissera/libchdr.git
-        commit: 5de1a59019815ccdbba0fe07c71b31406d023248
-      - type: git
-        dest: 3rdparty/wil
-        url: https://github.com/microsoft/wil.git
-        commit: 3018875eaa4f8e3d86cf2da97fd577bae59f3aec
-      - type: git
-        dest: 3rdparty/cubeb/cubeb
-        url: https://github.com/mozilla/cubeb.git
-        commit: 773f16b7ea308392c05be3e290163d1f636e6024
-      - type: git
-        dest: 3rdparty/rapidyaml/rapidyaml
-        url: https://github.com/biojppm/rapidyaml.git
-        commit: 213b201d264139cd1b887790197e08850af628e3
-      - type: git
-        dest: 3rdparty/imgui/imgui
-        url: https://github.com/ocornut/imgui.git
-        commit: 60bea052a92cbb4a93b221002fdf04f0da3698e1
-      - type: git
-        dest: 3rdparty/glslang/glslang
-        url: https://github.com/KhronosGroup/glslang.git
-        commit: c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
-      - type: git
-        dest: 3rdparty/vulkan-headers
-        url: https://github.com/KhronosGroup/Vulkan-Headers.git
-        commit: 52a76fd0a693708eb8c25bd0ab7a1008091f64d4
-      - type: git
-        dest: 3rdparty/sdl2/SDL
-        url: https://github.com/libsdl-org/SDL.git
-        commit: 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1
-      - type: git
-        dest: 3rdparty/libzip/libzip
-        url: https://github.com/nih-at/libzip.git
-        commit: bdc03ab23b703fcc516436d6ebcbfb6ac4484033
-      - type: git
-        dest: 3rdparty/zstd/zstd
-        url: https://github.com/facebook/zstd.git
-        commit: e47e674cd09583ff0503f0f6defd6d23d8b718d3
-  # PCSX2 Flathub Workaround - END
-
-  # - name: pcsx2-qt
-  #   buildsystem: cmake-ninja
-  #   builddir: true
-  #   config-opts:
-  #     - '-DCMAKE_BUILD_TYPE=Release'
-  #     - '-DPACKAGE_MODE=TRUE'
-  #     - '-DXDG_STD=TRUE'
-  #     - '-DDISABLE_BUILD_DATE=TRUE'
-  #     - '-DDISABLE_PCSX2_WRAPPER=TRUE'
-  #     - '-DDISABLE_ADVANCE_SIMD=TRUE'
-  #     - '-DSDL2_API=TRUE'
-  #     #- '-DWAYLAND_API=TRUE"' enable this if Steam Deck goes to Wayland
-  #     - '-DQT_BUILD=TRUE'
-  #     - '-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE'
-  #   cleanup:
-  #     - /share/pixmaps
-  #     - /share/man
-  #     - /share/doc
-  #   post-install:
-  #     - ln -s ${FLATPAK_DEST}/share/PCSX2/resources ${FLATPAK_DEST}/bin/resources
-  #   sources:
-  #     - type: git
-  #       url: https://github.com/PCSX2/pcsx2.git
-  #       tag: v1.7.3229
-  #       commit: e3eae7fbe83aad3952e3ed6a8e56fc016b51a9c3  
-  #   # same as above
-  #   #disable-submodules: true
-
+  # PCSX2 - START
  # Inspired by:
  # https://github.com/flathub/com.zettlr.Zettlr/blob/master/com.zettlr.Zettlr.yaml
  # https://pcsx2.net/downloads/

-  - name: pcsx2-qt-appimage
+  - name: pcsx2-qt
    buildsystem: simple
    build-commands:
      - chmod +x pcsx2*.AppImage
@ -1308,70 +858,25 @@ modules:
  
  # Duckstation - END

-  # CEMU - START
-  # temporary here: https://github.com/Eonfge/flathub/blob/8bb2905b0fefdff820a2b65dac2a7cde916d3ce5/info.cemu.Cemu.yaml
+  # Cemu - START
+  # https://github.com/cemu-project/Cemu/releases
+
+  - name: Cemu-binary
+    buildsystem: simple
+    build-commands:
+      - mv Cemu ${FLATPAK_DEST}/bin/Cemu
+      - chmod 777 ${FLATPAK_DEST}/bin/Cemu
+      - mkdir -p ${FLATPAK_DEST}/config/cemu
+      - mv gameProfiles ${FLATPAK_DEST}/config/cemu/gameProfiles
+      - mv resources ${FLATPAK_DEST}/config/cemu/resources
+      - mv shaderCache ${FLATPAK_DEST}/config/cemu/shaderCache
+    sources:
+      - type: archive
+        url: https://github.com/cemu-project/Cemu/releases/download/v2.0-10/cemu-2.0-10-ubuntu-20.04-x64.zip
+        sha256: b6cb5560e9a15be5991db4ca0ce1de70d233d094e388477b05d663a542dbbd5c
+
+  # Cemu - END

-  # Needed for imgui
-#  - name: glad
-#    buildsystem: cmake-ninja
-#    config-opts:
-#      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-#      - -DBUILD_SHARED_LIBS=true
-#      - -DGLAD_REPRODUCIBLE=true
-#      - -DGLAD_INSTALL=true
-#    sources:
-#      - type: archive
-#        url: https://github.com/Dav1dde/glad/archive/refs/tags/v0.1.36.tar.gz
-#        sha256: 8470ed1b0e9fbe88e10c34770505c8a1dc8ccb78cadcf673331aaf5224f963d2
-#
-#  # Needed for imgui
-#  - name: glfw
-#    buildsystem: cmake-ninja
-#    builddir: true
-#    config-opts:
-#      - -DBUILD_SHARED_LIBS=ON
-#      - -DGLFW_BUILD_EXAMPLES=OFF
-#      - -DGLFW_BUILD_TESTS=OFF
-#      - -DGLFW_BUILD_DOCS=OFF
-#    sources:
-#      - type: archive
-#        url: https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip
-#        sha256: 08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7
-#    cleanup:
-#      - /include
-#      - /lib/pkgconfig
-#
-#  - name: imgui
-#    buildsystem: cmake
-#    sources:
-#      - type: archive
-#        url: https://github.com/ocornut/imgui/archive/refs/tags/v1.88.zip
-#        sha256: 81087a74599e5890a07b636887cee73a7dc1a9eb9e1f19a4a0d82a76090bf4c2
-#      - type: file
-#        path: imguiCMakeLists.txt
-#        dest-filename: CMakeLists.txt
-#
-#  - name: Cemu
-#    buildsystem: cmake-ninja
-#    builddir: true
-#    config-opts:
-#      - -DENABLE_VCPKG=false
-#      - -DCMAKE_BUILD_TYPE=release 
-#      - -DCMAKE_C_COMPILER=/usr/bin/gcc 
-#      - -DCMAKE_CXX_COMPILER=/usr/bin/g++
-#      - -G Ninja
-#      - -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja
-#    sources:
-#      - type: git
-#        url: https://github.com/cemu-project/Cemu
-#        commit: d8da8a54a6c08296a884b892d714cabcb7e4bdb5
-#    cleanup:
-#      - /app/include
-#      - /app/lib/*.a
-#      - /app/lib/*.la
-#      - /app/lib/pkgconfig
-#
-  # CEMU - END

  # External manifests end

@ -1424,4 +929,4 @@ modules:
    sources:
      - type: git
        url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.5.4b
+        branch: cooker-0.6.0b