From dec25f64dd41242a9ddede2786a2e64005f5e97e Mon Sep 17 00:00:00 2001 From: Steam OS User Date: Fri, 15 Apr 2022 10:17:45 +0900 Subject: [PATCH] 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