Merge pull request #521 from TSRBerry/cooker-0.7.2b-ryujinx

Fix Ryujinx flatpak support

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "rd-submodules/shared-modules"]
 	path = rd-submodules/shared-modules
 	url = https://github.com/flathub/shared-modules.git
+[submodule "rd-submodules/ryujinx"]
+	path = rd-submodules/ryujinx
+	url = https://github.com/flathub/org.ryujinx.Ryujinx

emu-configs/ryujinx/Config.json

@@ -1,14 +1,17 @@
 {
-  "version": 42,
+  "version": 48,
   "enable_file_log": true,
   "backend_threading": "Auto",
   "res_scale": 1,
   "res_scale_custom": 1,
   "max_anisotropy": -1,
   "aspect_ratio": "Fixed16x9",
+  "anti_aliasing": "None",
+  "scaling_filter": "Bilinear",
+  "scaling_filter_level": 80,
   "graphics_shaders_dump_path": "",
   "logging_enable_debug": false,
-  "logging_enable_stub": true,
+  "logging_enable_stub": false,
   "logging_enable_info": true,
   "logging_enable_warn": true,
   "logging_enable_error": true,
@@ -21,20 +24,21 @@
   "system_region": "Europe",
   "system_time_zone": "UTC",
   "system_time_offset": 0,
-  "docked_mode": true,
+  "docked_mode": false,
   "enable_discord_integration": true,
-  "check_updates_on_start": true,
+  "check_updates_on_start": false,
-  "show_confirm_exit": true,
+  "show_confirm_exit": false,
-  "hide_cursor_on_idle": false,
+  "hide_cursor": 2,
   "enable_vsync": true,
   "enable_shader_cache": true,
   "enable_texture_recompression": false,
   "enable_macro_hle": true,
+  "enable_color_space_passthrough": false,
   "enable_ptc": true,
   "enable_internet_access": false,
   "enable_fs_integrity_checks": true,
   "fs_global_access_log_mode": 0,
-  "audio_backend": "SDL2",
+  "audio_backend": "OpenAl",
   "audio_volume": 1,
   "memory_manager_mode": "HostMappedUnsafe",
   "expand_ram": false,
@@ -58,6 +62,21 @@
   "game_dirs": [
     "RETRODECKHOMEDIR/roms/switch"
   ],
+  "shown_file_types": {
+    "nsp": true,
+    "pfs0": true,
+    "xci": true,
+    "nca": true,
+    "nro": true,
+    "nso": true
+  },
+  "window_startup": {
+    "window_size_width": 1280,
+    "window_size_height": 800,
+    "window_position_x": 0,
+    "window_position_y": 0,
+    "window_maximized": true
+  },
   "language_code": "en_US",
   "enable_custom_theme": false,
   "custom_theme_path": "",
@@ -67,12 +86,12 @@
   "grid_size": 2,
   "application_sort": 0,
   "is_ascending_order": true,
-  "start_fullscreen": false,
+  "start_fullscreen": true,
   "show_console": true,
   "enable_keyboard": false,
   "enable_mouse": false,
   "hotkeys": {
-    "toggle_vsync": "Tab",
+    "toggle_vsync": "F1",
     "screenshot": "F8",
     "show_ui": "F4",
     "pause": "F5",
@@ -104,12 +123,12 @@
       "deadzone_right": 0,
       "range_left": 1,
       "range_right": 1,
-      "trigger_threshold": 0,
+      "trigger_threshold": 0.5,
       "motion": {
         "motion_backend": "GamepadDriver",
         "sensitivity": 100,
         "gyro_deadzone": 1,
-        "enable_motion": false
+        "enable_motion": true
       },
       "rumble": {
         "strong_rumble": 1,
@@ -133,18 +152,20 @@
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
         "button_sr": "Unbound",
-        "button_x": "X",
+        "button_x": "Y",
         "button_b": "A",
-        "button_y": "Y",
+        "button_y": "X",
         "button_a": "B"
       },
       "version": 1,
       "backend": "GamepadSDL2",
       "id": "0-f6790003-28de-0000-ff11-000001000000",
-      "controller_type": "JoyconPair",
+      "controller_type": "Handheld",
-      "player_index": "Player1"
+      "player_index": "Handheld"
     }
   ],
   "graphics_backend": "Vulkan",
-  "preferred_gpu": "0x1002_0x163F"
+  "preferred_gpu": "0x1002_0x163F",
-}
+  "multiplayer_lan_interface_id": "0",
+  "use_hypervisor": true
+}

es-configs/es_find_rules.xml

@@ -604,21 +604,16 @@
     <emulator name="RYUJINX">
         <!-- Nintendo Switch emulator Ryujinx -->
         <rule type="systempath">
-            <entry>Ryujinx</entry>
+            <entry>Ryujinx.sh</entry>
-            <entry>Ryujinx.Ava</entry>
             <entry>org.ryujinx.Ryujinx</entry>
         </rule>
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
             <entry>~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx</entry>
-            <entry>~/Applications/publish/Ryujinx</entry>
+            <entry>~/Applications/publish/Ryujinx.sh</entry>
-            <entry>~/.local/share/applications/publish/Ryujinx</entry>
+            <entry>~/.local/share/applications/publish/Ryujinx.sh</entry>
-            <entry>~/.local/bin/publish/Ryujinx</entry>
+            <entry>~/.local/bin/publish/Ryujinx.sh</entry>
-            <entry>~/bin/publish/Ryujinx</entry>
+            <entry>~/bin/publish/Ryujinx.sh</entry>
-            <entry>~/Applications/publish/Ryujinx.Ava</entry>
-            <entry>~/.local/share/applications/publish/Ryujinx.Ava</entry>
-            <entry>~/.local/bin/publish/Ryujinx.Ava</entry>
-            <entry>~/bin/publish/Ryujinx.Ava</entry>
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
@@ -858,4 +853,4 @@
             <entry>~/bin/ZEsarUX/zesarux</entry>
         </rule>
     </emulator>
-</ruleList>
+</ruleList>

net.retrodeck.retrodeck.yml

@@ -1209,11 +1209,12 @@ modules:
       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.json
+      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 -Dm755 ryujinx-wrapper /app/bin/ryujinx-wrapper
@@ -1223,7 +1224,7 @@ modules:
       only-arches:
       - x86_64
       dest: dotnet-sdk
-      url: https://dotnetcli.azureedge.net/dotnet/Sdk/7.0.401/dotnet-sdk-7.0.400-linux-x64.tar.gz
+      url: https://dotnetcli.azureedge.net/dotnet/Sdk/7.0.401/dotnet-sdk-7.0.401-linux-x64.tar.gz
       sha256: 4634fa4da7ae4e3dadb83e320a87fb26f0cb12a7ca02bf9f10e6c3c1c91d645c
       x-checker-data:
         type: rotating-url

rd-submodules/ryujinx

@@ -0,0 +1 @@
+Subproject commit 1ba91da28905571210bd76352160cd831d25f59b

rd-submodules/ryujinx/ryujinx-wrapper

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in {0..9}; do
-    test -S $XDG_RUNTIME_DIR/discord-ipc-$i || ln -sf {app/com.discordapp.Discord,$XDG_RUNTIME_DIR}/discord-ipc-$i;
-done
-
-env DOTNET_EnableAlternateStackCheck=1 Ryujinx "$@"