From 947d6d9ed9580e7a031dc344b1540ab68f152631 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 2 Jan 2023 13:28:55 +0000
Subject: [PATCH] RYUJINX: removed [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml |   4 +-
 net.retrodeck.retrodeck.yml         | 110 ++++++++++++++--------------
 2 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 25c8f2ae..c3e2f0b7 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -73,7 +73,9 @@
     <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.1b</url>
       <description>
         <ul>
-          <li>FOO</li>
+          <li>Removed Ryjuinx as it was broken (sorry)</li>
+          <li>Added missing Primehack config and Configurator options</li>
+          <li>Fixed a bug where the retrodeck folder was having a symlink creation issue after migration</li>
       </ul>
     </description>
   </release>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 23246df9..21949bf6 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -951,61 +951,61 @@ modules:
   # THIS MUST BE AT THE END OF THE MANIFEST OR THE BINARY WILL GET CORRUPTED
   #
 
-  - 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.500
-        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.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 -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
-    sources:
-      - type: git
-        url: https://github.com/Ryujinx/Ryujinx.git
-        commit: 2b23463daa01226c5569d8e61d1d0959570354cf
-      - type: archive
-        only-arches:
-        - x86_64
-        dest: dotnet-sdk
-        url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0.101/dotnet-sdk-7.0.101-linux-x64.tar.gz
-        sha256: 454e2da3d02c74c2f6d2446c94fd9075f8db80ff6c9b9d41d5e470683e16a1d5
-        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: file
-        path: rd-submodules/ryujinx/ryujinx-wrapper
+  # - 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.500
+  #       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.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 -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
+  #   sources:
+  #     - type: git
+  #       url: https://github.com/Ryujinx/Ryujinx.git
+  #       commit: 2b23463daa01226c5569d8e61d1d0959570354cf
+  #     - type: archive
+  #       only-arches:
+  #       - x86_64
+  #       dest: dotnet-sdk
+  #       url: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/7.0.101/dotnet-sdk-7.0.101-linux-x64.tar.gz
+  #       sha256: 454e2da3d02c74c2f6d2446c94fd9075f8db80ff6c9b9d41d5e470683e16a1d5
+  #       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: file
+  #       path: rd-submodules/ryujinx/ryujinx-wrapper
 
   # Ryujinx - END