From 0335d15a144269a28c228b4bcee1aefcdf04aead Mon Sep 17 00:00:00 2001 From: RyujinxBot <61127645+RyujinxBot@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:36:26 +0000 Subject: [PATCH] Update to 1.1.1274 --- nuget_sources.json | 24 ++--- org.ryujinx.Ryujinx.appdata.xml | 1 + org.ryujinx.Ryujinx.yml | 168 ++++++++++++++++---------------- 3 files changed, 97 insertions(+), 96 deletions(-) diff --git a/nuget_sources.json b/nuget_sources.json index bdd9ee8..a2f51da 100644 --- a/nuget_sources.json +++ b/nuget_sources.json @@ -204,10 +204,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.logging/7.4.0/microsoft.identitymodel.logging.7.4.0.nupkg", - "sha512": "1b847761b7b7c6167f2b7bcbd0ae63b387b95280c805fedf1b90fcc3d1037886a8ef124e9e256a3d3cb030bdfad8dc38267b033956d93643eacdc08d2742298a", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.logging/7.5.1/microsoft.identitymodel.logging.7.5.1.nupkg", + "sha512": "36debc343887a64c0da8c5432429b4bcee6aa64ece002375771335e8835f1e3c15244136febb11422b06f448cfa341e1d1762d721ffe75872ea98d2e122c0e5d", "dest": "nuget-sources", - "dest-filename": "microsoft.identitymodel.logging.7.4.0.nupkg" + "dest-filename": "microsoft.identitymodel.logging.7.5.1.nupkg" }, { "type": "file", @@ -1079,10 +1079,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.jsonwebtokens/7.4.0/microsoft.identitymodel.jsonwebtokens.7.4.0.nupkg", - "sha512": "93eeddd4ab3767ea6541543acbc476146a51c9df71e24d752bd1dc645480201f80fbf874f03fb6a01db46a6ecbc1b0cb1549b73d552f5aaaa82eb66244ff2f06", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.jsonwebtokens/7.5.1/microsoft.identitymodel.jsonwebtokens.7.5.1.nupkg", + "sha512": "45d9c71519ec484baba6181ba3ed1d1341c716e848299f4fb4e9cc6c2363c8e628d1a912b936371ace84561d5c573a178c60c345a08d21a99c11426685f2ca59", "dest": "nuget-sources", - "dest-filename": "microsoft.identitymodel.jsonwebtokens.7.4.0.nupkg" + "dest-filename": "microsoft.identitymodel.jsonwebtokens.7.5.1.nupkg" }, { "type": "file", @@ -1471,10 +1471,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.tokens/7.4.0/microsoft.identitymodel.tokens.7.4.0.nupkg", - "sha512": "5d9a0622c31f6bd158fab1871a23316c4457249ffd3a3904bb208daf8e9e450e079405ff19849b249e3ba84a4a78dba6bd58659622966b33c953d59188061ebd", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.tokens/7.5.1/microsoft.identitymodel.tokens.7.5.1.nupkg", + "sha512": "7102dab1b4b79bacd0a515d940d6832c14b3939ac97498cf2701a4f35544bd5e40329bf7f9ca071c0156b15f44d8330b52186e038a590e2334538636a5c4b834", "dest": "nuget-sources", - "dest-filename": "microsoft.identitymodel.tokens.7.4.0.nupkg" + "dest-filename": "microsoft.identitymodel.tokens.7.5.1.nupkg" }, { "type": "file", @@ -1723,10 +1723,10 @@ }, { "type": "file", - "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.abstractions/7.4.0/microsoft.identitymodel.abstractions.7.4.0.nupkg", - "sha512": "0b3959cf6fa4a315873c83dcef2993e9ef1838315dd8e1ef5b548722f5d1f30e1a846c5efa58641841dacb7c5d45625b26e841cba66675a179874db11a3df205", + "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.abstractions/7.5.1/microsoft.identitymodel.abstractions.7.5.1.nupkg", + "sha512": "327104ecba7bf3e0b9070189efb9c62a561c955b10b6c2c8806b61ac820ebdabc0c9a093f705d7667bd798d543ef71ba7356952b09d7cb0616040f3223597b43", "dest": "nuget-sources", - "dest-filename": "microsoft.identitymodel.abstractions.7.4.0.nupkg" + "dest-filename": "microsoft.identitymodel.abstractions.7.5.1.nupkg" }, { "type": "file", diff --git a/org.ryujinx.Ryujinx.appdata.xml b/org.ryujinx.Ryujinx.appdata.xml index d5356e7..d43609e 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 3d2f365..1c190ca 100644 --- a/org.ryujinx.Ryujinx.yml +++ b/org.ryujinx.Ryujinx.yml @@ -8,90 +8,90 @@ 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-pictures:rw - - --filesystem=xdg-run/app/com.discordapp.Discord:create +- --share=ipc +- --socket=x11 +- --device=all +- --socket=pulseaudio +- --share=network +- --filesystem=home:ro +- --filesystem=xdg-pictures:rw +- --filesystem=xdg-run/app/com.discordapp.Discord:create 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 - aarch64: - env: - RUNTIME: linux-arm64 - 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.1273 - 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.$RUNTIME.*' | 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 - sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/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" /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/net8.0/$RUNTIME/publish/* /app/bin/ - chmod +x /app/bin/Ryujinx.sh - mkdir -p /app/lib/ffmpeg - 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/8.0.204/dotnet-sdk-8.0.204-linux-x64.tar.gz - sha256: 0ec834dc0f11a994057cd05d84c6250db726457f2fe308091d50543a5285dd15 - x-checker-data: - type: rotating-url - url: https://aka.ms/dotnet/8.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 - - type: archive - only-arches: - - aarch64 - dest: dotnet-sdk - url: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.204/dotnet-sdk-8.0.204-linux-arm64.tar.gz - sha256: c6ecb0c1897e217e8d20153a0119276ee1091c0600aecf2aca8e674c3575942e - x-checker-data: - type: rotating-url - url: https://aka.ms/dotnet/8.0/dotnet-sdk-linux-arm64.tar.gz - pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-arm64.tar.gz - - nuget_sources.json - - type: git - url: https://github.com/Ryujinx/Ryujinx.git - commit: e7f2342ebaa0aa143db0c41ce841ed501b0260d5 - - 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 + aarch64: + env: + RUNTIME: linux-arm64 + 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.1274 + 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.$RUNTIME.*' | 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 + sed -r --in-place 's/\%\%RYUJINX_CONFIG_FILE_NAME\%\%/Config\.json/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" /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/net8.0/$RUNTIME/publish/* /app/bin/ + chmod +x /app/bin/Ryujinx.sh + mkdir -p /app/lib/ffmpeg + 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/8.0.204/dotnet-sdk-8.0.204-linux-x64.tar.gz + sha256: 0ec834dc0f11a994057cd05d84c6250db726457f2fe308091d50543a5285dd15 + x-checker-data: + type: rotating-url + url: https://aka.ms/dotnet/8.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 + - type: archive + only-arches: + - aarch64 + dest: dotnet-sdk + url: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.204/dotnet-sdk-8.0.204-linux-arm64.tar.gz + sha256: c6ecb0c1897e217e8d20153a0119276ee1091c0600aecf2aca8e674c3575942e + x-checker-data: + type: rotating-url + url: https://aka.ms/dotnet/8.0/dotnet-sdk-linux-arm64.tar.gz + pattern: https://dotnetcli.azureedge.net/dotnet/Sdk/^([\d\.a-z-]+)$/dotnet-sdk-^([\d\.a-z-]+)$-linux-arm64.tar.gz + - nuget_sources.json + - type: git + url: https://github.com/Ryujinx/Ryujinx.git + commit: 0652813b0f7500bf07309a6906331644c3a2363b + - type: file + path: ryujinx-wrapper + - type: file + path: org.ryujinx.Ryujinx.appdata.xml