From a5962105ce962101a6b113a605ebe5339c9e14f3 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Thu, 14 Apr 2022 15:07:37 +0900 Subject: [PATCH 01/75] Updated ES-DE manifest removing the licenced codecs --- com.xargon.retrodeck.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 605fa3f9..871504e1 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -86,11 +86,9 @@ modules: - --disable-programs - --disable-doc - --enable-gpl - - --enable-nonfree - --enable-shared - --enable-libvorbis - --enable-libopus - - --enable-libfdk-aac - --enable-libvpx - --enable-postproc sources: From af4357c1669e7deac2a3eaae7957f283dc73d59d Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Thu, 14 Apr 2022 17:25:17 +0900 Subject: [PATCH 02/75] Added Dolphin --- .gitmodules | 3 +++ rd-submodules/dolphin | 1 + 2 files changed, 4 insertions(+) create mode 160000 rd-submodules/dolphin diff --git a/.gitmodules b/.gitmodules index c4ddce75..ad5b69ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "rd-submodules/pcsx2"] path = rd-submodules/pcsx2 url = https://github.com/flathub/net.pcsx2.PCSX2.git +[submodule "rd-submodules/dolphin"] + path = rd-submodules/dolphin + url = https://github.com/flathub/org.DolphinEmu.dolphin-emu diff --git a/rd-submodules/dolphin b/rd-submodules/dolphin new file mode 160000 index 00000000..f75cb498 --- /dev/null +++ b/rd-submodules/dolphin @@ -0,0 +1 @@ +Subproject commit f75cb4987bb2de1a745ff4179a401a855cf1432f From b9d9430bf25aa2b66a505c73750120bbcb5eaf70 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Thu, 14 Apr 2022 20:18:53 +0900 Subject: [PATCH 03/75] Added RPCS3 --- com.xargon.retrodeck.yml | 194 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 192 insertions(+), 2 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 871504e1..0749b68c 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -26,6 +26,9 @@ finish-args: # Yuzu - --filesystem=home:ro # - --filesystem=/run/media:ro + # Dolphin + - --allow=bluetooth + #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something cleanup: # ES-DE @@ -579,12 +582,199 @@ modules: # pcsx2 - END + # Dolphin - START + + # needed for the emulate bluetooth adapter feature to work + - name: bluez + config-opts: + - --enable-library + - --disable-manpages + - --disable-udev + - --disable-tools + - --disable-cups + - --disable-monitor + - --disable-client + - --disable-systemd + - --disable-a2dp + - --disable-avrcp + - --disable-network + - --with-dbusconfdir=/app/etc + - --with-dbussessionbusdir=/app/usr/lib/system-services + sources: + - type: archive + url: https://www.kernel.org/pub/linux/bluetooth/bluez-5.64.tar.xz + sha256: ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 + x-checker-data: + type: anitya + project-id: 10029 + stable-only: true + url-template: https://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz + + # enables motion controls on non-wii controllers (switch, ps4, etc) + # requires a udev rule enabling Motion Sensors access + - name: libevdev + buildsystem: meson + config-opts: + - -Dtests=disabled + - -Ddocumentation=disabled + sources: + - type: archive + url: https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz + sha256: 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c + x-checker-data: + type: anitya + project-id: 20540 + stable-only: true + url-template: https://www.freedesktop.org/software/libevdev/libevdev-$version.tar.xz + + # needed for screensaver inhibition + - name: xdg-screensaver-shim + buildsystem: meson + sources: + - type: archive + url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz + sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399 + + - name: dolphin-emu + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DENABLE_ALSA=OFF + - -DENABLE_SDL=ON + - -DENABLE_EVDEV=ON + - -DDISTRIBUTOR=Flathub + cleanup: + - /share/man + post-install: + - install -D dolphin-emu-wrapper /app/bin/dolphin-emu-wrapper + - install -Dm644 appdata.xml /app/share/appdata/dolphin-emu.appdata.xml + - sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg + - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' + /app/share/applications/dolphin-emu.desktop + sources: + - type: git + url: https://github.com/dolphin-emu/dolphin.git + commit: 8ecfa537a242de74d2e372e30d9d79b14584b2fb + # detects whether dolphin is running in a flatpak sandbox + # and makes it use xdg directories if it is. + # prevents dolphin from attempting to write conf files + # in non-writable paths, typically happens when a user + # has leftover files from a previous non-flatpak install + - type: patch + path: rd-submodules/dolphin/detectflatpak.patch + # version strings must match exactly for online multiplayer + - type: patch + path: rd-submodules/dolphin/nodirtyversion.patch + - type: file + path: rd-submodules/dolphin/appdata.xml + - type: script + commands: + - for i in {0..9}; do + - test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i; + - done + - dolphin-emu "$@" + dest-filename: dolphin-emu-wrapper + + # Dolphin - END + + # RPCS3 - START + + - name: rpcs3-llvm + buildsystem: cmake-ninja + builddir: true + build-options: + cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer + cflags-override: true + cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS=OFF + - -DLLVM_CCACHE_BUILD=ON + - -DLLVM_TARGETS_TO_BUILD='X86' + - -DLLVM_BUILD_RUNTIME=OFF + - -DLLVM_BUILD_TOOLS=OFF + - -DLLVM_INCLUDE_DOCS=OFF + - -DLLVM_INCLUDE_EXAMPLES=OFF + - -DLLVM_INCLUDE_TESTS=OFF + - -DLLVM_INCLUDE_TOOLS=OFF + - -DLLVM_INCLUDE_UTILS=OFF + - -DLLVM_USE_INTEL_JITEVENTS=ON + - -DLLVM_USE_PERF=ON + - -DLLVM_ENABLE_Z3_SOLVER=OFF + - -DCMAKE_CXX_STANDARD=17 + - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + - -Wno-dev + cleanup: + - '*' + sources: + - type: git + url: https://github.com/RPCS3/llvm-mirror.git + branch: master + commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + - type: git + url: https://github.com/intel/ittapi.git + dest: ittapi/ittapi + disable-shallow-clone: true + + - name: rpcs3 + buildsystem: cmake-ninja + builddir: true + build-options: + append-ld-library-path: /usr/lib/sdk/llvm13/lib + append-path: /usr/lib/sdk/llvm13/bin + cflags: *optflags + cflags-override: true + cxxflags: *optflags + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_LLVM_SUBMODULE=OFF + - -DUSE_NATIVE_INSTRUCTIONS=OFF + - -DUSE_PRECOMPILED_HEADERS=OFF + - -DUSE_SYSTEM_CURL=ON + - -DUSE_SYSTEM_FFMPEG=ON + - -DUSE_SYSTEM_LIBPNG=ON + - -DUSE_SYSTEM_ZLIB=ON + - -Wno-dev + post-install: + - | + set -eux; + sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + COMM_COUNT="$(git rev-list --count HEAD)"; + COMM_HASH="$(git rev-parse --short=8 HEAD)"; + sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + sources: + - type: git + url: https://github.com/RPCS3/rpcs3.git + branch: master + commit: d6b026314409980734605e9275950f835f04e8df + + # RPCS3 - END + # Ryujinx # Xemu - # Rpcs3 # vita3k - # dolphin # arduboy # pocket station # cemu - win only: wine From 703d78b5cc2b632bf47d4f5afb00498a36734695 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Thu, 14 Apr 2022 20:36:34 +0900 Subject: [PATCH 04/75] Added RPCS3 - yaml syntax fix --- com.xargon.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 0749b68c..74bbba15 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -27,7 +27,7 @@ finish-args: - --filesystem=home:ro # - --filesystem=/run/media:ro # Dolphin - - --allow=bluetooth + - --allow=bluetooth #- --env=QT_QPA_PLATFORM=xcb not sure if this will break something cleanup: From 3fced0492df60554bffa66ca57378fdb0affe38f Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 00:40:03 +0900 Subject: [PATCH 05/75] RPCS3 (unofficial) is not buildable, suspending it until the resolution (issue opened) --- com.xargon.retrodeck.yml | 180 +++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index de3b9096..b50e9acd 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -673,96 +673,96 @@ modules: # RPCS3 - START - - name: rpcs3-llvm - buildsystem: cmake-ninja - builddir: true - build-options: - cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer - cflags-override: true - cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS=OFF - - -DLLVM_CCACHE_BUILD=ON - - -DLLVM_TARGETS_TO_BUILD='X86' - - -DLLVM_BUILD_RUNTIME=OFF - - -DLLVM_BUILD_TOOLS=OFF - - -DLLVM_INCLUDE_DOCS=OFF - - -DLLVM_INCLUDE_EXAMPLES=OFF - - -DLLVM_INCLUDE_TESTS=OFF - - -DLLVM_INCLUDE_TOOLS=OFF - - -DLLVM_INCLUDE_UTILS=OFF - - -DLLVM_USE_INTEL_JITEVENTS=ON - - -DLLVM_USE_PERF=ON - - -DLLVM_ENABLE_Z3_SOLVER=OFF - - -DCMAKE_CXX_STANDARD=17 - - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi - - -Wno-dev - cleanup: - - '*' - sources: - - type: git - url: https://github.com/RPCS3/llvm-mirror.git - branch: master - commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - - type: git - url: https://github.com/intel/ittapi.git - dest: ittapi/ittapi - disable-shallow-clone: true - - - name: rpcs3 - buildsystem: cmake-ninja - builddir: true - build-options: - append-ld-library-path: /usr/lib/sdk/llvm13/lib - append-path: /usr/lib/sdk/llvm13/bin - cflags: *optflags - cflags-override: true - cxxflags: *optflags - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_LLVM_SUBMODULE=OFF - - -DUSE_NATIVE_INSTRUCTIONS=OFF - - -DUSE_PRECOMPILED_HEADERS=OFF - - -DUSE_SYSTEM_CURL=ON - - -DUSE_SYSTEM_FFMPEG=ON - - -DUSE_SYSTEM_LIBPNG=ON - - -DUSE_SYSTEM_ZLIB=ON - - -Wno-dev - post-install: - - | - set -eux; - sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; - COMM_COUNT="$(git rev-list --count HEAD)"; - COMM_HASH="$(git rev-parse --short=8 HEAD)"; - sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - sources: - - type: git - url: https://github.com/RPCS3/rpcs3.git - branch: master - commit: d6b026314409980734605e9275950f835f04e8df - + #- name: rpcs3-llvm + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer + # cflags-override: true + # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + # prepend-path: /usr/lib/sdk/llvm13/bin + # config-opts: + # - -DCMAKE_BUILD_TYPE=Release + # - -DBUILD_SHARED_LIBS=OFF + # - -DLLVM_CCACHE_BUILD=ON + # - -DLLVM_TARGETS_TO_BUILD='X86' + # - -DLLVM_BUILD_RUNTIME=OFF + # - -DLLVM_BUILD_TOOLS=OFF + # - -DLLVM_INCLUDE_DOCS=OFF + # - -DLLVM_INCLUDE_EXAMPLES=OFF + # - -DLLVM_INCLUDE_TESTS=OFF + # - -DLLVM_INCLUDE_TOOLS=OFF + # - -DLLVM_INCLUDE_UTILS=OFF + # - -DLLVM_USE_INTEL_JITEVENTS=ON + # - -DLLVM_USE_PERF=ON + # - -DLLVM_ENABLE_Z3_SOLVER=OFF + # - -DCMAKE_CXX_STANDARD=17 + # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + # - -Wno-dev + # cleanup: + # - '*' + # sources: + # - type: git + # url: https://github.com/RPCS3/llvm-mirror.git + # branch: master + # commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + # - type: git + # url: https://github.com/intel/ittapi.git + # dest: ittapi/ittapi + # disable-shallow-clone: true + # + #- name: rpcs3 + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # append-ld-library-path: /usr/lib/sdk/llvm13/lib + # append-path: /usr/lib/sdk/llvm13/bin + # cflags: *optflags + # cflags-override: true + # cxxflags: *optflags + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # config-opts: + # - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # - -DBUILD_LLVM_SUBMODULE=OFF + # - -DUSE_NATIVE_INSTRUCTIONS=OFF + # - -DUSE_PRECOMPILED_HEADERS=OFF + # - -DUSE_SYSTEM_CURL=ON + # - -DUSE_SYSTEM_FFMPEG=ON + # - -DUSE_SYSTEM_LIBPNG=ON + # - -DUSE_SYSTEM_ZLIB=ON + # - -Wno-dev + # post-install: + # - | + # set -eux; + # sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + # COMM_COUNT="$(git rev-list --count HEAD)"; + # COMM_HASH="$(git rev-parse --short=8 HEAD)"; + # sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # sources: + # - type: git + # url: https://github.com/RPCS3/rpcs3.git + # branch: master + # commit: d6b026314409980734605e9275950f835f04e8df + # # RPCS3 - END From f02458b7736ba2f1f1383c3942a2278f59d83c25 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:11:53 +0900 Subject: [PATCH 06/75] Added XEMU --- com.xargon.retrodeck.yml | 63 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index b50e9acd..bda8e5ff 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -672,6 +672,8 @@ modules: # Dolphin - END # RPCS3 - START + # Disabled because of this error: + # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 #- name: rpcs3-llvm # buildsystem: cmake-ninja @@ -765,9 +767,68 @@ modules: # # RPCS3 - END + # XEMU - START + + - name: libglu + buildsystem: meson + cleanup: + - /include + - /lib/debug + - /lib/pkgconfig + - /lib/*.a + sources: + - type: archive + url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz + sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 + x-checker-data: + type: anitya + project-id: 13518 + stable-only: true + url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + + - name: xemu + buildsystem: autotools + builddir: true + no-make-install: true + build-options: + cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls + config-opts: + - --audio-drv-list=sdl + - --disable-werror + - --target-list=i386-softmmu + make-args: + - qemu-system-i386 + post-install: + - |- + for px in 16 32 48 64 128 256 512; do + install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png + done + - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg + - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications + - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop + - mv qemu-system-i386 /app/bin/xemu + - mkdir -p /app/share/licenses/xemu + - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt + #- install -Dm644 ../app.xemu.xemu.metainfo.xml /app/share/metainfo/app.xemu.xemu.metainfo.xml + sources: + - type: git + url: https://github.com/mborgerson/xemu.git + tag: gh-release/0.6.2-90-g6f507c80af + commit: 6f507c80af546e0f5d316622d20f78820423ce6e + x-checker-data: + type: json + url: https://api.github.com/repos/mborgerson/xemu/releases/latest + tag-query: .tag_name + version-query: $tag | sub("^gh-release/"; "") + timestamp-query: .published_at + is-main-source: true + + - type: file + #path: app.xemu.xemu.metainfo.xml + + # XEMU - END # Ryujinx - # Xemu # vita3k # arduboy # pocket station From dec25f64dd41242a9ddede2786a2e64005f5e97e Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:17:45 +0900 Subject: [PATCH 07/75] Added Ryujinx --- .gitmodules | 3 +++ com.xargon.retrodeck.yml | 56 ++++++++++++++++++++++++++++++++++++++++ rd-submodules/ryujinx | 1 + 3 files changed, 60 insertions(+) create mode 160000 rd-submodules/ryujinx diff --git a/.gitmodules b/.gitmodules index ad5b69ac..bddc1ab2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "rd-submodules/dolphin"] path = rd-submodules/dolphin url = https://github.com/flathub/org.DolphinEmu.dolphin-emu +[submodule "rd-submodules/ryujinx"] + path = rd-submodules/ryujinx + url = https://github.com/flathub/org.ryujinx.Ryujinx.git diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index bda8e5ff..169cb6ce 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -577,6 +577,7 @@ modules: # pcsx2 - END # Dolphin - START + # https://github.com/flathub/org.DolphinEmu.dolphin-emu # needed for the emulate bluetooth adapter feature to work - name: bluez @@ -672,6 +673,7 @@ modules: # Dolphin - END # RPCS3 - START + # https://github.com/flathub/net.rpcs3.RPCS3 # Disabled because of this error: # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 @@ -768,6 +770,7 @@ modules: # RPCS3 - END # XEMU - START + # https://github.com/flathub/app.xemu.xemu - name: libglu buildsystem: meson @@ -828,6 +831,59 @@ modules: # XEMU - END + # Ryujinx - START + + - 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.102 + 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 + install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml + 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 + install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop + desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop + sources: + - nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b + - type: file + path: ryujinx-wrapper + - type: file + path: org.ryujinx.Ryujinx.appdata.xml + + # Ryujinx - END + # Ryujinx # vita3k # arduboy diff --git a/rd-submodules/ryujinx b/rd-submodules/ryujinx new file mode 160000 index 00000000..4776d6c9 --- /dev/null +++ b/rd-submodules/ryujinx @@ -0,0 +1 @@ +Subproject commit 4776d6c931314c2fd2b30776603130ed0e6027e7 From b5b307f0bde333bad3472f1857cfbf84b552746a Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:19:51 +0900 Subject: [PATCH 08/75] Added Ryujinx --- com.xargon.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 169cb6ce..de6ca781 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -884,7 +884,7 @@ modules: # Ryujinx - END - # Ryujinx + # vita3k # arduboy # pocket station From 7a1e9b671613bb26f1dee80f42745f4c88651fb5 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:29:21 +0900 Subject: [PATCH 09/75] Added CITRA --- .gitmodules | 3 ++ com.xargon.retrodeck.yml | 63 ++++++++++++++++++++++++++++++++++++++++ rd-submodules/citra | 1 + 3 files changed, 67 insertions(+) create mode 160000 rd-submodules/citra diff --git a/.gitmodules b/.gitmodules index bddc1ab2..c1d4e888 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "rd-submodules/ryujinx"] path = rd-submodules/ryujinx url = https://github.com/flathub/org.ryujinx.Ryujinx.git +[submodule "rd-submodules/citra"] + path = rd-submodules/citra + url = https://github.com/flathub/org.citra_emu.citra.git diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index de6ca781..e9cada33 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -884,6 +884,69 @@ modules: # Ryujinx - END + # CITRA - START + # https://github.com/flathub/org.citra_emu.citra + + - name: citra + buildsystem: cmake-ninja + builddir: true + config-opts: + - '-DCMAKE_BUILD_TYPE=Release' + - '-DENABLE_QT_TRANSLATION=ON' + - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' + - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + - '-DENABLE_FDK=ON' + build-options: + env: + CI: '1' + GITHUB_ACTIONS: '1' + GITHUB_REPOSITORY: citra-emu/citra-nightly + GIT_TAG_NAME: nightly-1759 + cleanup: + - /share/man + - /share/pixmaps + post-install: + - >- + install -Dm644 ../org.citra_emu.citra.metainfo.xml + /app/share/appdata/org.citra_emu.citra.metainfo.xml + - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop + - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop + - >- + install -Dm644 ../dist/citra.svg + /app/share/icons/hicolor/scalable/apps/citra.svg + - >- + install -Dm644 ../dist/icon.png + /app/share/icons/hicolor/512x512/apps/citra.png + - >- + mv /app/share/mime/packages/citra.xml + /app/share/mime/packages/org.citra_emu.citra.xml + - >- + sed 's/citra/org.citra_emu.citra/g' -i + /app/share/mime/packages/org.citra_emu.citra.xml + sources: + - type: git + url: 'https://github.com/citra-emu/citra-nightly.git' + tag: nightly-1759 + commit: 3df43f9505505fbe2abb543c795f791615541cd4 + disable-shallow-clone: true + x-checker-data: + type: git + tag-pattern: ^(nightly-\d+)$ + is-main-source: true + - type: file + path: org.citra_emu.citra.metainfo.xml + - type: file + path: compatibility_list.json + dest-filename: compatibility_list.json + - type: shell + commands: + - >- + cp -v compatibility_list.json + dist/compatibility_list/compatibility_list.json + + # CITRA - END + # vita3k # arduboy diff --git a/rd-submodules/citra b/rd-submodules/citra new file mode 160000 index 00000000..9ae0295f --- /dev/null +++ b/rd-submodules/citra @@ -0,0 +1 @@ +Subproject commit 9ae0295fe78ef72e121b358b2b87605d4c55e4e8 From b2429e25b58307d55273c0c89cd48e293893dbd2 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:33:01 +0900 Subject: [PATCH 10/75] Disabled XEMU --- com.xargon.retrodeck.yml | 109 ++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index e9cada33..59ece09e 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -771,63 +771,64 @@ modules: # XEMU - START # https://github.com/flathub/app.xemu.xemu + # Disabled because of this: https://github.com/XargonWan/RetroDECK/runs/6033071862?check_suite_focus=true - - name: libglu - buildsystem: meson - cleanup: - - /include - - /lib/debug - - /lib/pkgconfig - - /lib/*.a - sources: - - type: archive - url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz - sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 - x-checker-data: - type: anitya - project-id: 13518 - stable-only: true - url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + # - name: libglu + # buildsystem: meson + # cleanup: + # - /include + # - /lib/debug + # - /lib/pkgconfig + # - /lib/*.a + # sources: + # - type: archive + # url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz + # sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 + # x-checker-data: + # type: anitya + # project-id: 13518 + # stable-only: true + # url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz - - name: xemu - buildsystem: autotools - builddir: true - no-make-install: true - build-options: - cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls - config-opts: - - --audio-drv-list=sdl - - --disable-werror - - --target-list=i386-softmmu - make-args: - - qemu-system-i386 - post-install: - - |- - for px in 16 32 48 64 128 256 512; do - install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png - done - - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg - - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications - - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop - - mv qemu-system-i386 /app/bin/xemu - - mkdir -p /app/share/licenses/xemu - - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt - #- install -Dm644 ../app.xemu.xemu.metainfo.xml /app/share/metainfo/app.xemu.xemu.metainfo.xml - sources: - - type: git - url: https://github.com/mborgerson/xemu.git - tag: gh-release/0.6.2-90-g6f507c80af - commit: 6f507c80af546e0f5d316622d20f78820423ce6e - x-checker-data: - type: json - url: https://api.github.com/repos/mborgerson/xemu/releases/latest - tag-query: .tag_name - version-query: $tag | sub("^gh-release/"; "") - timestamp-query: .published_at - is-main-source: true + # - name: xemu + # buildsystem: autotools + # builddir: true + # no-make-install: true + # build-options: + # cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls + # config-opts: + # - --audio-drv-list=sdl + # - --disable-werror + # - --target-list=i386-softmmu + # make-args: + # - qemu-system-i386 + # post-install: + # - |- + # for px in 16 32 48 64 128 256 512; do + # install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png + # done + # - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg + # - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications + # - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop + # - mv qemu-system-i386 /app/bin/xemu + # - mkdir -p /app/share/licenses/xemu + # - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt + # #- install -Dm644 ../app.xemu.xemu.metainfo.xml /app/share/metainfo/app.xemu.xemu.metainfo.xml + # sources: + # - type: git + # url: https://github.com/mborgerson/xemu.git + # tag: gh-release/0.6.2-90-g6f507c80af + # commit: 6f507c80af546e0f5d316622d20f78820423ce6e + # x-checker-data: + # type: json + # url: https://api.github.com/repos/mborgerson/xemu/releases/latest + # tag-query: .tag_name + # version-query: $tag | sub("^gh-release/"; "") + # timestamp-query: .published_at + # is-main-source: true - - type: file - #path: app.xemu.xemu.metainfo.xml + # - type: file + # #path: app.xemu.xemu.metainfo.xml # XEMU - END From 453f4008723f03535be396456065eead58947dc8 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:38:41 +0900 Subject: [PATCH 11/75] Added verbose mode for flatpak-builder on cooker --- .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 065d6e4f..fa200f75 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -40,8 +40,8 @@ jobs: # 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-builder -v --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml + sudo flatpak-builder -v --repo=local --force-clean localrepo com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - name: Get date for artifacts From 26d27372151230aa07186560a1c267ab2ea7eb9f Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:12:36 +0900 Subject: [PATCH 12/75] CITRA (Test build) --- com.xargon.retrodeck.yml | 96 ++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 59ece09e..637d9950 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -834,54 +834,54 @@ modules: # Ryujinx - START - - 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.102 - 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 - install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml - 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 - install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop - desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop - sources: - - nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b - - type: file - path: ryujinx-wrapper - - type: file - path: org.ryujinx.Ryujinx.appdata.xml + # - 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.102 + # 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 + # install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml + # 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 + # install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop + # desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop + # sources: + # - nuget_sources.json + # - type: git + # url: https://github.com/Ryujinx/Ryujinx.git + # commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b + # - type: file + # path: ryujinx-wrapper + # - type: file + # path: org.ryujinx.Ryujinx.appdata.xml # Ryujinx - END From 0816eeb8bc992a6c5f9ba6261b69911f133d01b7 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:20:03 +0900 Subject: [PATCH 13/75] RPCS3 (Test build) --- com.xargon.retrodeck.yml | 292 +++++++++++++++++++-------------------- 1 file changed, 145 insertions(+), 147 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 637d9950..aba65b3c 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -677,96 +677,94 @@ modules: # Disabled because of this error: # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 - #- name: rpcs3-llvm - # buildsystem: cmake-ninja - # builddir: true - # build-options: - # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - # -fcf-protection -fno-omit-frame-pointer - # cflags-override: true - # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 - # cxxflags-override: true - # env: - # AR: llvm-ar - # CC: clang - # CXX: clang++ - # RANLIB: llvm-ranlib - # ldflags: -fuse-ld=lld - # prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - # prepend-path: /usr/lib/sdk/llvm13/bin - # config-opts: - # - -DCMAKE_BUILD_TYPE=Release - # - -DBUILD_SHARED_LIBS=OFF - # - -DLLVM_CCACHE_BUILD=ON - # - -DLLVM_TARGETS_TO_BUILD='X86' - # - -DLLVM_BUILD_RUNTIME=OFF - # - -DLLVM_BUILD_TOOLS=OFF - # - -DLLVM_INCLUDE_DOCS=OFF - # - -DLLVM_INCLUDE_EXAMPLES=OFF - # - -DLLVM_INCLUDE_TESTS=OFF - # - -DLLVM_INCLUDE_TOOLS=OFF - # - -DLLVM_INCLUDE_UTILS=OFF - # - -DLLVM_USE_INTEL_JITEVENTS=ON - # - -DLLVM_USE_PERF=ON - # - -DLLVM_ENABLE_Z3_SOLVER=OFF - # - -DCMAKE_CXX_STANDARD=17 - # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi - # - -Wno-dev - # cleanup: - # - '*' - # sources: - # - type: git - # url: https://github.com/RPCS3/llvm-mirror.git - # branch: master - # commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - # - type: git - # url: https://github.com/intel/ittapi.git - # dest: ittapi/ittapi - # disable-shallow-clone: true - # - #- name: rpcs3 - # buildsystem: cmake-ninja - # builddir: true - # build-options: - # append-ld-library-path: /usr/lib/sdk/llvm13/lib - # append-path: /usr/lib/sdk/llvm13/bin - # cflags: *optflags - # cflags-override: true - # cxxflags: *optflags - # cxxflags-override: true - # env: - # AR: llvm-ar - # CC: clang - # CXX: clang++ - # RANLIB: llvm-ranlib - # ldflags: -fuse-ld=lld - # config-opts: - # - -DCMAKE_BUILD_TYPE=RelWithDebInfo - # - -DBUILD_LLVM_SUBMODULE=OFF - # - -DUSE_NATIVE_INSTRUCTIONS=OFF - # - -DUSE_PRECOMPILED_HEADERS=OFF - # - -DUSE_SYSTEM_CURL=ON - # - -DUSE_SYSTEM_FFMPEG=ON - # - -DUSE_SYSTEM_LIBPNG=ON - # - -DUSE_SYSTEM_ZLIB=ON - # - -Wno-dev - # post-install: - # - | - # set -eux; - # sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - # COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; - # COMM_COUNT="$(git rev-list --count HEAD)"; - # COMM_HASH="$(git rev-parse --short=8 HEAD)"; - # sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - # sources: - # - type: git - # url: https://github.com/RPCS3/rpcs3.git - # branch: master - # commit: d6b026314409980734605e9275950f835f04e8df - # + - name: rpcs3-llvm + buildsystem: cmake-ninja + builddir: true + build-options: + cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer + cflags-override: true + cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS=OFF + - -DLLVM_CCACHE_BUILD=ON + - -DLLVM_TARGETS_TO_BUILD='X86' + - -DLLVM_BUILD_RUNTIME=OFF + - -DLLVM_BUILD_TOOLS=OFF + - -DLLVM_INCLUDE_DOCS=OFF + - -DLLVM_INCLUDE_EXAMPLES=OFF + - -DLLVM_INCLUDE_TESTS=OFF + - -DLLVM_INCLUDE_TOOLS=OFF + - -DLLVM_INCLUDE_UTILS=OFF + - -DLLVM_USE_INTEL_JITEVENTS=ON + - -DLLVM_USE_PERF=ON + - -DLLVM_ENABLE_Z3_SOLVER=OFF + - -DCMAKE_CXX_STANDARD=17 + - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + - -Wno-dev + cleanup: + - '*' + sources: + - type: git + url: https://github.com/RPCS3/llvm-mirror.git + commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + - type: git + url: https://github.com/intel/ittapi.git + dest: ittapi/ittapi + disable-shallow-clone: true + + - name: rpcs3 + buildsystem: cmake-ninja + builddir: true + build-options: + append-ld-library-path: /usr/lib/sdk/llvm13/lib + append-path: /usr/lib/sdk/llvm13/bin + cflags: *optflags + cflags-override: true + cxxflags: *optflags + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_LLVM_SUBMODULE=OFF + - -DUSE_NATIVE_INSTRUCTIONS=OFF + - -DUSE_PRECOMPILED_HEADERS=OFF + - -DUSE_SYSTEM_CURL=ON + - -DUSE_SYSTEM_FFMPEG=ON + - -DUSE_SYSTEM_LIBPNG=ON + - -DUSE_SYSTEM_ZLIB=ON + - -Wno-dev + post-install: + - | + set -eux; + sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + COMM_COUNT="$(git rev-list --count HEAD)"; + COMM_HASH="$(git rev-parse --short=8 HEAD)"; + sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + sources: + - type: git + url: https://github.com/RPCS3/rpcs3.git + commit: d6b026314409980734605e9275950f835f04e8df + # RPCS3 - END # XEMU - START @@ -888,63 +886,63 @@ modules: # CITRA - START # https://github.com/flathub/org.citra_emu.citra - - name: citra - buildsystem: cmake-ninja - builddir: true - config-opts: - - '-DCMAKE_BUILD_TYPE=Release' - - '-DENABLE_QT_TRANSLATION=ON' - - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' - - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' - - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' - - '-DENABLE_FDK=ON' - build-options: - env: - CI: '1' - GITHUB_ACTIONS: '1' - GITHUB_REPOSITORY: citra-emu/citra-nightly - GIT_TAG_NAME: nightly-1759 - cleanup: - - /share/man - - /share/pixmaps - post-install: - - >- - install -Dm644 ../org.citra_emu.citra.metainfo.xml - /app/share/appdata/org.citra_emu.citra.metainfo.xml - - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop - - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop - - >- - install -Dm644 ../dist/citra.svg - /app/share/icons/hicolor/scalable/apps/citra.svg - - >- - install -Dm644 ../dist/icon.png - /app/share/icons/hicolor/512x512/apps/citra.png - - >- - mv /app/share/mime/packages/citra.xml - /app/share/mime/packages/org.citra_emu.citra.xml - - >- - sed 's/citra/org.citra_emu.citra/g' -i - /app/share/mime/packages/org.citra_emu.citra.xml - sources: - - type: git - url: 'https://github.com/citra-emu/citra-nightly.git' - tag: nightly-1759 - commit: 3df43f9505505fbe2abb543c795f791615541cd4 - disable-shallow-clone: true - x-checker-data: - type: git - tag-pattern: ^(nightly-\d+)$ - is-main-source: true - - type: file - path: org.citra_emu.citra.metainfo.xml - - type: file - path: compatibility_list.json - dest-filename: compatibility_list.json - - type: shell - commands: - - >- - cp -v compatibility_list.json - dist/compatibility_list/compatibility_list.json + # - name: citra + # buildsystem: cmake-ninja + # builddir: true + # config-opts: + # - '-DCMAKE_BUILD_TYPE=Release' + # - '-DENABLE_QT_TRANSLATION=ON' + # - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + # - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' + # - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + # - '-DENABLE_FDK=ON' + # build-options: + # env: + # CI: '1' + # GITHUB_ACTIONS: '1' + # GITHUB_REPOSITORY: citra-emu/citra-nightly + # GIT_TAG_NAME: nightly-1759 + # cleanup: + # - /share/man + # - /share/pixmaps + # post-install: + # - >- + # install -Dm644 ../org.citra_emu.citra.metainfo.xml + # /app/share/appdata/org.citra_emu.citra.metainfo.xml + # - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop + # - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop + # - >- + # install -Dm644 ../dist/citra.svg + # /app/share/icons/hicolor/scalable/apps/citra.svg + # - >- + # install -Dm644 ../dist/icon.png + # /app/share/icons/hicolor/512x512/apps/citra.png + # - >- + # mv /app/share/mime/packages/citra.xml + # /app/share/mime/packages/org.citra_emu.citra.xml + # - >- + # sed 's/citra/org.citra_emu.citra/g' -i + # /app/share/mime/packages/org.citra_emu.citra.xml + # sources: + # - type: git + # url: 'https://github.com/citra-emu/citra-nightly.git' + # tag: nightly-1759 + # commit: 3df43f9505505fbe2abb543c795f791615541cd4 + # disable-shallow-clone: true + # x-checker-data: + # type: git + # tag-pattern: ^(nightly-\d+)$ + # is-main-source: true + # - type: file + # path: org.citra_emu.citra.metainfo.xml + # - type: file + # path: compatibility_list.json + # dest-filename: compatibility_list.json + # - type: shell + # commands: + # - >- + # cp -v compatibility_list.json + # dist/compatibility_list/compatibility_list.json # CITRA - END From 689e12b887d867a555d6b0e2c33bc88130475837 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:21:53 +0900 Subject: [PATCH 14/75] Ryujinx (Test build) --- com.xargon.retrodeck.yml | 268 +++++++++++++++++++-------------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index aba65b3c..d4e1c211 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -677,93 +677,93 @@ modules: # Disabled because of this error: # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 - - name: rpcs3-llvm - buildsystem: cmake-ninja - builddir: true - build-options: - cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer - cflags-override: true - cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS=OFF - - -DLLVM_CCACHE_BUILD=ON - - -DLLVM_TARGETS_TO_BUILD='X86' - - -DLLVM_BUILD_RUNTIME=OFF - - -DLLVM_BUILD_TOOLS=OFF - - -DLLVM_INCLUDE_DOCS=OFF - - -DLLVM_INCLUDE_EXAMPLES=OFF - - -DLLVM_INCLUDE_TESTS=OFF - - -DLLVM_INCLUDE_TOOLS=OFF - - -DLLVM_INCLUDE_UTILS=OFF - - -DLLVM_USE_INTEL_JITEVENTS=ON - - -DLLVM_USE_PERF=ON - - -DLLVM_ENABLE_Z3_SOLVER=OFF - - -DCMAKE_CXX_STANDARD=17 - - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi - - -Wno-dev - cleanup: - - '*' - sources: - - type: git - url: https://github.com/RPCS3/llvm-mirror.git - commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - - type: git - url: https://github.com/intel/ittapi.git - dest: ittapi/ittapi - disable-shallow-clone: true + # - name: rpcs3-llvm + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer + # cflags-override: true + # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + # prepend-path: /usr/lib/sdk/llvm13/bin + # config-opts: + # - -DCMAKE_BUILD_TYPE=Release + # - -DBUILD_SHARED_LIBS=OFF + # - -DLLVM_CCACHE_BUILD=ON + # - -DLLVM_TARGETS_TO_BUILD='X86' + # - -DLLVM_BUILD_RUNTIME=OFF + # - -DLLVM_BUILD_TOOLS=OFF + # - -DLLVM_INCLUDE_DOCS=OFF + # - -DLLVM_INCLUDE_EXAMPLES=OFF + # - -DLLVM_INCLUDE_TESTS=OFF + # - -DLLVM_INCLUDE_TOOLS=OFF + # - -DLLVM_INCLUDE_UTILS=OFF + # - -DLLVM_USE_INTEL_JITEVENTS=ON + # - -DLLVM_USE_PERF=ON + # - -DLLVM_ENABLE_Z3_SOLVER=OFF + # - -DCMAKE_CXX_STANDARD=17 + # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + # - -Wno-dev + # cleanup: + # - '*' + # sources: + # - type: git + # url: https://github.com/RPCS3/llvm-mirror.git + # commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + # - type: git + # url: https://github.com/intel/ittapi.git + # dest: ittapi/ittapi + # disable-shallow-clone: true - - name: rpcs3 - buildsystem: cmake-ninja - builddir: true - build-options: - append-ld-library-path: /usr/lib/sdk/llvm13/lib - append-path: /usr/lib/sdk/llvm13/bin - cflags: *optflags - cflags-override: true - cxxflags: *optflags - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_LLVM_SUBMODULE=OFF - - -DUSE_NATIVE_INSTRUCTIONS=OFF - - -DUSE_PRECOMPILED_HEADERS=OFF - - -DUSE_SYSTEM_CURL=ON - - -DUSE_SYSTEM_FFMPEG=ON - - -DUSE_SYSTEM_LIBPNG=ON - - -DUSE_SYSTEM_ZLIB=ON - - -Wno-dev - post-install: - - | - set -eux; - sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; - COMM_COUNT="$(git rev-list --count HEAD)"; - COMM_HASH="$(git rev-parse --short=8 HEAD)"; - sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - sources: - - type: git - url: https://github.com/RPCS3/rpcs3.git - commit: d6b026314409980734605e9275950f835f04e8df + # - name: rpcs3 + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # append-ld-library-path: /usr/lib/sdk/llvm13/lib + # append-path: /usr/lib/sdk/llvm13/bin + # cflags: *optflags + # cflags-override: true + # cxxflags: *optflags + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # config-opts: + # - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # - -DBUILD_LLVM_SUBMODULE=OFF + # - -DUSE_NATIVE_INSTRUCTIONS=OFF + # - -DUSE_PRECOMPILED_HEADERS=OFF + # - -DUSE_SYSTEM_CURL=ON + # - -DUSE_SYSTEM_FFMPEG=ON + # - -DUSE_SYSTEM_LIBPNG=ON + # - -DUSE_SYSTEM_ZLIB=ON + # - -Wno-dev + # post-install: + # - | + # set -eux; + # sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + # COMM_COUNT="$(git rev-list --count HEAD)"; + # COMM_HASH="$(git rev-parse --short=8 HEAD)"; + # sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # sources: + # - type: git + # url: https://github.com/RPCS3/rpcs3.git + # commit: d6b026314409980734605e9275950f835f04e8df # RPCS3 - END @@ -832,54 +832,54 @@ modules: # Ryujinx - START - # - 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.102 - # 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 - # install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml - # 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 - # install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop - # desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop - # sources: - # - nuget_sources.json - # - type: git - # url: https://github.com/Ryujinx/Ryujinx.git - # commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b - # - type: file - # path: ryujinx-wrapper - # - type: file - # path: org.ryujinx.Ryujinx.appdata.xml + - 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.102 + 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 + install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml + 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 + install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop + desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop + sources: + - nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b + - type: file + path: ryujinx-wrapper + - type: file + path: org.ryujinx.Ryujinx.appdata.xml # Ryujinx - END From 33391c032c8249d2247dd4b48b6eb750ab010918 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:27:26 +0900 Subject: [PATCH 15/75] CITRA (Test Build) --- com.xargon.retrodeck.yml | 210 +++++++++++++++++++-------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index d4e1c211..4b355c5c 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -832,117 +832,117 @@ modules: # Ryujinx - START - - 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.102 - 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 - install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml - 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 - install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop - desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop - sources: - - nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b - - type: file - path: ryujinx-wrapper - - type: file - path: org.ryujinx.Ryujinx.appdata.xml + # - 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.102 + # 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 + # install -Dm644 $FLATPAK_ID.appdata.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml + # 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 + # install -Dm644 distribution/linux/ryujinx.desktop /app/share/applications/$FLATPAK_ID.desktop + # desktop-file-edit --set-key="Exec" --set-value="ryujinx-wrapper %f" /app/share/applications/$FLATPAK_ID.desktop + # sources: + # - nuget_sources.json + # - type: git + # url: https://github.com/Ryujinx/Ryujinx.git + # commit: 247d26b4b50df8a068b9bfbb412a29f0c9f6a97b + # - type: file + # path: ryujinx-wrapper + # - type: file + # path: org.ryujinx.Ryujinx.appdata.xml # Ryujinx - END # CITRA - START # https://github.com/flathub/org.citra_emu.citra - # - name: citra - # buildsystem: cmake-ninja - # builddir: true - # config-opts: - # - '-DCMAKE_BUILD_TYPE=Release' - # - '-DENABLE_QT_TRANSLATION=ON' - # - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' - # - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' - # - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' - # - '-DENABLE_FDK=ON' - # build-options: - # env: - # CI: '1' - # GITHUB_ACTIONS: '1' - # GITHUB_REPOSITORY: citra-emu/citra-nightly - # GIT_TAG_NAME: nightly-1759 - # cleanup: - # - /share/man - # - /share/pixmaps - # post-install: - # - >- - # install -Dm644 ../org.citra_emu.citra.metainfo.xml - # /app/share/appdata/org.citra_emu.citra.metainfo.xml - # - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop - # - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop - # - >- - # install -Dm644 ../dist/citra.svg - # /app/share/icons/hicolor/scalable/apps/citra.svg - # - >- - # install -Dm644 ../dist/icon.png - # /app/share/icons/hicolor/512x512/apps/citra.png - # - >- - # mv /app/share/mime/packages/citra.xml - # /app/share/mime/packages/org.citra_emu.citra.xml - # - >- - # sed 's/citra/org.citra_emu.citra/g' -i - # /app/share/mime/packages/org.citra_emu.citra.xml - # sources: - # - type: git - # url: 'https://github.com/citra-emu/citra-nightly.git' - # tag: nightly-1759 - # commit: 3df43f9505505fbe2abb543c795f791615541cd4 - # disable-shallow-clone: true - # x-checker-data: - # type: git - # tag-pattern: ^(nightly-\d+)$ - # is-main-source: true - # - type: file - # path: org.citra_emu.citra.metainfo.xml - # - type: file - # path: compatibility_list.json - # dest-filename: compatibility_list.json - # - type: shell - # commands: - # - >- - # cp -v compatibility_list.json - # dist/compatibility_list/compatibility_list.json + - name: citra + buildsystem: cmake-ninja + builddir: true + config-opts: + - '-DCMAKE_BUILD_TYPE=Release' + - '-DENABLE_QT_TRANSLATION=ON' + - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' + - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + - '-DENABLE_FDK=ON' + build-options: + env: + CI: '1' + GITHUB_ACTIONS: '1' + GITHUB_REPOSITORY: citra-emu/citra-nightly + GIT_TAG_NAME: nightly-1759 + cleanup: + - /share/man + - /share/pixmaps + post-install: + - >- + install -Dm644 ../org.citra_emu.citra.metainfo.xml + /app/share/appdata/org.citra_emu.citra.metainfo.xml + - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop + - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop + - >- + install -Dm644 ../dist/citra.svg + /app/share/icons/hicolor/scalable/apps/citra.svg + - >- + install -Dm644 ../dist/icon.png + /app/share/icons/hicolor/512x512/apps/citra.png + - >- + mv /app/share/mime/packages/citra.xml + /app/share/mime/packages/org.citra_emu.citra.xml + - >- + sed 's/citra/org.citra_emu.citra/g' -i + /app/share/mime/packages/org.citra_emu.citra.xml + sources: + - type: git + url: 'https://github.com/citra-emu/citra-nightly.git' + tag: nightly-1759 + commit: 3df43f9505505fbe2abb543c795f791615541cd4 + disable-shallow-clone: true + x-checker-data: + type: git + tag-pattern: ^(nightly-\d+)$ + is-main-source: true + - type: file + path: rd-submodules/citra/org.citra_emu.citra.metainfo.xml + - type: file + path: rd-submodules/citra/compatibility_list.json + dest-filename: compatibility_list.json + - type: shell + commands: + - >- + cp -v compatibility_list.json + dist/compatibility_list/compatibility_list.json # CITRA - END From 038c4cde1caa5511131619de4c1b6d61b23c1ad3 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:30:02 +0900 Subject: [PATCH 16/75] RPCS3 (Test Build) --- com.xargon.retrodeck.yml | 286 +++++++++++++++++++-------------------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 4b355c5c..48cf3096 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -677,93 +677,93 @@ modules: # Disabled because of this error: # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 - # - name: rpcs3-llvm - # buildsystem: cmake-ninja - # builddir: true - # build-options: - # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - # -fcf-protection -fno-omit-frame-pointer - # cflags-override: true - # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 - # cxxflags-override: true - # env: - # AR: llvm-ar - # CC: clang - # CXX: clang++ - # RANLIB: llvm-ranlib - # ldflags: -fuse-ld=lld - # prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - # prepend-path: /usr/lib/sdk/llvm13/bin - # config-opts: - # - -DCMAKE_BUILD_TYPE=Release - # - -DBUILD_SHARED_LIBS=OFF - # - -DLLVM_CCACHE_BUILD=ON - # - -DLLVM_TARGETS_TO_BUILD='X86' - # - -DLLVM_BUILD_RUNTIME=OFF - # - -DLLVM_BUILD_TOOLS=OFF - # - -DLLVM_INCLUDE_DOCS=OFF - # - -DLLVM_INCLUDE_EXAMPLES=OFF - # - -DLLVM_INCLUDE_TESTS=OFF - # - -DLLVM_INCLUDE_TOOLS=OFF - # - -DLLVM_INCLUDE_UTILS=OFF - # - -DLLVM_USE_INTEL_JITEVENTS=ON - # - -DLLVM_USE_PERF=ON - # - -DLLVM_ENABLE_Z3_SOLVER=OFF - # - -DCMAKE_CXX_STANDARD=17 - # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi - # - -Wno-dev - # cleanup: - # - '*' - # sources: - # - type: git - # url: https://github.com/RPCS3/llvm-mirror.git - # commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - # - type: git - # url: https://github.com/intel/ittapi.git - # dest: ittapi/ittapi - # disable-shallow-clone: true + - name: rpcs3-llvm + buildsystem: cmake-ninja + builddir: true + build-options: + cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer + cflags-override: true + cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + prepend-path: /usr/lib/sdk/llvm13/bin + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS=OFF + - -DLLVM_CCACHE_BUILD=ON + - -DLLVM_TARGETS_TO_BUILD='X86' + - -DLLVM_BUILD_RUNTIME=OFF + - -DLLVM_BUILD_TOOLS=OFF + - -DLLVM_INCLUDE_DOCS=OFF + - -DLLVM_INCLUDE_EXAMPLES=OFF + - -DLLVM_INCLUDE_TESTS=OFF + - -DLLVM_INCLUDE_TOOLS=OFF + - -DLLVM_INCLUDE_UTILS=OFF + - -DLLVM_USE_INTEL_JITEVENTS=ON + - -DLLVM_USE_PERF=ON + - -DLLVM_ENABLE_Z3_SOLVER=OFF + - -DCMAKE_CXX_STANDARD=17 + - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + - -Wno-dev + cleanup: + - '*' + sources: + - type: git + url: https://github.com/RPCS3/llvm-mirror.git + commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + - type: git + url: https://github.com/intel/ittapi.git + dest: ittapi/ittapi + disable-shallow-clone: true - # - name: rpcs3 - # buildsystem: cmake-ninja - # builddir: true - # build-options: - # append-ld-library-path: /usr/lib/sdk/llvm13/lib - # append-path: /usr/lib/sdk/llvm13/bin - # cflags: *optflags - # cflags-override: true - # cxxflags: *optflags - # cxxflags-override: true - # env: - # AR: llvm-ar - # CC: clang - # CXX: clang++ - # RANLIB: llvm-ranlib - # ldflags: -fuse-ld=lld - # config-opts: - # - -DCMAKE_BUILD_TYPE=RelWithDebInfo - # - -DBUILD_LLVM_SUBMODULE=OFF - # - -DUSE_NATIVE_INSTRUCTIONS=OFF - # - -DUSE_PRECOMPILED_HEADERS=OFF - # - -DUSE_SYSTEM_CURL=ON - # - -DUSE_SYSTEM_FFMPEG=ON - # - -DUSE_SYSTEM_LIBPNG=ON - # - -DUSE_SYSTEM_ZLIB=ON - # - -Wno-dev - # post-install: - # - | - # set -eux; - # sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - # COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; - # COMM_COUNT="$(git rev-list --count HEAD)"; - # COMM_HASH="$(git rev-parse --short=8 HEAD)"; - # sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - # sources: - # - type: git - # url: https://github.com/RPCS3/rpcs3.git - # commit: d6b026314409980734605e9275950f835f04e8df + - name: rpcs3 + buildsystem: cmake-ninja + builddir: true + build-options: + append-ld-library-path: /usr/lib/sdk/llvm13/lib + append-path: /usr/lib/sdk/llvm13/bin + cflags: *optflags + cflags-override: true + cxxflags: *optflags + cxxflags-override: true + env: + AR: llvm-ar + CC: clang + CXX: clang++ + RANLIB: llvm-ranlib + ldflags: -fuse-ld=lld + config-opts: + - -DCMAKE_BUILD_TYPE=RelWithDebInfo + - -DBUILD_LLVM_SUBMODULE=OFF + - -DUSE_NATIVE_INSTRUCTIONS=OFF + - -DUSE_PRECOMPILED_HEADERS=OFF + - -DUSE_SYSTEM_CURL=ON + - -DUSE_SYSTEM_FFMPEG=ON + - -DUSE_SYSTEM_LIBPNG=ON + - -DUSE_SYSTEM_ZLIB=ON + - -Wno-dev + post-install: + - | + set -eux; + sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + COMM_COUNT="$(git rev-list --count HEAD)"; + COMM_HASH="$(git rev-parse --short=8 HEAD)"; + sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + sources: + - type: git + url: https://github.com/RPCS3/rpcs3.git + commit: d6b026314409980734605e9275950f835f04e8df # RPCS3 - END @@ -886,63 +886,63 @@ modules: # CITRA - START # https://github.com/flathub/org.citra_emu.citra - - name: citra - buildsystem: cmake-ninja - builddir: true - config-opts: - - '-DCMAKE_BUILD_TYPE=Release' - - '-DENABLE_QT_TRANSLATION=ON' - - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' - - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' - - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' - - '-DENABLE_FDK=ON' - build-options: - env: - CI: '1' - GITHUB_ACTIONS: '1' - GITHUB_REPOSITORY: citra-emu/citra-nightly - GIT_TAG_NAME: nightly-1759 - cleanup: - - /share/man - - /share/pixmaps - post-install: - - >- - install -Dm644 ../org.citra_emu.citra.metainfo.xml - /app/share/appdata/org.citra_emu.citra.metainfo.xml - - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop - - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop - - >- - install -Dm644 ../dist/citra.svg - /app/share/icons/hicolor/scalable/apps/citra.svg - - >- - install -Dm644 ../dist/icon.png - /app/share/icons/hicolor/512x512/apps/citra.png - - >- - mv /app/share/mime/packages/citra.xml - /app/share/mime/packages/org.citra_emu.citra.xml - - >- - sed 's/citra/org.citra_emu.citra/g' -i - /app/share/mime/packages/org.citra_emu.citra.xml - sources: - - type: git - url: 'https://github.com/citra-emu/citra-nightly.git' - tag: nightly-1759 - commit: 3df43f9505505fbe2abb543c795f791615541cd4 - disable-shallow-clone: true - x-checker-data: - type: git - tag-pattern: ^(nightly-\d+)$ - is-main-source: true - - type: file - path: rd-submodules/citra/org.citra_emu.citra.metainfo.xml - - type: file - path: rd-submodules/citra/compatibility_list.json - dest-filename: compatibility_list.json - - type: shell - commands: - - >- - cp -v compatibility_list.json - dist/compatibility_list/compatibility_list.json + # - name: citra + # buildsystem: cmake-ninja + # builddir: true + # config-opts: + # - '-DCMAKE_BUILD_TYPE=Release' + # - '-DENABLE_QT_TRANSLATION=ON' + # - '-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON' + # - '-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON' + # - '-DENABLE_FFMPEG_VIDEO_DUMPER=ON' + # - '-DENABLE_FDK=ON' + # build-options: + # env: + # CI: '1' + # GITHUB_ACTIONS: '1' + # GITHUB_REPOSITORY: citra-emu/citra-nightly + # GIT_TAG_NAME: nightly-1759 + # cleanup: + # - /share/man + # - /share/pixmaps + # post-install: + # - >- + # install -Dm644 ../org.citra_emu.citra.metainfo.xml + # /app/share/appdata/org.citra_emu.citra.metainfo.xml + # - desktop-file-install --dir=/app/share/applications ../dist/citra.desktop + # - echo 'StartupWMClass=citra-qt' >> /app/share/applications/citra.desktop + # - >- + # install -Dm644 ../dist/citra.svg + # /app/share/icons/hicolor/scalable/apps/citra.svg + # - >- + # install -Dm644 ../dist/icon.png + # /app/share/icons/hicolor/512x512/apps/citra.png + # - >- + # mv /app/share/mime/packages/citra.xml + # /app/share/mime/packages/org.citra_emu.citra.xml + # - >- + # sed 's/citra/org.citra_emu.citra/g' -i + # /app/share/mime/packages/org.citra_emu.citra.xml + # sources: + # - type: git + # url: 'https://github.com/citra-emu/citra-nightly.git' + # tag: nightly-1759 + # commit: 3df43f9505505fbe2abb543c795f791615541cd4 + # disable-shallow-clone: true + # x-checker-data: + # type: git + # tag-pattern: ^(nightly-\d+)$ + # is-main-source: true + # - type: file + # path: rd-submodules/citra/org.citra_emu.citra.metainfo.xml + # - type: file + # path: rd-submodules/citra/compatibility_list.json + # dest-filename: compatibility_list.json + # - type: shell + # commands: + # - >- + # cp -v compatibility_list.json + # dist/compatibility_list/compatibility_list.json # CITRA - END From af78a9e4448a53d21141f1a2ff068d332df748f1 Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Sat, 16 Apr 2022 19:35:12 +0900 Subject: [PATCH 17/75] XEMU (Test Build) --- com.xargon.retrodeck.yml | 278 +++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 141 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 48cf3096..2b7cd9c0 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -677,93 +677,93 @@ modules: # Disabled because of this error: # https://github.com/flathub/net.rpcs3.RPCS3/issues/854 - - name: rpcs3-llvm - buildsystem: cmake-ninja - builddir: true - build-options: - cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer - cflags-override: true - cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong - -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection - -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - prepend-ld-library-path: /usr/lib/sdk/llvm13/lib - prepend-path: /usr/lib/sdk/llvm13/bin - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS=OFF - - -DLLVM_CCACHE_BUILD=ON - - -DLLVM_TARGETS_TO_BUILD='X86' - - -DLLVM_BUILD_RUNTIME=OFF - - -DLLVM_BUILD_TOOLS=OFF - - -DLLVM_INCLUDE_DOCS=OFF - - -DLLVM_INCLUDE_EXAMPLES=OFF - - -DLLVM_INCLUDE_TESTS=OFF - - -DLLVM_INCLUDE_TOOLS=OFF - - -DLLVM_INCLUDE_UTILS=OFF - - -DLLVM_USE_INTEL_JITEVENTS=ON - - -DLLVM_USE_PERF=ON - - -DLLVM_ENABLE_Z3_SOLVER=OFF - - -DCMAKE_CXX_STANDARD=17 - - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi - - -Wno-dev - cleanup: - - '*' - sources: - - type: git - url: https://github.com/RPCS3/llvm-mirror.git - commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 - - type: git - url: https://github.com/intel/ittapi.git - dest: ittapi/ittapi - disable-shallow-clone: true + # - name: rpcs3-llvm + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer + # cflags-override: true + # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong + # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection + # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # prepend-ld-library-path: /usr/lib/sdk/llvm13/lib + # prepend-path: /usr/lib/sdk/llvm13/bin + # config-opts: + # - -DCMAKE_BUILD_TYPE=Release + # - -DBUILD_SHARED_LIBS=OFF + # - -DLLVM_CCACHE_BUILD=ON + # - -DLLVM_TARGETS_TO_BUILD='X86' + # - -DLLVM_BUILD_RUNTIME=OFF + # - -DLLVM_BUILD_TOOLS=OFF + # - -DLLVM_INCLUDE_DOCS=OFF + # - -DLLVM_INCLUDE_EXAMPLES=OFF + # - -DLLVM_INCLUDE_TESTS=OFF + # - -DLLVM_INCLUDE_TOOLS=OFF + # - -DLLVM_INCLUDE_UTILS=OFF + # - -DLLVM_USE_INTEL_JITEVENTS=ON + # - -DLLVM_USE_PERF=ON + # - -DLLVM_ENABLE_Z3_SOLVER=OFF + # - -DCMAKE_CXX_STANDARD=17 + # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi + # - -Wno-dev + # cleanup: + # - '*' + # sources: + # - type: git + # url: https://github.com/RPCS3/llvm-mirror.git + # commit: 509d31ad89676522f7121b3bb8688f7d29b7ee60 + # - type: git + # url: https://github.com/intel/ittapi.git + # dest: ittapi/ittapi + # disable-shallow-clone: true - - name: rpcs3 - buildsystem: cmake-ninja - builddir: true - build-options: - append-ld-library-path: /usr/lib/sdk/llvm13/lib - append-path: /usr/lib/sdk/llvm13/bin - cflags: *optflags - cflags-override: true - cxxflags: *optflags - cxxflags-override: true - env: - AR: llvm-ar - CC: clang - CXX: clang++ - RANLIB: llvm-ranlib - ldflags: -fuse-ld=lld - config-opts: - - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_LLVM_SUBMODULE=OFF - - -DUSE_NATIVE_INSTRUCTIONS=OFF - - -DUSE_PRECOMPILED_HEADERS=OFF - - -DUSE_SYSTEM_CURL=ON - - -DUSE_SYSTEM_FFMPEG=ON - - -DUSE_SYSTEM_LIBPNG=ON - - -DUSE_SYSTEM_ZLIB=ON - - -Wno-dev - post-install: - - | - set -eux; - sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; - COMM_COUNT="$(git rev-list --count HEAD)"; - COMM_HASH="$(git rev-parse --short=8 HEAD)"; - sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; - sources: - - type: git - url: https://github.com/RPCS3/rpcs3.git - commit: d6b026314409980734605e9275950f835f04e8df + # - name: rpcs3 + # buildsystem: cmake-ninja + # builddir: true + # build-options: + # append-ld-library-path: /usr/lib/sdk/llvm13/lib + # append-path: /usr/lib/sdk/llvm13/bin + # cflags: *optflags + # cflags-override: true + # cxxflags: *optflags + # cxxflags-override: true + # env: + # AR: llvm-ar + # CC: clang + # CXX: clang++ + # RANLIB: llvm-ranlib + # ldflags: -fuse-ld=lld + # config-opts: + # - -DCMAKE_BUILD_TYPE=RelWithDebInfo + # - -DBUILD_LLVM_SUBMODULE=OFF + # - -DUSE_NATIVE_INSTRUCTIONS=OFF + # - -DUSE_PRECOMPILED_HEADERS=OFF + # - -DUSE_SYSTEM_CURL=ON + # - -DUSE_SYSTEM_FFMPEG=ON + # - -DUSE_SYSTEM_LIBPNG=ON + # - -DUSE_SYSTEM_ZLIB=ON + # - -Wno-dev + # post-install: + # - | + # set -eux; + # sed -i 's|RPCS3|net.rpcs3.RPCS3|' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"; + # COMM_COUNT="$(git rev-list --count HEAD)"; + # COMM_HASH="$(git rev-parse --short=8 HEAD)"; + # sed -i 's|||' ${FLATPAK_DEST}/share/metainfo/rpcs3.metainfo.xml; + # sources: + # - type: git + # url: https://github.com/RPCS3/rpcs3.git + # commit: d6b026314409980734605e9275950f835f04e8df # RPCS3 - END @@ -771,62 +771,58 @@ modules: # https://github.com/flathub/app.xemu.xemu # Disabled because of this: https://github.com/XargonWan/RetroDECK/runs/6033071862?check_suite_focus=true - # - name: libglu - # buildsystem: meson - # cleanup: - # - /include - # - /lib/debug - # - /lib/pkgconfig - # - /lib/*.a - # sources: - # - type: archive - # url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz - # sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 - # x-checker-data: - # type: anitya - # project-id: 13518 - # stable-only: true - # url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz + - name: libglu + buildsystem: meson + cleanup: + - /include + - /lib/debug + - /lib/pkgconfig + - /lib/*.a + sources: + - type: archive + url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz + sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4 + x-checker-data: + type: anitya + project-id: 13518 + stable-only: true + url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz - # - name: xemu - # buildsystem: autotools - # builddir: true - # no-make-install: true - # build-options: - # cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls - # config-opts: - # - --audio-drv-list=sdl - # - --disable-werror - # - --target-list=i386-softmmu - # make-args: - # - qemu-system-i386 - # post-install: - # - |- - # for px in 16 32 48 64 128 256 512; do - # install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png - # done - # - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg - # - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications - # - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop - # - mv qemu-system-i386 /app/bin/xemu - # - mkdir -p /app/share/licenses/xemu - # - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt - # #- install -Dm644 ../app.xemu.xemu.metainfo.xml /app/share/metainfo/app.xemu.xemu.metainfo.xml - # sources: - # - type: git - # url: https://github.com/mborgerson/xemu.git - # tag: gh-release/0.6.2-90-g6f507c80af - # commit: 6f507c80af546e0f5d316622d20f78820423ce6e - # x-checker-data: - # type: json - # url: https://api.github.com/repos/mborgerson/xemu/releases/latest - # tag-query: .tag_name - # version-query: $tag | sub("^gh-release/"; "") - # timestamp-query: .published_at - # is-main-source: true - - # - type: file - # #path: app.xemu.xemu.metainfo.xml + - name: xemu + buildsystem: autotools + builddir: true + no-make-install: true + build-options: + cflags: -O3 -DXBOX=1 -Wno-error=redundant-decls + config-opts: + - --audio-drv-list=sdl + - --disable-werror + - --target-list=i386-softmmu + make-args: + - qemu-system-i386 + post-install: + - |- + for px in 16 32 48 64 128 256 512; do + install -Dm644 ../ui/icons/xemu_${px}x${px}.png /app/share/icons/hicolor/${px}x${px}/apps/app.xemu.xemu.png + done + - install -Dm644 ../ui/icons/xemu.svg /app/share/icons/hicolor/scalable/apps/app.xemu.xemu.svg + - desktop-file-install ../ui/xemu.desktop --dir /app/share/applications + - sed -i 's/^Icon=xemu/Icon=app.xemu.xemu/' /app/share/applications/xemu.desktop + - mv qemu-system-i386 /app/bin/xemu + - mkdir -p /app/share/licenses/xemu + - cd .. && python3 scripts/gen-license.py > /app/share/licenses/xemu/LICENSE.txt + sources: + - type: git + url: https://github.com/mborgerson/xemu.git + tag: gh-release/0.6.2-90-g6f507c80af + commit: 6f507c80af546e0f5d316622d20f78820423ce6e + x-checker-data: + type: json + url: https://api.github.com/repos/mborgerson/xemu/releases/latest + tag-query: .tag_name + version-query: $tag | sub("^gh-release/"; "") + timestamp-query: .published_at + is-main-source: true # XEMU - END From f1986b6730f86428a6391dc6fc1f9658c6bb4170 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 17 Apr 2022 21:03:04 +0900 Subject: [PATCH 18/75] Added ther subcookers builds to GitAction --- .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 fa200f75..fa46bc4e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -7,10 +7,10 @@ on: # Triggers the workflow on push or pull request events but only for the main branch push: branches: - - cooker + - cooker* pull_request: branches: - - cooker + - cooker* # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From eb64c29ef056c522758e471adbb8aeaece96fac0 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Sun, 17 Apr 2022 21:59:09 +0900 Subject: [PATCH 19/75] Added dotnet6 for Ryujinx --- .github/workflows/cooker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index fa46bc4e..565bab09 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/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 org.freedesktop.Sdk.Extension.dotnet6 # Runs a set of commands using the runners shell - name: Building flatpak diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e6a4e36..825800f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/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 org.freedesktop.Sdk.Extension.dotnet6 # Runs a set of commands using the runners shell - name: Building flatpak From a41cf1d855de4a7e3ba6e0427eeaa7932d47b0d0 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 10:07:26 +0900 Subject: [PATCH 20/75] Not useful for this branch --- .github/workflows/cooker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 565bab09..fa46bc4e 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.dotnet6 + 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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 825800f8..2e6a4e36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.dotnet6 + 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 d75d1056f3417368af03fb4363b21c3ebd4bb86b Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 10:14:32 +0900 Subject: [PATCH 21/75] Added llvm13 --- com.xargon.retrodeck.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 2b7cd9c0..5e5d3cd9 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 rpcs3 +sdk-extensions: +- org.freedesktop.Sdk.Extension.llvm13 +# /Needed for rpcs3 # Needed for Yuzu base: io.qt.qtwebengine.BaseApp base-version: 5.15-21.08 From e8284693b69ec5ecc87b2cb9c5ec4da5aca661b3 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 10:20:38 +0900 Subject: [PATCH 22/75] Cooker cleanup --- com.xargon.retrodeck.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 5e5d3cd9..2b7cd9c0 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -2,10 +2,6 @@ app-id: com.xargon.retrodeck runtime: org.kde.Platform runtime-version: '5.15-21.08' sdk: org.kde.Sdk -# Needed for rpcs3 -sdk-extensions: -- org.freedesktop.Sdk.Extension.llvm13 -# /Needed for rpcs3 # Needed for Yuzu base: io.qt.qtwebengine.BaseApp base-version: 5.15-21.08 From a7bd34017cabcf8c4da8795f96bf9d043bd9bd23 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 10:21:45 +0900 Subject: [PATCH 23/75] rpcs3: added llvm13 dependency --- com.xargon.retrodeck.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index 2b7cd9c0..5e5d3cd9 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 rpcs3 +sdk-extensions: +- org.freedesktop.Sdk.Extension.llvm13 +# /Needed for rpcs3 # Needed for Yuzu base: io.qt.qtwebengine.BaseApp base-version: 5.15-21.08 From 7bba6373b77bdbb67312ddb45f0794c0930c07bc Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 10:49:53 +0900 Subject: [PATCH 24/75] rpcs3: added llvm13 dependency in workflows --- .github/workflows/cooker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index fa46bc4e..6615daf1 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/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 org.freedesktop.Sdk.Extension.llvm13 # Runs a set of commands using the runners shell - name: Building flatpak diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e6a4e36..3d48a51a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,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 io.qt.qtwebengine.BaseApp/x86_64/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 org.freedesktop.Sdk.Extension.llvm13 # Runs a set of commands using the runners shell - name: Building flatpak From 3376fd4b58d6190e3bb262816398a11932e4d9c6 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 22:15:45 +0900 Subject: [PATCH 25/75] This branch brings bleeding edge ES-DE and Art Book --- 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 5e5d3cd9..fe7b623b 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -132,7 +132,7 @@ modules: sources: - type: git url: https://gitlab.com/leonstyhre/emulationstation-de.git - branch: c3fc30cfd5c26195024e0da328349d83af067b9e + branch: 5861455f1fad4f56f3310094bf0c66e1a1446784 # ES-DE - END @@ -144,7 +144,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-de.git - branch: 4452f8356819d3cd079549b113fb15edb919a0df + branch: 8084ef17f05e68789ed83636de3a1b15f920d701 # External manifests start From 606e458ef97552eb7a0557962fbff12c3c7cbe03 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Tue, 19 Apr 2022 22:27:55 +0900 Subject: [PATCH 26/75] Removed the cooker.yml verbosity and compacted the build in only one row --- .github/workflows/cooker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml index 6615daf1..974e0651 100644 --- a/.github/workflows/cooker.yml +++ b/.github/workflows/cooker.yml @@ -40,8 +40,7 @@ jobs: # Runs a set of commands using the runners shell - name: Building flatpak run: | - sudo flatpak-builder -v --user --install --force-clean retrodeck-flatpak com.xargon.retrodeck.yml - sudo flatpak-builder -v --repo=local --force-clean localrepo com.xargon.retrodeck.yml + sudo flatpak-builder --user --install --force-clean --repo=local retrodeck-flatpak com.xargon.retrodeck.yml sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck - name: Get date for artifacts From 1e18945a6af4c1567285704a5ec48901fe288343 Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Wed, 20 Apr 2022 18:56:04 +0900 Subject: [PATCH 27/75] Fixed logic error in move-roms tool --- tools/move-roms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/move-roms.sh b/tools/move-roms.sh index 6128ab9a..77a835c8 100644 --- a/tools/move-roms.sh +++ b/tools/move-roms.sh @@ -1,8 +1,8 @@ #!/bin/bash -if [ -d ~/retrodeck/roms ] && [ -d ~/retrodeck/roms ] +if [ -d ~/retrodeck/roms ] && [ -d /run/media/mmcblk0p1/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." + 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 or merge them." exit 0 fi From 5b4062f68932559e4cc606aad557309134f10c2e Mon Sep 17 00:00:00 2001 From: Xargon Wan Date: Wed, 20 Apr 2022 19:06:31 +0900 Subject: [PATCH 28/75] Hopefully fixed the tools metadata --- retrodeck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index de186d2e..d3598eb0 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -67,7 +67,7 @@ then cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ - cp /app/retrodeck/tools-gamelist.xml /var/config/emulationstation/.emulationstation/custom_systems/tools/gamelist.xml + cp /app/retrodeck/tools-gamelist.xml /var/config/retrodeck/tools/gamelist.xml mkdir -p /var/config/retroarch/cores/ cp /app/share/libretro/cores/* /var/config/retroarch/cores/ From 36a2a26c7bb175fac00f87bf6bba58e63cbbd4d8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 13:54:30 +0900 Subject: [PATCH 29/75] Configured Yuzu --- com.xargon.retrodeck.yml | 4 ++++ retrodeck.sh | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml index fe7b623b..c711110b 100644 --- a/com.xargon.retrodeck.yml +++ b/com.xargon.retrodeck.yml @@ -985,6 +985,10 @@ modules: - cp retrodeck.sh /app/bin/retrodeck.sh - chmod +x /app/bin/retrodeck.sh + # Configuring Yuzu + sed -i -e 's/Paths\romsPath=*' -e 's/Paths\romsPath=~/retrodeck/roms/switch' /var/config/yuzu/qt-config.ini + sed -i -e 's/Screenshots\screenshot_path=*' -e 's/Screenshots\screenshot_path=~/retrodeck/screenshots/' /var/config/yuzu/qt-config.ini + # Desktop entry - cp com.xargon.retrodeck.desktop /app/share/applications/com.xargon.retrodeck.desktop diff --git a/retrodeck.sh b/retrodeck.sh index d3598eb0..26feea8c 100755 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -37,6 +37,7 @@ then # Cleaning rm -rf /var/config/emulationstation/ rm /var/config/retrodeck/tools/* + rm -f /var/config/yuzu/qt-config.ini 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." @@ -64,6 +65,7 @@ then rm -rf /var/config/retroarch/system ln -s ~/retrodeck/bios /var/config/retroarch/system + # This should become a sed in the future cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg mkdir -p /var/config/emulationstation/.emulationstation/custom_systems/tools/ @@ -72,6 +74,11 @@ then mkdir -p /var/config/retroarch/cores/ cp /app/share/libretro/cores/* /var/config/retroarch/cores/ + # Initializing Yuzu + mkdir -p ~/retrodeck/bios/switch/keys + ln -s ~/retrodeck/bios/switch/keys /var/data/yuzu/keys + ln -s /var/data/yuzu/registered ~/retrodeck/bios/switch/registered + touch ~/retrodeck/.lock 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." From 717243a6c52350725113f90ca5d33447c006c3dc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 13:57:07 +0900 Subject: [PATCH 30/75] Yuzu: added start-yuzu tool --- tools-gamelist.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools-gamelist.xml b/tools-gamelist.xml index 3c867b28..afc03669 100644 --- a/tools-gamelist.xml +++ b/tools-gamelist.xml @@ -8,6 +8,14 @@ true true + + ./start-yuzu.sh + Start Yuzu + RetroArch + Start Yuzu to manually tweak your settings. + true + true + ./move-roms.sh Move roms folder From 61515db16548ec5fd8bddc4c78ad45dd1f8d5437 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 22 Apr 2022 14:26:19 +0900 Subject: [PATCH 31/75] Yuzu: fixed cli call --- es_systems.xml | 2 +- tools/start-yuzu.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 tools/start-yuzu.sh diff --git a/es_systems.xml b/es_systems.xml index 6415aa56..5f5d5806 100644 --- a/es_systems.xml +++ b/es_systems.xml @@ -1126,7 +1126,7 @@ Nintendo Switch %ROMPATH%/switch .nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP - %EMULATOR_YUZU% %ROM% + %EMULATOR_YUZU% -f -g %ROM% switch switch diff --git a/tools/start-yuzu.sh b/tools/start-yuzu.sh new file mode 100644 index 00000000..a8f9dad1 --- /dev/null +++ b/tools/start-yuzu.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +kdialog --title "RetroDECK" --warningyesno "Doing some changes in the Yuzu configuration may create serious issues, please continue only if you know what you're doing.\n\nDo you want to continue?" +if [ $? == 0 ]; then + yuzu \ No newline at end of file From 54a8597f4effcf819fecea97ea19c863a2868024 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:29:46 +0900 Subject: [PATCH 32/75] Update README.md --- README.md | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/README.md b/README.md index 230d9cac..7515bbd8 100644 --- a/README.md +++ b/README.md @@ -30,48 +30,3 @@ No, RetroDECK doesn't support Windows, but the project is fully open source so y ## Can I help? Of course, any help is appreciated, and not only byp rogramming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)! -

-# Developer notes: build instructions - -If you want to build the RetroDECK flatpak on your machine for developing or just testing purposes: -``` -cd ~ -git clone --recursive https://github.com/XargonWan/RetroDECK.git -cd RetroDECK -git submodule init -git submodule update -``` - -install `flatpak flatpak-builder p7zip-full` with your distro's package manager. - -```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 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 -``` - -To build the stable release: -``` -flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-main ~/RetroDECK/com.xargon.retrodeck.yml -flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck -``` - -Or alternatively, to build the cooker (experimental) release: -``` -git checkout cooker -flatpak-builder --user --install --force-clean --repo=local ~/RetroDECK/retrodeck-cooker ~/RetroDECK/com.xargon.retrodeck.yml -flatpak build-bundle local ~/RetroDECK.flatpak com.xargon.retrodeck -``` - -Install RetroDECK: -``` -flatpak install com.xargon.retrodeck -``` - -Run RetroDECK: -``` -flatpak run com.xargon.retrodeck -``` - -Uninstall RetroDECK: -``` -flatpak uninstall com.xargon.retrodeck -``` From 494681480dc6a1f87d7d2ef1e2bb94034ed325b1 Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:32:59 +0900 Subject: [PATCH 33/75] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7515bbd8..90d055b5 100644 --- a/README.md +++ b/README.md @@ -28,5 +28,8 @@ No partitioning or formatting is required. RetroDECK (differently from AmberELEC ## Is it available on Windows? No, RetroDECK doesn't support Windows, but the project is fully open source so you can port it if you wish. As an alternative, [Retrobat](http://www.retrobat.ovh/) offers similar functionality (but may not be compatible with RetroDECK's rom paths). +## How can I install it? +Check the [Managing RetroDECK flatpak file](https://github.com/XargonWan/RetroDECK/wiki/Developer-notes#managing-retrodeck-flatpak-file) on the Wiki + ## Can I help? Of course, any help is appreciated, and not only byp rogramming, just check out our [Discord](https://discord.gg/Dz3szYsP8g)! From c390b9616e0112d985fe576d1d91ddf37da1bd8a Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:52:49 +0900 Subject: [PATCH 34/75] Added wiki to website --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index f983c07d..ea30ac95 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@