From 710cd320719fd9fa879f030412761ad3fa8bd3cb Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Apr 2022 19:15:00 +0900 Subject: [PATCH 01/47] Initializing integrated --- .gitmodules | 3 +++ com.xargon.retrodeck.yml | 14 +++++++------- rd-submodules/retroarch | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) create mode 160000 rd-submodules/retroarch diff --git a/.gitmodules b/.gitmodules index 1e7a9909..9d6f4fb6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "shared-modules"] path = shared-modules url = https://github.com/flathub/shared-modules.git +[submodule "rd-submodules/retroarch"] + path = rd-submodules/retroarch + url = https://github.com/flathub/org.libretro.RetroArch.git diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 890e1b65..c4e16339 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -205,8 +205,8 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata modules: - - libpng/libpng-1.6.35.json - - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - rd-submodules/retroarch/libpng/libpng-1.6.35.json + - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json @@ -214,11 +214,11 @@ modules: - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - - libbz2/libbz2-1.0.8.json - - xrandr/xrandr-1.5.1.json - - libaio/libaio-0.3.112.json - - shared-modules/glu/glu-9.json - - libdecor/libdecor-0.1.0.json + - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json + - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json + - rd-submodules/retroarch/libaio/libaio-0.3.112.json + - rd-submodules/retroarch/shared-modules/glu/glu-9.json + - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json - name: retroarch-filers-video subdir: gfx/video_filters make-install-args: diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch new file mode 160000 index 00000000..bcd152ba --- /dev/null +++ b/rd-submodules/retroarch @@ -0,0 +1 @@ +Subproject commit bcd152baf434eea464b9e58e48078ff674c13886 From ff7e24e73b71bb4a6d301be81cb40c0795303c8a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 4 Apr 2022 22:25:32 +0900 Subject: [PATCH 02/47] Bugfix: SD Card was not rw --- com.xargon.retrodeck.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index c4e16339..77833256 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -12,6 +12,7 @@ finish-args: - --share=network - --device=all - --filesystem=~/retrodeck:create + - --filesystem=/run/media/mmcblk0p1 - --allow=multiarch - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.PowerManagement.Inhibit @@ -205,8 +206,8 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata modules: - - rd-submodules/retroarch/libpng/libpng-1.6.35.json - - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - libpng/libpng-1.6.35.json + - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json @@ -214,11 +215,11 @@ modules: - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json - - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json - - rd-submodules/retroarch/libaio/libaio-0.3.112.json - - rd-submodules/retroarch/shared-modules/glu/glu-9.json - - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json + - libbz2/libbz2-1.0.8.json + - xrandr/xrandr-1.5.1.json + - libaio/libaio-0.3.112.json + - shared-modules/glu/glu-9.json + - libdecor/libdecor-0.1.0.json - name: retroarch-filers-video subdir: gfx/video_filters make-install-args: From ce2141b4c42b995e607bddf9dad5b3b6dd775149 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 22:23:53 +0900 Subject: [PATCH 03/47] Create cooker.yml --- .github/workflows/cooker.yml | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/cooker.yml diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml new file mode 100644 index 00000000..8f197aa1 --- /dev/null +++ b/.github/workflows/cooker.yml @@ -0,0 +1,65 @@ +# Due to the changes to the build systems actually on the branch integrated, this script will fail on main until merged + +name: Cooker + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ '*' ] + pull_request: + branches: [ '*' ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build_cooker_snap: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + + - name: Prepearing enviornment + run: | + sudo apt install flatpak flatpak-builder + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 + + # Runs a set of commands using the runners shell + - name: Building flatpak + run: | + sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml + sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml + sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + tag: "${{ steps.version.outputs.version }}" + body: | + # Release Notes (Cooker) + This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + + Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues on this build and instead post in the `#pre-release-feedback` section of discord. + + See the [wiki](https://amberelec.org/Contributing-to-AmberELEC) for more info. + + ### Changes (since last prerelease version): + ${{ github.event.client_payload.release_notes }} + + ### Upgrade Instructions + You can update to this release using the `prerelease` channel on your device. This is the recommended way to use prerelease versions. + + + artifacts: "RetroDECK.flatpak" + allowUpdates: true + prerelease: true + draft: false + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker From 1a4c575cf3ae819a279fa1b06b5f803a6ea795e6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 22:33:03 +0900 Subject: [PATCH 04/47] Redirected retroarch to rd-submodules subfolder --- com.xargon.retrodeck.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 77833256..17990aab 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -190,9 +190,9 @@ modules: url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - type: file - path: org.libretro.RetroArch.appdata.xml + path: rd-submodules/org.libretro.RetroArch.appdata.xml - type: file - path: retroarch.cfg + path: rd-submodules/retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- @@ -206,8 +206,8 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata modules: - - libpng/libpng-1.6.35.json - - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - rd-submodules/libpng/libpng-1.6.35.json + - rd-submodules/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json @@ -215,11 +215,11 @@ modules: - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - - libbz2/libbz2-1.0.8.json - - xrandr/xrandr-1.5.1.json - - libaio/libaio-0.3.112.json - - shared-modules/glu/glu-9.json - - libdecor/libdecor-0.1.0.json + - rd-submodules/libbz2/libbz2-1.0.8.json + - rd-submodules/xrandr/xrandr-1.5.1.json + - rd-submodules/libaio/libaio-0.3.112.json + - rd-submodules/shared-modules/glu/glu-9.json + - rd-submodules/libdecor/libdecor-0.1.0.json - name: retroarch-filers-video subdir: gfx/video_filters make-install-args: From ba4bf100f1caec5a497ac904d9c5ee63412ef85b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 22:40:10 +0900 Subject: [PATCH 05/47] Redirected retroarch to rd-submodules/retroarch subfolder --- com.xargon.retrodeck.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 17990aab..ed01ad32 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -190,9 +190,9 @@ modules: url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - type: file - path: rd-submodules/org.libretro.RetroArch.appdata.xml + path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml - type: file - path: rd-submodules/retroarch.cfg + path: rd-submodules/retroarch/retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- @@ -206,8 +206,8 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata modules: - - rd-submodules/libpng/libpng-1.6.35.json - - rd-submodules/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - rd-submodules/retroarch/libpng/libpng-1.6.35.json + - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json @@ -215,11 +215,11 @@ modules: - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - - rd-submodules/libbz2/libbz2-1.0.8.json - - rd-submodules/xrandr/xrandr-1.5.1.json - - rd-submodules/libaio/libaio-0.3.112.json - - rd-submodules/shared-modules/glu/glu-9.json - - rd-submodules/libdecor/libdecor-0.1.0.json + - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json + - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json + - rd-submodules/retroarch/libaio/libaio-0.3.112.json + - rd-submodules/retroarch/shared-modules/glu/glu-9.json + - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json - name: retroarch-filers-video subdir: gfx/video_filters make-install-args: From 5081967d5517cdb86b44116c6c73d79aacf73449 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 23:03:41 +0900 Subject: [PATCH 06/47] Redirected retroarch to rd-submodules/retroarch subfolder --- com.xargon.retrodeck.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index ed01ad32..3a611bfe 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -193,6 +193,12 @@ modules: path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml - type: file path: rd-submodules/retroarch/retroarch.cfg + #debug + - type: shell + commands: + - ls -ln + - BREAK + #/debug post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From d2411d038a27177596cde95a6877a345aafd8fab Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 23:08:44 +0900 Subject: [PATCH 07/47] Update cooker.yml --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 8f197aa1..fb37d361 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -30,6 +30,7 @@ jobs: sudo apt install flatpak flatpak-builder sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 + git submodules init # Runs a set of commands using the runners shell - name: Building flatpak From 88ae5de255f338840b3257eb52947387dcf2d267 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Tue, 5 Apr 2022 23:09:51 +0900 Subject: [PATCH 08/47] Update cooker.yml --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index fb37d361..e6e0d2a0 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -30,7 +30,7 @@ jobs: sudo apt install flatpak flatpak-builder sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - git submodules init + git submodule init # Runs a set of commands using the runners shell - name: Building flatpak From c4fe897f1afb75a296839c7a20296d6d58d0ac6f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 23:15:12 +0900 Subject: [PATCH 09/47] Redirected retroarch to ../rd-submodules/retroarch subfolder --- com.xargon.retrodeck.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 3a611bfe..2cdaaa76 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -190,15 +190,9 @@ modules: url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - type: file - path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml + path: ../rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml - type: file - path: rd-submodules/retroarch/retroarch.cfg - #debug - - type: shell - commands: - - ls -ln - - BREAK - #/debug + path: ../rd-submodules/retroarch/retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From 9eec4ad82a4c94962a38382ab90db3d76639dc16 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 23:19:00 +0900 Subject: [PATCH 10/47] Redirected retroarch to ../rd-submodules/retroarch subfolder --- com.xargon.retrodeck.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 2cdaaa76..5c66ec73 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -189,10 +189,16 @@ modules: - type: git url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f + #debug + - type: shell + commands: + - ls -ln + - BREAK + #/debug - type: file - path: ../rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml + path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml - type: file - path: ../rd-submodules/retroarch/retroarch.cfg + path: rd-submodules/retroarch/retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From 713fdbf837813a285fafb999293a7b0fc2b3a540 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 23:28:47 +0900 Subject: [PATCH 11/47] Retroarch integration --- com.xargon.retrodeck.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 5c66ec73..334d4f4f 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -189,16 +189,12 @@ modules: - type: git url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - #debug - - type: shell - commands: - - ls -ln - - BREAK - #/debug + - type: dir + path: rd-submodules/retroarch/ - type: file - path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml + path: org.libretro.RetroArch.appdata.xml - type: file - path: rd-submodules/retroarch/retroarch.cfg + path: retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- @@ -212,8 +208,8 @@ modules: - mkdir -p ${FLATPAK_DEST}/share/appdata - cp org.libretro.RetroArch.appdata.xml ${FLATPAK_DEST}/share/appdata modules: - - rd-submodules/retroarch/libpng/libpng-1.6.35.json - - rd-submodules/retroarch/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json + - libpng/libpng-1.6.35.json + - nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.json - shared-modules/SDL/SDL-1.2.15.json - shared-modules/SDL/SDL_image-1.2.12.json - shared-modules/SDL/SDL_mixer-1.2.12.json @@ -221,11 +217,11 @@ modules: - shared-modules/SDL/SDL_ttf-2.0.11.json - shared-modules/libusb/libusb.json - shared-modules/gudev/gudev.json - - rd-submodules/retroarch/libbz2/libbz2-1.0.8.json - - rd-submodules/retroarch/xrandr/xrandr-1.5.1.json - - rd-submodules/retroarch/libaio/libaio-0.3.112.json - - rd-submodules/retroarch/shared-modules/glu/glu-9.json - - rd-submodules/retroarch/libdecor/libdecor-0.1.0.json + - libbz2/libbz2-1.0.8.json + - xrandr/xrandr-1.5.1.json + - libaio/libaio-0.3.112.json + - shared-modules/glu/glu-9.json + - libdecor/libdecor-0.1.0.json - name: retroarch-filers-video subdir: gfx/video_filters make-install-args: From 4a01be9de1f08c5f89a111ad264aac9168733593 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Apr 2022 23:36:28 +0900 Subject: [PATCH 12/47] Retroarch integration --- com.xargon.retrodeck.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 334d4f4f..92b340ff 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -190,11 +190,11 @@ modules: url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - type: dir - path: rd-submodules/retroarch/ - - type: file - path: org.libretro.RetroArch.appdata.xml - - type: file - path: retroarch.cfg + path: rd-submodules/retroarch + #- type: file + # path: org.libretro.RetroArch.appdata.xml + #- type: file + # path: retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From dfb47b52096829707c79e03899241bfedb710299 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Apr 2022 16:07:11 +0900 Subject: [PATCH 13/47] Retroarch integration --- com.xargon.retrodeck.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 92b340ff..77833256 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -189,12 +189,10 @@ modules: - type: git url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - - type: dir - path: rd-submodules/retroarch - #- type: file - # path: org.libretro.RetroArch.appdata.xml - #- type: file - # path: retroarch.cfg + - type: file + path: org.libretro.RetroArch.appdata.xml + - type: file + path: retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From 2a7f616f15f53b9eabbe4c19d9cc0f42d194b902 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Apr 2022 16:15:52 +0900 Subject: [PATCH 14/47] Retroarch integration --- com.xargon.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 77833256..62287a69 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -190,9 +190,9 @@ modules: url: https://github.com/libretro/RetroArch.git branch: de4e56ecf28a09057734f8624af6d62f3088734f - type: file - path: org.libretro.RetroArch.appdata.xml + path: rd-submodules/retroarch/org.libretro.RetroArch.appdata.xml - type: file - path: retroarch.cfg + path: rd-submodules/retroarch/retroarch.cfg post-install: - mkdir -p ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/ - >- From c6391df6bf8c9dcc7458a5c12bb01ccacbeac3ce Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:14:11 +0900 Subject: [PATCH 15/47] Update cooker.yml --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index e6e0d2a0..71fda8da 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -30,7 +30,7 @@ jobs: sudo apt install flatpak flatpak-builder sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - git submodule init + git submodule update # Runs a set of commands using the runners shell - name: Building flatpak From 0cbba34007c58c71c965f69c88c6c8ae691286cd Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:17:10 +0900 Subject: [PATCH 16/47] Update cooker.yml --- .github/workflows/cooker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 71fda8da..2d180e8f 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -27,10 +27,11 @@ jobs: - name: Prepearing enviornment run: | + git submodule init + git submodule update sudo apt install flatpak flatpak-builder sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - git submodule update # Runs a set of commands using the runners shell - name: Building flatpak From 7d44958fc0c3b7c66147c3b9bc68908ba290b911 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:03:20 +0900 Subject: [PATCH 17/47] Update cooker.yml --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 2d180e8f..bbbc2326 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -32,6 +32,7 @@ jobs: sudo apt install flatpak flatpak-builder sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 + flatpak --version # Runs a set of commands using the runners shell - name: Building flatpak From d22984d893499e5deea924194f9d1caa989f1de3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:16:25 +0900 Subject: [PATCH 18/47] Update cooker.yml --- .github/workflows/cooker.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index bbbc2326..e1681674 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -24,22 +24,18 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - - name: Prepearing enviornment run: | git submodule init git submodule update - sudo apt install flatpak flatpak-builder - sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - flatpak --version + #sudo apt install flatpak flatpak-builder + #sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + #sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 + #flatpak --version # Runs a set of commands using the runners shell - name: Building flatpak - run: | - sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml - sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + uses: louib/flatpak-action@1.0.3 - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 9af69a277d9d4692d780e14c16479958300e382b Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:21:19 +0900 Subject: [PATCH 19/47] Update cooker.yml --- .github/workflows/cooker.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index e1681674..1c71a695 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -24,18 +24,21 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + - name: Prepearing enviornment run: | git submodule init git submodule update - #sudo apt install flatpak flatpak-builder - #sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - #sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - #flatpak --version + - name: Initializing flatpak-action + uses: louib/flatpak-action@1.0.3 + # Runs a set of commands using the runners shell - name: Building flatpak - uses: louib/flatpak-action@1.0.3 + run: | + flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml + flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml + flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 7298a457e693c3bef0603da90e24ff08bef324e8 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:26:22 +0900 Subject: [PATCH 20/47] Update cooker.yml --- .github/workflows/cooker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 1c71a695..d2bc1ce7 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -30,8 +30,8 @@ jobs: git submodule init git submodule update - - name: Initializing flatpak-action - uses: louib/flatpak-action@1.0.3 + - name: Initializing Flatpak Builder + uses: bilelmoussaoui/flatpak-github-actions@v2 # Runs a set of commands using the runners shell - name: Building flatpak From 61667781523f63ac0904094187ed31c4a53d4e44 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:31:43 +0900 Subject: [PATCH 21/47] Update cooker.yml --- .github/workflows/cooker.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index d2bc1ce7..c227293e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -30,15 +30,17 @@ jobs: git submodule init git submodule update - - name: Initializing Flatpak Builder - uses: bilelmoussaoui/flatpak-github-actions@v2 - # Runs a set of commands using the runners shell - - name: Building flatpak - run: | - flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml - flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + #- name: Building flatpak + # run: | + # flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml + # flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml + # flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + with: + bundle: RetroDECK.flatpak + manifest-path: com.xargon.retrodeck.yml + cache-key: flatpak-builder-${{ github.sha }} - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From 2fcd5a8561fa3634734aba8e565620ba0c2adf29 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:36:01 +0900 Subject: [PATCH 22/47] Update cooker.yml --- .github/workflows/cooker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index c227293e..2fcd6184 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -41,6 +41,7 @@ jobs: bundle: RetroDECK.flatpak manifest-path: com.xargon.retrodeck.yml cache-key: flatpak-builder-${{ github.sha }} + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From cefe1ed7adbee2c83b2e142754c584338fa34a67 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:43:10 +0900 Subject: [PATCH 23/47] Update cooker.yml --- .github/workflows/cooker.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 2fcd6184..0b08e5cb 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -15,16 +15,10 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" build_cooker_snap: - # The type of runner that the job will run on runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - - name: Prepearing enviornment run: | git submodule init @@ -36,13 +30,22 @@ jobs: # flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml # flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml # flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + + Build_flatpak: + runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 + options: --privileged + steps: - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: bundle: RetroDECK.flatpak manifest-path: com.xargon.retrodeck.yml cache-key: flatpak-builder-${{ github.sha }} - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 + Create_cooker_release: + runs-on: ubuntu-latest + steps: - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: From dcba66276b911ea5e7380df3ae6dd09900e2eead Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:46:31 +0900 Subject: [PATCH 24/47] Update cooker.yml --- .github/workflows/cooker.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 0b08e5cb..1331dac4 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -17,7 +17,11 @@ on: jobs: build_cooker_snap: runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 + options: --privileged steps: + - uses: actions/checkout@v3 - name: Prepearing enviornment run: | @@ -31,21 +35,13 @@ jobs: # flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml # flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - Build_flatpak: - runs-on: ubuntu-latest - container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 - options: --privileged - steps: - - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + - name: Build Flatpak with: bundle: RetroDECK.flatpak manifest-path: com.xargon.retrodeck.yml cache-key: flatpak-builder-${{ github.sha }} - Create_cooker_release: - runs-on: ubuntu-latest - steps: - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: From 1ad3f86f7cbb482dd8e2df8fd1af0074d78518a7 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:54:48 +0900 Subject: [PATCH 25/47] Update cooker.yml --- .github/workflows/cooker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 1331dac4..36ae8da8 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -23,6 +23,7 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Prepearing enviornment run: | git submodule init @@ -35,8 +36,8 @@ jobs: # flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml # flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 - - name: Build Flatpak + - name: Build Flatpak + uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 with: bundle: RetroDECK.flatpak manifest-path: com.xargon.retrodeck.yml From c17c4880ae4959c44880c37958c65554b1bce41a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Apr 2022 22:16:24 +0900 Subject: [PATCH 26/47] Cooker git action update and split --- .github/workflows/cooker.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 36ae8da8..04729b31 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -15,33 +15,32 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: + # This workflow contains a single job called "build" build_cooker_snap: + # The type of runner that the job will run on runs-on: ubuntu-latest - container: - image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08 - options: --privileged + + # Steps represent a sequence of tasks that will be executed as part of the job steps: - + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - + - name: Prepearing enviornment run: | git submodule init git submodule update + sudo add-apt-repository ppa:alexlarsson/flatpak + sudo apt-get update + sudo apt install flatpak flatpak-builder 7z + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 # Runs a set of commands using the runners shell - #- name: Building flatpak - # run: | - # flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - # flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml - # flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - - - name: Build Flatpak - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 - with: - bundle: RetroDECK.flatpak - manifest-path: com.xargon.retrodeck.yml - cache-key: flatpak-builder-${{ github.sha }} + - name: Building flatpak + run: | + sudo flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml + sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml + sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 From fa4a8612d57e29ee23b7d2037a6b309ad208604d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Apr 2022 22:20:03 +0900 Subject: [PATCH 27/47] Cooker git action update and split --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 04729b31..8c0b06be 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -31,7 +31,7 @@ jobs: git submodule update sudo add-apt-repository ppa:alexlarsson/flatpak sudo apt-get update - sudo apt install flatpak flatpak-builder 7z + sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 From f7e9cfde544e6b389e6eb4d473f01c8a4038ad31 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 6 Apr 2022 23:40:32 +0900 Subject: [PATCH 28/47] Renamed integrated into cooker --- .github/workflows/main.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 35bdf1ef..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: beta-build - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: [ main ] - pull_request: - branches: [ main ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - ./build-flatpak.sh - flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml - flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck From c084f73ee17ebfe050e772e72b5523d0eb089dd3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 00:02:00 +0900 Subject: [PATCH 29/47] Initial Yuzu support --- com.xargon.retrodeck.yml | 348 ++++++++++++++++++++------------------- 1 file changed, 180 insertions(+), 168 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 62287a69..a0deb0ab 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -33,6 +33,20 @@ cleanup: - /lib/libfreeimage.a - /lib/libogg.a - /lib/libvpx.a + # Yuzu + - /include + - /bin/glslangValidator + - /bin/zip* + - /bin/zstd* + - /lib/pkg-config + - /share/doc + - /share/man + - /src + - '*.a' + - '*.la' +cleanup-commands: + # Yuzu + - /app/cleanup-BaseApp.sh modules: @@ -178,7 +192,6 @@ modules: # External manifests start # RetroArch - https://github.com/flathub/org.libretro.RetroArch - # nope: remember to put ' /org.libretro.RetroArch/' as submodules prefix - name: retroarch config-opts: @@ -310,173 +323,172 @@ modules: # Yuzu - https://github.com/flathub/org.yuzu_emu.yuzu - #- shared-modules/libusb/libusb.json - #- name: libzip - # buildsystem: cmake-ninja - # config-opts: - # - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - # sources: - # - type: archive - # url: https://github.com/nih-at/libzip/archive/v1.8.0.tar.gz - # sha256: 83e5d6d5dbe8f9df80aad388fa523ca3558398ed440a5afda6ef9b36b0ffdc1f - # x-checker-data: - # type: anitya - # project-id: 10649 - # url-template: https://github.com/nih-at/libzip/archive/v$version.tar.gz - #- name: zstd - # buildsystem: simple - # build-commands: - # - make -j $FLATPAK_BUILDER_N_JOBS - # - make PREFIX=/ DESTDIR="${FLATPAK_DEST}" install - # 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: - # - '-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 - # 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.8.0.tar.gz - # sha256: 9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0 - # 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_BUILD_TESTING=OFF' - # builddir: true - # sources: - # - type: archive - # url: https://github.com/catchorg/Catch2/archive/v2.13.8.tar.gz - # sha256: b9b592bd743c09f13ee4bf35fc30eeee2748963184f6bea836b146e6cc2a585a - # x-checker-data: - # type: anitya - # stable-only: true - # 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' - # - '-DJSON_BuildTests=OFF' - # sources: - # - type: archive - # url: https://github.com/nlohmann/json/archive/v3.10.5.tar.gz - # sha256: 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 - # x-checker-data: - # type: anitya - # project-id: 141453 - # url-template: https://github.com/nlohmann/json/archive/v$version.tar.gz - #- name: boost - # buildsystem: simple - # build-commands: - # - ./bootstrap.sh --with-libraries=context,container,system,headers - # - ./b2 -j $FLATPAK_BUILDER_N_JOBS install --prefix=/app - # sources: - # - type: archive - # url: >- - # https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2 - # sha256: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc - # x-checker-data: - # type: anitya - # project-id: 6845 - # url-template: >- - # https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_78_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.1 - # commit: 84483da70d903239d4536763fde8c7e6c4e80784 - # x-checker-data: - # type: git - # tag-pattern: ^n([\d.]+)$ - #- 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=963' - # - '-DBUILD_TAG=mainline-963' - # - '-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline' - # 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 - # - >- - # install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml - # /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml - # - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop - # - >- - # desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key - # Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop - # - >- - # install -Dm644 ../dist/yuzu.svg - # /app/share/icons/hicolor/scalable/apps/yuzu.svg - # - >- - # mv /app/share/mime/packages/yuzu.xml - # /app/share/mime/packages/org.yuzu_emu.yuzu.xml - # - >- - # sed 's/yuzu/org.yuzu_emu.yuzu/g' -i - # /app/share/mime/packages/org.yuzu_emu.yuzu.xml - # sources: - # - type: git - # url: https://github.com/yuzu-emu/yuzu-mainline.git - # tag: mainline-0-963 - # commit: 15bf148daf441e69265ea99771e0f1d327c5c10e - # disable-shallow-clone: true - # x-checker-data: - # type: git - # tag-pattern: ^(mainline-0-\d+)$ - # - type: file - # path: org.yuzu_emu.yuzu.metainfo.xml - # - type: file - # path: yuzu-launcher.sh - # - type: file - # path: compatibility_list.json - + - name: libzip + buildsystem: cmake-ninja + config-opts: + - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' + sources: + - type: archive + url: https://github.com/nih-at/libzip/archive/v1.8.0.tar.gz + sha256: 83e5d6d5dbe8f9df80aad388fa523ca3558398ed440a5afda6ef9b36b0ffdc1f + x-checker-data: + type: anitya + project-id: 10649 + url-template: https://github.com/nih-at/libzip/archive/v$version.tar.gz + - name: zstd + buildsystem: simple + build-commands: + - make -j $FLATPAK_BUILDER_N_JOBS + - make PREFIX=/ DESTDIR="${FLATPAK_DEST}" install + 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: + - '-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 + 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.8.0.tar.gz + sha256: 9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0 + 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_BUILD_TESTING=OFF' + builddir: true + sources: + - type: archive + url: https://github.com/catchorg/Catch2/archive/v2.13.8.tar.gz + sha256: b9b592bd743c09f13ee4bf35fc30eeee2748963184f6bea836b146e6cc2a585a + x-checker-data: + type: anitya + stable-only: true + 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' + - '-DJSON_BuildTests=OFF' + sources: + - type: archive + url: https://github.com/nlohmann/json/archive/v3.10.5.tar.gz + sha256: 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 + x-checker-data: + type: anitya + project-id: 141453 + url-template: https://github.com/nlohmann/json/archive/v$version.tar.gz + - name: boost + buildsystem: simple + build-commands: + - ./bootstrap.sh --with-libraries=context,container,system,headers + - ./b2 -j $FLATPAK_BUILDER_N_JOBS install --prefix=/app + sources: + - type: archive + url: >- + https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2 + sha256: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc + x-checker-data: + type: anitya + project-id: 6845 + url-template: >- + https://boostorg.jfrog.io/artifactory/main/release/$version/source/boost_1_78_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.1 + commit: 84483da70d903239d4536763fde8c7e6c4e80784 + x-checker-data: + type: git + tag-pattern: ^n([\d.]+)$ + - 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=969' + - '-DBUILD_TAG=mainline-969' + - '-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline' + 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 + - >- + install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml + /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml + - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop + - >- + desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key + Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop + - >- + install -Dm644 ../dist/yuzu.svg + /app/share/icons/hicolor/scalable/apps/yuzu.svg + - >- + mv /app/share/mime/packages/yuzu.xml + /app/share/mime/packages/org.yuzu_emu.yuzu.xml + - >- + sed 's/yuzu/org.yuzu_emu.yuzu/g' -i + /app/share/mime/packages/org.yuzu_emu.yuzu.xml + sources: + - type: git + url: https://github.com/yuzu-emu/yuzu-mainline.git + tag: mainline-0-969 + commit: d179e12137cd8ff88b0eade7d13de801661f869b + disable-shallow-clone: true + x-checker-data: + type: git + tag-pattern: ^(mainline-0-\d+)$ + - type: file + path: org.yuzu_emu.yuzu.metainfo.xml + - type: file + path: yuzu-launcher.sh + - type: file + path: compatibility_list.json + # Yuzu - END From 6b83f563db5bd513bf70b151b47a2573d24aa498 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 00:20:47 +0900 Subject: [PATCH 30/47] Added roms mover tool --- tools-gamelist.xml | 12 ++++++++---- tools/move-roms.sh | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 tools/move-roms.sh diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 99e1e1f5..3c867b28 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -5,10 +5,14 @@ Start RetroArch RetroArch Start RetroArch to manually tweak your settings. - 20100525T000000 - Libretro - Libretro - Emulator + true + true + + + ./move-roms.sh + Move roms folder + Move roms folder + Move roms folder from internal to external and vice versa. true true diff --git a/tools/move-roms.sh b/tools/move-roms.sh new file mode 100644 index 00000000..6128ab9a --- /dev/null +++ b/tools/move-roms.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ -d ~/retrodeck/roms ] && [ -d ~/retrodeck/roms ] +then # found both internal and sd folders + kdialog --title "RetroDECK" --warning "I found a roms folder both in internal and SD Card, in order to make this tool useful you should remove one of the two." + exit 0 +fi + +if [ -d ~/retrodeck/roms ] && [ ! -d /run/media/mmcblk0p1/retrodeck/roms ] +then # found internal folder and not the external + roms_path=~/retrodeck + new_roms_path=/run/media/mmcblk0p1/retrodeck +fi + +if [ ! -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/retrodeck/roms ] +then # found external folder and not the internal + roms_path=/run/media/mmcblk0p1/retrodeck + new_roms_path=~/retrodeck +fi + +mkdir -p $new_roms_path +mv -f $roms_path/roms $new_roms_path/roms +rm -f /var/config/emulationstation/ROMs +ln -s $new_roms_path/roms /var/config/emulationstation/ROMs +rm -f $roms_path/roms From 2ff3da44472ae25563272a477a317665c1bd9343 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 00:22:46 +0900 Subject: [PATCH 31/47] Initial Yuzu support --- com.xargon.retrodeck.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index a0deb0ab..ed570e51 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -458,8 +458,8 @@ modules: post-install: - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - >- - install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml - /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml +# install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml +# /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop - >- desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key @@ -482,8 +482,8 @@ modules: x-checker-data: type: git tag-pattern: ^(mainline-0-\d+)$ - - type: file - path: org.yuzu_emu.yuzu.metainfo.xml + #- type: file + # path: org.yuzu_emu.yuzu.metainfo.xml - type: file path: yuzu-launcher.sh - type: file From 192b7c4e50210a1fb60681bf590ab67f2185dc47 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 00:30:42 +0900 Subject: [PATCH 32/47] Initial Yuzu support --- com.xargon.retrodeck.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index ed570e51..fdf994c4 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -455,24 +455,24 @@ modules: cleanup: - /share/man - /share/pixmaps - post-install: - - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher - - >- +# post-install: +# - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher +# - >- # install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml # /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml - - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop - - >- - desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key - Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop - - >- - install -Dm644 ../dist/yuzu.svg - /app/share/icons/hicolor/scalable/apps/yuzu.svg - - >- - mv /app/share/mime/packages/yuzu.xml - /app/share/mime/packages/org.yuzu_emu.yuzu.xml - - >- - sed 's/yuzu/org.yuzu_emu.yuzu/g' -i - /app/share/mime/packages/org.yuzu_emu.yuzu.xml +# - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop +# - >- +# desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key +# Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop +# - >- +# install -Dm644 ../dist/yuzu.svg +# /app/share/icons/hicolor/scalable/apps/yuzu.svg +# - >- +# mv /app/share/mime/packages/yuzu.xml +# /app/share/mime/packages/org.yuzu_emu.yuzu.xml +# - >- +# sed 's/yuzu/org.yuzu_emu.yuzu/g' -i +# /app/share/mime/packages/org.yuzu_emu.yuzu.xml sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git @@ -484,10 +484,10 @@ modules: tag-pattern: ^(mainline-0-\d+)$ #- type: file # path: org.yuzu_emu.yuzu.metainfo.xml - - type: file - path: yuzu-launcher.sh - - type: file - path: compatibility_list.json + #- type: file + # path: yuzu-launcher.sh + #- type: file + # path: compatibility_list.json #is it needed? # Yuzu - END From 9dfd9fe810577d421c53620b6f064c3bde09d8ae Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 00:48:34 +0900 Subject: [PATCH 33/47] Fixed tag generator in cooker.yml --- .github/workflows/cooker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 8c0b06be..93d87337 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -42,10 +42,14 @@ jobs: sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck + - name: Get date for artifacts + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')" + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{ steps.version.outputs.version }}" + tag: "${{ steps.date.outputs.date }}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From d3e833df1d4f3c343a86f09c73170a8066fb52ec Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 10:43:43 +0900 Subject: [PATCH 34/47] Initial Yuzu support --- .gitmodules | 3 +++ com.xargon.retrodeck.yml | 52 +++++++++++++++++++++------------------- rd-submodules/yuzu | 1 + 3 files changed, 32 insertions(+), 24 deletions(-) create mode 160000 rd-submodules/yuzu diff --git a/.gitmodules b/.gitmodules index 9d6f4fb6..ceb5ef53 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "rd-submodules/retroarch"] path = rd-submodules/retroarch url = https://github.com/flathub/org.libretro.RetroArch.git +[submodule "rd-submodules/yuzu"] + path = rd-submodules/yuzu + url = https://github.com/flathub/org.yuzu_emu.yuzu diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index fdf994c4..45a4604e 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -2,6 +2,10 @@ app-id: com.xargon.retrodeck runtime: org.kde.Platform runtime-version: '5.15-21.08' sdk: org.kde.Sdk +# Needed for Yuzu +base: io.qt.qtwebengine.BaseApp +base-version: 5.15-21.08 +# /Needed for Yuzu command: retrodeck.sh finish-args: @@ -455,24 +459,24 @@ modules: cleanup: - /share/man - /share/pixmaps -# post-install: -# - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher -# - >- -# install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml -# /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml -# - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop -# - >- -# desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key -# Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop -# - >- -# install -Dm644 ../dist/yuzu.svg -# /app/share/icons/hicolor/scalable/apps/yuzu.svg -# - >- -# mv /app/share/mime/packages/yuzu.xml -# /app/share/mime/packages/org.yuzu_emu.yuzu.xml -# - >- -# sed 's/yuzu/org.yuzu_emu.yuzu/g' -i -# /app/share/mime/packages/org.yuzu_emu.yuzu.xml + post-install: + - install -Dm755 ../yuzu-launcher.sh /app/bin/yuzu-launcher + - >- + install -Dm644 ../org.yuzu_emu.yuzu.metainfo.xml + /app/share/appdata/org.yuzu_emu.yuzu.metainfo.xml + - desktop-file-install --dir=/app/share/applications ../dist/yuzu.desktop + - >- + desktop-file-edit --set-key StartupWMClass --set-value yuzu --set-key + Exec --set-value yuzu-launcher /app/share/applications/yuzu.desktop + - >- + install -Dm644 ../dist/yuzu.svg + /app/share/icons/hicolor/scalable/apps/yuzu.svg + - >- + mv /app/share/mime/packages/yuzu.xml + /app/share/mime/packages/org.yuzu_emu.yuzu.xml + - >- + sed 's/yuzu/org.yuzu_emu.yuzu/g' -i + /app/share/mime/packages/org.yuzu_emu.yuzu.xml sources: - type: git url: https://github.com/yuzu-emu/yuzu-mainline.git @@ -482,12 +486,12 @@ modules: x-checker-data: type: git tag-pattern: ^(mainline-0-\d+)$ - #- type: file - # path: org.yuzu_emu.yuzu.metainfo.xml - #- type: file - # path: yuzu-launcher.sh - #- type: file - # path: compatibility_list.json #is it needed? + - type: file + path: rd-submodules/yuzu/org.yuzu_emu.yuzu.metainfo.xml + - type: file + path: rd-submodules/yuzu/yuzu-launcher.sh + - type: file + path: rd-submodules/yuzu/compatibility_list.json # Yuzu - END diff --git a/rd-submodules/yuzu b/rd-submodules/yuzu new file mode 160000 index 00000000..c2395647 --- /dev/null +++ b/rd-submodules/yuzu @@ -0,0 +1 @@ +Subproject commit c23956479d76c12b559316cfd30755eef5e09902 From 6df459ee6f4217ede3d75709ad08d074995eac8f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 10:49:18 +0900 Subject: [PATCH 35/47] Added qt to cooker action --- .github/workflows/cooker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 93d87337..31afba36 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -33,7 +33,7 @@ jobs: sudo apt-get update sudo apt install flatpak flatpak-builder p7zip-full sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 + sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 # Runs a set of commands using the runners shell - name: Building flatpak From ae8cdd053c0f25e64226b4f4b7ec5fa947ed05d3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 7 Apr 2022 14:00:00 +0900 Subject: [PATCH 36/47] Update cooker.yml --- .github/workflows/cooker.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 31afba36..273a516c 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -54,15 +54,10 @@ jobs: # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. - Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues on this build and instead post in the `#pre-release-feedback` section of discord. - - See the [wiki](https://amberelec.org/Contributing-to-AmberELEC) for more info. + Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. ### Changes (since last prerelease version): ${{ github.event.client_payload.release_notes }} - - ### Upgrade Instructions - You can update to this release using the `prerelease` channel on your device. This is the recommended way to use prerelease versions. artifacts: "RetroDECK.flatpak" From de82f6af143060ca6863606d80eea09282e4acf3 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Thu, 7 Apr 2022 14:00:59 +0900 Subject: [PATCH 37/47] Update cooker.yml --- .github/workflows/cooker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 273a516c..321f248e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -54,7 +54,8 @@ jobs: # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. - Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. + Cooker channel is provided for the community to test fixes and explore new functionality. + Please DO NOT open issues or ask support on this build. ### Changes (since last prerelease version): ${{ github.event.client_payload.release_notes }} From 27256ab865e43eed7206c2019f0becb33b3f596a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 16:56:36 +0900 Subject: [PATCH 38/47] Initial PCSX2 integration --- .gitmodules | 3 + com.xargon.retrodeck.yml | 137 ++++++++++++++++++++++++++++++++++++++- rd-submodules/pcsx2 | 1 + 3 files changed, 140 insertions(+), 1 deletion(-) create mode 160000 rd-submodules/pcsx2 diff --git a/.gitmodules b/.gitmodules index ceb5ef53..c4ddce75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "rd-submodules/yuzu"] path = rd-submodules/yuzu url = https://github.com/flathub/org.yuzu_emu.yuzu +[submodule "rd-submodules/pcsx2"] + path = rd-submodules/pcsx2 + url = https://github.com/flathub/net.pcsx2.PCSX2.git diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 45a4604e..7a1e6aef 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -495,14 +495,149 @@ modules: # Yuzu - END + # pcsx2 - 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.1.5 + commit: 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 + x-checker-data: + type: git + tag-pattern: ^v([\d.]+)$ + modules: + - shared-modules/glu/glu-9.json + - name: libaio + no-autogen: true + make-install-args: + - prefix=${FLATPAK_DEST} + sources: + - type: git + url: https://pagure.io/libaio.git + tag: libaio-0.3.112 + commit: d025927efa75a0d1b46ca3a5ef331caa2f46ee0e + 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' + cleanup: + - /share/pixmaps + - /share/man + - /share/doc + post-install: + - >- + desktop-file-edit --set-key=Exec --set-value=pcsx2 + /app/share/applications/PCSX2.desktop + - >- + install -Dm644 ../AppIcon128.png + /app/share/icons/hicolor/128x128/apps/PCSX2.png + - >- + install -Dm644 ../net.pcsx2.PCSX2.metainfo.xml + /app/share/metainfo/net.pcsx2.PCSX2.metainfo.xml + sources: + - type: git + url: https://github.com/PCSX2/pcsx2.git + tag: v1.7.2554 + commit: 0d1675fbaa0d40874df98eed6270efc55620271b + - type: file + path: rd-submodules/pcsx2/net.pcsx2.PCSX2.metainfo.xml + - type: file + path: rd-submodules/pcsx2/AppIcon128.png + + # pcsx2 - END + # Ryujinx # Xemu # Rpcs3 - # pcsx2 # vita3k # dolphin # arduboy + # pocket station + # cemu - win only: wine # External manifests end diff --git a/rd-submodules/pcsx2 b/rd-submodules/pcsx2 new file mode 160000 index 00000000..68a40d61 --- /dev/null +++ b/rd-submodules/pcsx2 @@ -0,0 +1 @@ +Subproject commit 68a40d61b37b6f9c9033dc93d426570b86938e3f From 7bb74e1b884e1d8155e5875b27f0057b0e9abf02 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 16:59:39 +0900 Subject: [PATCH 39/47] Cooker builder cleanup --- .github/workflows/cooker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 321f248e..3e0b9291 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -56,10 +56,6 @@ jobs: Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. - - ### Changes (since last prerelease version): - ${{ github.event.client_payload.release_notes }} - artifacts: "RetroDECK.flatpak" allowUpdates: true From a0c67f699427bbca063e83ad4f1cb578c678e36b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 21:49:19 +0900 Subject: [PATCH 40/47] Cooker is now building only cooker --- .github/workflows/cooker.yml | 6 ++++-- com.xargon.retrodeck.yml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 3e0b9291..62f299d2 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -6,9 +6,11 @@ name: Cooker on: # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ '*' ] + branches: + - cooker pull_request: - branches: [ '*' ] + branches: + - cooker # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 7a1e6aef..27ae7f77 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -638,6 +638,7 @@ modules: # arduboy # pocket station # cemu - win only: wine + # Anbox? # External manifests end From bfc938d9c9dd87fd6d00615cf61642a1995c04c5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 22:00:44 +0900 Subject: [PATCH 41/47] Various bugfixes --- retrodeck.sh | 4 ++-- tools/start-retroarch.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index dadd3c21..c2d198be 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -64,7 +64,7 @@ then cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg - mkdir -p /var/config/emulationstation/.emulationstation/gamelists/tools/ + mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ cp /app/retrodeck/tools-gamelist.xml /var/config/emulationstation/.emulationstation/custom_systems/tools/gamelist.xml mkdir -p /var/config/retroarch/cores/ @@ -72,7 +72,7 @@ then touch ~/retrodeck/.lock - kdialog --title "RetroDECK" --msgbox "Initialization completed, please put your roms in: $roms_folder.\nIf you wish to change the roms location you may use the tool located the tools section of RetroDECK (coming soon)." + kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder.\n\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK." else emulationstation --home /var/config/emulationstation fi diff --git a/tools/start-retroarch.sh b/tools/start-retroarch.sh index 11de5e1a..621a1b24 100644 --- a/tools/start-retroarch.sh +++ b/tools/start-retroarch.sh @@ -1,5 +1,5 @@ #!/bin/bash -kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing. Are you sure do you want to continue?" +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the RetroArch configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" if [ $? == 0 ]; then retroarch \ No newline at end of file From 8df9f4d1efe4f72a655f17c14b9240ce8143d069 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 22:36:28 +0900 Subject: [PATCH 42/47] Fixed wrapper logics --- retrodeck.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) mode change 100644 => 100755 retrodeck.sh diff --git a/retrodeck.sh b/retrodeck.sh old mode 100644 new mode 100755 index c2d198be..4d410f51 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -22,20 +22,20 @@ then if is_mounted "/run/media/mmcblk0p1" then roms_folder=/run/media/mmcblk0p1/retrodeck/roms - mkdir -p /run/media/mmcblk0p1/retrodeck/ else kdialog --title "RetroDECK" --error "SD Card is not readable, please check if it inserted or mounted correctly and run RetroDECK again." exit 0 fi fi + mkdir -p $roms_folder + # initializing ES-DE mkdir -p /var/config/retrodeck/tools # Cleaning rm -rf /var/config/emulationstation/ - rm ~/retrodeck/bios rm /var/config/retrodeck/tools/* kdialog --title "RetroDECK" --msgbox "EmulationStation will now initialize the system, please don't edit the roms location, just select:\n\nCREATE DIRECTORIES, YES, QUIT\n\nRetroDECK will manage the rest." @@ -46,9 +46,9 @@ then kdialog --title "RetroDECK" --msgbox "RetroDECK will now install the needed files, please wait one minute, another message will notify when the process will be finished.\n\nPress OK to continue." - mv /var/config/emulationstation/ROMs /var/config/emulationstation/ROMs.bak + mv -f /var/config/emulationstation/ROMs /var/config/emulationstation/ROMs.bak ln -s $roms_folder /var/config/emulationstation/ROMs - mv /var/config/emulationstation/ROMs.bak $roms_folder + mv -f /var/config/emulationstation/ROMs.bak/* $roms_folder/ # XMLSTARLET HERE cp /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml @@ -56,11 +56,12 @@ then mkdir -p ~/retrodeck/saves mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots + mkdir -p ~/retrodeck/bios cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools - mkdir -p /var/config/retroarch/system - ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system ~/retrodeck/bios + rm -rf /var/config/retroarch/system + ln -s ~/retrodeck/bios /var/config/retroarch/system cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg @@ -72,7 +73,7 @@ then touch ~/retrodeck/.lock - kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder.\n\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK." + kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder.\n\nand start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access." else emulationstation --home /var/config/emulationstation fi From c01eb57fcca87228b003109f448d309aadb1253f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 22:38:51 +0900 Subject: [PATCH 43/47] Fixed wrapper logics --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index 4d410f51..f231c16c 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -73,7 +73,7 @@ then touch ~/retrodeck/.lock - kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder.\n\nand start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access." + kdialog --title "RetroDECK" --msgbox "Initialization completed.\nplease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n~/retrodeck/bios\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIt's suggested to add RetroDECK to your Steam Library for a quick access." else emulationstation --home /var/config/emulationstation fi From acdaac327c5460e741bce7b68526e02b573c0041 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 22:56:42 +0900 Subject: [PATCH 44/47] Moved tools in ~/retrodeck/.tools --- com.xargon.retrodeck.yml | 1 + es_systems.xml | 2 +- retrodeck.sh | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 27ae7f77..f66195e9 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -666,6 +666,7 @@ modules: # Tools - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/ - cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/ + - cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/ - cp tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/ - cp retrodeck.sh /app/bin/retrodeck.sh diff --git a/es_systems.xml b/es_systems.xml index 6415aa56..bdd861fa 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -1352,7 +1352,7 @@ tools RetroDECK Tools - /var/config/retrodeck/tools + /var/config/retrodeck/.tools .sh .SH bash %ROM% tools diff --git a/retrodeck.sh b/retrodeck.sh index f231c16c..cd37180b 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -57,8 +57,9 @@ then mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots mkdir -p ~/retrodeck/bios + mkdir -p ~/retrodeck/.tools - cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools + cp -r /app/retrodeck/tools/* /var/config/retrodeck/.tools/ rm -rf /var/config/retroarch/system ln -s ~/retrodeck/bios /var/config/retroarch/system From 1fe040cc539d44d3ace28ac76479ec11d46143da Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 23:00:31 +0900 Subject: [PATCH 45/47] Reverted tools edit --- es_systems.xml | 2 +- retrodeck.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/es_systems.xml b/es_systems.xml index bdd861fa..6415aa56 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -1352,7 +1352,7 @@ tools RetroDECK Tools - /var/config/retrodeck/.tools + /var/config/retrodeck/tools .sh .SH bash %ROM% tools diff --git a/retrodeck.sh b/retrodeck.sh index cd37180b..36a97612 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -57,9 +57,8 @@ then mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots mkdir -p ~/retrodeck/bios - mkdir -p ~/retrodeck/.tools - cp -r /app/retrodeck/tools/* /var/config/retrodeck/.tools/ + cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ rm -rf /var/config/retroarch/system ln -s ~/retrodeck/bios /var/config/retroarch/system From d1293d1351189704ac854d63048f1a11a6eb996d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 23:06:33 +0900 Subject: [PATCH 46/47] Fixed wrapper bugs --- retrodeck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/retrodeck.sh b/retrodeck.sh index 36a97612..de186d2e 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -57,6 +57,7 @@ then mkdir -p ~/retrodeck/states mkdir -p ~/retrodeck/screenshots mkdir -p ~/retrodeck/bios + mkdir -p /var/config/retroarch/ cp -r /app/retrodeck/tools/* /var/config/retrodeck/tools/ From b928c6eebdd93cd86a44a54ceff9f1cce1d9779d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 7 Apr 2022 23:29:17 +0900 Subject: [PATCH 47/47] Deleted old flatpak builder --- build-flatpak.sh | 73 ------------------------------------------------ 1 file changed, 73 deletions(-) delete mode 100755 build-flatpak.sh diff --git a/build-flatpak.sh b/build-flatpak.sh deleted file mode 100755 index 0d7a145f..00000000 --- a/build-flatpak.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -INSTALL_DIR=$PWD -PREVIOUS_DIR=$PWD - -echo "Welcome to the RetroDECK flatpak builder." -echo "This script is helping the flatpak building in $INSTALL_DIR." - -read -n 1 -r -s -p $'Press enter to continue...\n' -echo "Building RetroDECK, please stand by." - -if command -v apt >/dev/null; then - sudo apt install flatpak flatpak-builder -elif command -v apt-get >/dev/null; then - sudo apt-get install flatpak flatpak-builder -elif command -v yum >/dev/null; then - sudo yum install flatpak flatpak-builder # not sure about this -else - sudo pacman -S flatpak flatpak-builder -fi - -echo "Initializing Flatpak" -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 - -cd $INSTALL_DIR - -# External flatpaks import -# To update change branch and update the manifest. -# Some json must be converted with this: https://codebeautify.org/json-to-yaml - -# RetroArch -# https://github.com/flathub/org.libretro.RetroArch/blob/master/org.libretro.RetroArch.json -git clone --recursive --branch update-v1.10.2 https://github.com/flathub/org.libretro.RetroArch.git -# removing not needed and potentially dangerous files -#rm -rf org.libretro.RetroArch/shared-modules -#rm -f org.libretro.RetroArch/retroarch.cfg -#rm -f org.libretro.RetroArch/README.md -#rm -f org.libretro.RetroArch/org.libretro.RetroArch.json -#rm -f org.libretro.RetroArch/COPYING -#rm -rf org.libretro.RetroArch/.* -ln -s org.libretro.RetroArch/* $INSTALL_DIR/ - -# Yuzu -# https://github.com/flathub/org.yuzu_emu.yuzu/blob/master/org.yuzu_emu.yuzu.json -#git clone --recursive https://github.com/flathub/org.yuzu_emu.yuzu -#rm -rf org.yuzu_emu.yuzu/shared-modules -#rm -rf org.yuzu_emu.yuzu/.* -#ln -s org.yuzu_emu.yuzu/* $INSTALL_DIR/ - - -cd $INSTALL_DIR -flatpak-builder retrodeck-flatpak com.xargon.retrodeck.yml --force-clean - -# Useful commands: -# flatpak-builder --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml -# flatpak run com.xargon.retrodeck -# -# flatpak --user remote-add --no-gpg-verify xargon-dev repo -# flatpak --user install xargon-dev com.xargon.retrodeck -# -# flatpak run --command=/bin/bash com.xargon.retrodeck - -# Cleaning up -#rm -rf org.libretro.RetroArch -#rm -rf org.yuzu_emu.yuzu - -# removing orphaned symlinks -find -L . -name . -o -type d -prune -o -type l -exec rm {} + - -echo "Building terminated, you can install retrodeck by typing: flatpak run com.xargon.retrodeck" - -cd $PREVIOUS_DIR \ No newline at end of file