Added new Ryujinx with donet7, removed dontet6, added nuget_sources submodule

net.retrodeck.retrodeck.yml

@@ -5,7 +5,7 @@ runtime-version: 5.15-21.08
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-  - org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx
+  #- org.freedesktop.Sdk.Extension.dotnet6   # Needed for Ryujinx - Removed, check if it's not breaking something else
 base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
 base-version: 5.15-21.08                    # Needed for Yuzu
 command: retrodeck.sh
@@ -473,23 +473,67 @@ modules:
   # Ryujinx - START
   # https://ryujinx.org/download
 
-  # - name: libX11
-  #   #from: https://github.com/flathub/flatpak-external-data-checker/blob/6ed0a7b46cc4da2e4fc3a677cd1a078f335ff484/tests/org.x.xeyes.yml
-  #   sources:
-  #     - type: archive
-  #       url: https://www.x.org/releases/individual/lib/libX11-1.8.tar.gz
-  #       sha256: 68e0a30c4248b9f41492891a4b49672c3b0c59e84c4868144f03eef01ebc5eea
-
   - 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.398
+        RYUJINX_TARGET_RELEASE_CHANNEL_OWNER: flathub
+        RYUJINX_TARGET_RELEASE_CHANNEL_REPO: org.ryujinx.Ryujinx
+        RYUJINX_TARGET_RELEASE_CHANNEL_NAME: master
     build-commands:
-      - mv Ryujinx ${FLATPAK_DEST}/bin/Ryujinx
+    - |
-      - chmod 777 ${FLATPAK_DEST}/bin/Ryujinx
+      export PATH=$PATH:/run/build/Ryujinx/dotnet-sdk
-      - ln -s /usr/lib/x86_64-linux-gnu/libX11.so.6 /app/lib/libX11.so
+      export RYUJINX_GIT_SHORT_HASH=$(git rev-parse --short HEAD)
+      export RUNTIME_FRAMEWORK_VERSION=$(find nuget-sources -name 'microsoft.netcore.app.host.linux-x64.*' | grep -oP '(\d.\d.\d+.nupkg)' | grep -oP '(\d.\d.\d+)')
+      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 /p:RuntimeFrameworkVersion=$RUNTIME_FRAMEWORK_VERSION --self-contained --source nuget-sources
+      if [ $? -ne 0 ]; then
+          exit 1;
+      fi;
+      cp -r --remove-destination /run/build/Ryujinx/Ryujinx/bin/Release/net7.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:
-      - type: archive
+    - type: archive
-        url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.369/ryujinx-1.1.369-linux_x64.tar.gz
+      only-arches:
-        sha256: ef682e8ca14d46ba8ba9b4f8d3250ce4e661730d6ceee9abd9d12e4dd1d90e42
+      - x86_64
+      dest: dotnet-sdk
+      url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0.100/dotnet-sdk-7.0.100-linux-x64.tar.gz
+      sha256: 5d4a58eeca1a4ab095b55e6486b1278147b0ab121ce883b2bcde3d3626c9a81c
+      x-checker-data:
+        type: html
+        url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0/latest.version
+        version-pattern: ^([\d\.a-z-]+)$
+        url-template: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-x64.tar.gz
+    - rd-submodules/ryujinx/nuget_sources.json
+    - type: git
+      url: https://github.com/Ryujinx/Ryujinx.git
+      commit: a5c2aead6795192158caeb79e785543a15b5b2f4
+    # - type: file
+    #   path: ryujinx-wrapper
+
 
   # Ryujinx - END