Update to 1.1.1107

2024-01-13 10:45:03 +00:00 · 2024-01-13 10:45:03 +00:00 · 0f0b66bc34
commit 0f0b66bc34
parent 71fa6aa7c0
3 changed files with 83 additions and 89 deletions
--- a/nuget_sources.json
+++ b/nuget_sources.json
@ -29,10 +29,10 @@
    },
    {
        "type": "file",
-        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.tokens/7.0.3/microsoft.identitymodel.tokens.7.0.3.nupkg",
-        "sha512": "bbc881f9ecdf327ffdac2c86a682a6a902fda128266d8e804aec5b33f56ea038d1d71d18bf7cd1fab952d6be8f285e8f7c94e36e2ccd775ec99aad708afd7b51",
+        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.tokens/7.2.0/microsoft.identitymodel.tokens.7.2.0.nupkg",
+        "sha512": "e20f6d7aa8affa35576fef11caee71466273ea41bb6a064269f47bebc326c0df3c7db40b8282db549b912848918193b3d000004330a751030289257e3e1bcdcd",
        "dest": "nuget-sources",
-        "dest-filename": "microsoft.identitymodel.tokens.7.0.3.nupkg"
+        "dest-filename": "microsoft.identitymodel.tokens.7.2.0.nupkg"
    },
    {
        "type": "file",
@ -776,13 +776,6 @@
        "dest": "nuget-sources",
        "dest-filename": "microsoft.netcore.app.runtime.osx-x64.8.0.1.nupkg"
    },
-    {
-        "type": "file",
-        "url": "https://api.nuget.org/v3-flatcontainer/system.identitymodel.tokens.jwt/7.0.3/system.identitymodel.tokens.jwt.7.0.3.nupkg",
-        "sha512": "f8a39b734873f0e30f1031b2c11a430ad7083ad2322d8f80477e49cfa7f7e32606301f8cfdadcb7b3adb4236210f82a7e9627936ce99f292f62bc2a18700e3bd",
-        "dest": "nuget-sources",
-        "dest-filename": "system.identitymodel.tokens.jwt.7.0.3.nupkg"
-    },
    {
        "type": "file",
        "url": "https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg",
@ -799,10 +792,10 @@
    },
    {
        "type": "file",
-        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.logging/7.0.3/microsoft.identitymodel.logging.7.0.3.nupkg",
-        "sha512": "e4b364b3ed83d83ee7bacaa27981df652a6cba956407c76ce7360b184da3ad416fda972fb436ac542d1becf18382896b75507d49d4fe9ddc0a10f4a94b5ee5b6",
+        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.logging/7.2.0/microsoft.identitymodel.logging.7.2.0.nupkg",
+        "sha512": "c7aec91c92322d8167f6e2d4500515412fc159f559734fa433e5f9386b3e7c0c94a11c46d0b3194f438daceb8724a8a1f6e288767117a7a2e5316d6d7324e826",
        "dest": "nuget-sources",
-        "dest-filename": "microsoft.identitymodel.logging.7.0.3.nupkg"
+        "dest-filename": "microsoft.identitymodel.logging.7.2.0.nupkg"
    },
    {
        "type": "file",
@ -1058,10 +1051,10 @@
    },
    {
        "type": "file",
-        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.jsonwebtokens/7.0.3/microsoft.identitymodel.jsonwebtokens.7.0.3.nupkg",
-        "sha512": "c195b5b320be28effc145514a6883edf28bee8e08400271a72802c9a27912997a4a613528f7ad16c5676ccf78de2aeabed8b73d0ef007d3281dab97cfa0f87cc",
+        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.jsonwebtokens/7.2.0/microsoft.identitymodel.jsonwebtokens.7.2.0.nupkg",
+        "sha512": "16f1f8fbd567795bb57b31d1cf57a1e42576c4fc1a26ebffc73cf9be928071fe794b1adda17e2e68ac0f65a76932f2bb9133c0fa07596c3c46d73e5e3f1317ff",
        "dest": "nuget-sources",
-        "dest-filename": "microsoft.identitymodel.jsonwebtokens.7.0.3.nupkg"
+        "dest-filename": "microsoft.identitymodel.jsonwebtokens.7.2.0.nupkg"
    },
    {
        "type": "file",
@ -1163,10 +1156,10 @@
    },
    {
        "type": "file",
-        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.abstractions/7.0.3/microsoft.identitymodel.abstractions.7.0.3.nupkg",
-        "sha512": "9ea8fd427c7984bfadac6b1695b175492b3e9f29883a5d7c691795168270fea0d2a14dd44f281b556840aaf6a86b674b4c1269de20f4cbdb0f1e048429e2dbce",
+        "url": "https://api.nuget.org/v3-flatcontainer/microsoft.identitymodel.abstractions/7.2.0/microsoft.identitymodel.abstractions.7.2.0.nupkg",
+        "sha512": "1cd8f5f9fa179a5a94349f1f6b6bdcbd46fbb795b266950ccfd0fcf6dde09dc0c230aa56e16407cafd6ea30eff97c84867737d23a89190ce8712ae47425e3515",
        "dest": "nuget-sources",
-        "dest-filename": "microsoft.identitymodel.abstractions.7.0.3.nupkg"
+        "dest-filename": "microsoft.identitymodel.abstractions.7.2.0.nupkg"
    },
    {
        "type": "file",
--- a/org.ryujinx.Ryujinx.appdata.xml
+++ b/org.ryujinx.Ryujinx.appdata.xml
@ -47,6 +47,7 @@
        </screenshot>
    </screenshots>
    <releases>
+        <release version="1.1.1107" date="2024-01-13"/>
        <release version="1.1.1106" date="2024-01-13"/>
        <release version="1.1.1105" date="2024-01-13"/>
        <release version="1.1.1104" date="2024-01-03"/>
--- a/org.ryujinx.Ryujinx.yml
+++ b/org.ryujinx.Ryujinx.yml
@ -8,76 +8,76 @@ 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
+- --share=ipc
+- --socket=x11
+- --device=all
+- --socket=pulseaudio
+- --share=network
+- --filesystem=home:ro
+- --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
-      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.1106
-        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/net8.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/8.0.101/dotnet-sdk-8.0.101-linux-x64.tar.gz
-        sha256: 3c61ffcee8947e0ead6196799d058e671b00bc6b983983f2bde5d29f702de2fe
-        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
-      - nuget_sources.json
-      - type: git
-        url: https://github.com/Ryujinx/Ryujinx.git
-        commit: 1a45dc8df882e58e4280849541e4f3be94f0edb9
-      - 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.1107
+      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/net8.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/8.0.101/dotnet-sdk-8.0.101-linux-x64.tar.gz
+    sha256: 3c61ffcee8947e0ead6196799d058e671b00bc6b983983f2bde5d29f702de2fe
+    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
+  - nuget_sources.json
+  - type: git
+    url: https://github.com/Ryujinx/Ryujinx.git
+    commit: 4fbc978e7341de5aea9004753433ce8ecba309f9
+  - type: file
+    path: ryujinx-wrapper
+  - type: file
+    path: org.ryujinx.Ryujinx.appdata.xml