From 576fd5c58cd846866123f9dc11ee2f3bb65a24a2 Mon Sep 17 00:00:00 2001 From: RyujinxBot <61127645+RyujinxBot@users.noreply.github.com> Date: Sun, 5 Nov 2023 11:38:05 +0000 Subject: [PATCH] Update to 1.1.1070 --- org.ryujinx.Ryujinx.appdata.xml | 1 + org.ryujinx.Ryujinx.yml | 142 ++++++++++++++++---------------- 2 files changed, 72 insertions(+), 71 deletions(-) diff --git a/org.ryujinx.Ryujinx.appdata.xml b/org.ryujinx.Ryujinx.appdata.xml index da504fd..bec555d 100644 --- a/org.ryujinx.Ryujinx.appdata.xml +++ b/org.ryujinx.Ryujinx.appdata.xml @@ -47,6 +47,7 @@ + diff --git a/org.ryujinx.Ryujinx.yml b/org.ryujinx.Ryujinx.yml index d1e3ffa..4609c27 100644 --- a/org.ryujinx.Ryujinx.yml +++ b/org.ryujinx.Ryujinx.yml @@ -8,77 +8,77 @@ add-extensions: directory: lib/ffmpeg add-ld-path: . finish-args: - - --share=ipc - - --socket=x11 - - --device=all - - --socket=pulseaudio - - --share=network - - --filesystem=home:ro - - --filesystem=xdg-run/app/com.discordapp.Discord:create - - --filesystem=xdg-config/gtk-3.0:ro +- --share=ipc +- --socket=x11 +- --device=all +- --socket=pulseaudio +- --share=network +- --filesystem=home:ro +- --filesystem=xdg-run/app/com.discordapp.Discord:create +- --filesystem=xdg-config/gtk-3.0:ro rename-icon: ryujinx command: ryujinx-wrapper modules: - - name: Ryujinx - buildsystem: simple - build-options: - no-debuginfo: true - no-debuginfo-compression: true - strip: false - arch: - x86_64: - env: - RUNTIME: linux-x64 - env: - PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig - DOTNET_CLI_TELEMETRY_OPTOUT: 'true' - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' - RYUJINX_VERSION: 1.1.1069 - RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub - RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx - RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master - build-commands: - - | - export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk - export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) - export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.runtime.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)') - echo "Runtime framework version: $RUNTIME_FRAMEWORK_VERSION" - sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" src/Ryujinx.Common/ReleaseInformation.cs - sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" src/Ryujinx.Common/ReleaseInformation.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" src/Ryujinx.Common/ReleaseInformation.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" src/Ryujinx.Common/ReleaseInformation.cs - sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" src/Ryujinx.Common/ReleaseInformation.cs - mkdir -p /app/bin - dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded src/Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants="DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR" /p:RuntimeFrameworkVersion=$RUNTIME_FRAMEWORK_VERSION --self-contained --source nuget-sources - if [ $? -ne 0 ]; then - exit 1; - fi; - cp -r --remove-destination /run/build/Ryujinx/src/Ryujinx/bin/Release/net7.0/$RUNTIME/publish/* /app/bin/ - chmod +x /app/bin/Ryujinx.sh - 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/misc/Logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg - install -Dm644 distribution/linux/mime/Ryujinx.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: - - type: archive - only-arches: - - x86_64 - dest: dotnet-sdk - url: https://dotnetcli.azureedge.net/dotnet/Sdk/7.0.403/dotnet-sdk-7.0.403-linux-x64.tar.gz - sha256: 8a3c6bf5bfdf4f81775b7314b136bf96f0ba995804c66ae1cd787cb20365ec4e - x-checker-data: - type: rotating-url - url: https://aka.ms/dotnet/7.0/dotnet-sdk-linux-x64.tar.gz - pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-x64.tar.gz - - nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: 7b62f7475eae8cfef82f7a60d45aaef55c1efde7 - - type: file - path: ryujinx-wrapper - - type: file - path: org.ryujinx.Ryujinx.appdata.xml +- name: Ryujinx + buildsystem: simple + build-options: + no-debuginfo: true + no-debuginfo-compression: true + strip: false + arch: + x86_64: + env: + RUNTIME: linux-x64 + env: + PKG_CONFIG_PATH: /app/lib/pkgconfig:/app/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig + DOTNET_CLI_TELEMETRY_OPTOUT: 'true' + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true' + RYUJINX_VERSION: 1.1.1070 + RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub + RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx + RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master + build-commands: + - | + export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk + export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD) + export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.runtime.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)') + echo "Runtime framework version: $RUNTIME_FRAMEWORK_VERSION" + sed -r --in-place "s/\%\%RYUJINX_BUILD_VERSION\%\%/$RYUJINX_VERSION/g;" src/Ryujinx.Common/ReleaseInformation.cs + sed -r --in-place "s/\%\%RYUJINX_BUILD_GIT_HASH\%\%/$RYUJINX_GIT_SHORT_HASH/g;" src/Ryujinx.Common/ReleaseInformation.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_NAME/g;" src/Ryujinx.Common/ReleaseInformation.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_OWNER/g;" src/Ryujinx.Common/ReleaseInformation.cs + sed -r --in-place "s/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/$RYUJINX_TARGET_RELEASE_CHANNEL_REPO/g;" src/Ryujinx.Common/ReleaseInformation.cs + mkdir -p /app/bin + dotnet publish -c Release -r $RUNTIME /p:DebugType=embedded src/Ryujinx /p:Version=$RYUJINX_VERSION /p:SourceRevisionId=$RYUJINX_GIT_SHORT_HASH /p:ExtraDefineConstants="DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR" /p:RuntimeFrameworkVersion=$RUNTIME_FRAMEWORK_VERSION --self-contained --source nuget-sources + if [ $? -ne 0 ]; then + exit 1; + fi; + cp -r --remove-destination /run/build/Ryujinx/src/Ryujinx/bin/Release/net7.0/$RUNTIME/publish/* /app/bin/ + chmod +x /app/bin/Ryujinx.sh + 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/misc/Logo.svg /app/share/icons/hicolor/scalable/apps/ryujinx.svg + install -Dm644 distribution/linux/mime/Ryujinx.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: + - type: archive + only-arches: + - x86_64 + dest: dotnet-sdk + url: https://dotnetcli.azureedge.net/dotnet/Sdk/7.0.403/dotnet-sdk-7.0.403-linux-x64.tar.gz + sha256: 8a3c6bf5bfdf4f81775b7314b136bf96f0ba995804c66ae1cd787cb20365ec4e + x-checker-data: + type: rotating-url + url: https://aka.ms/dotnet/7.0/dotnet-sdk-linux-x64.tar.gz + pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-x64.tar.gz + - nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: 617c5700ca520d80fd25fc0fc9f2389394a46150 + - type: file + path: ryujinx-wrapper + - type: file + path: org.ryujinx.Ryujinx.appdata.xml