From 8edf3b949b5bc68e63df2bcf4d3219736b40c597 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Fri, 18 Mar 2022 16:14:57 +0100
Subject: [PATCH] Added PS2 emulators and put flatpak Ryujinx removing the
 former one.

---
 emulators/ryujinx.sh         |  3 +++
 emulators/ryujinx/ryujinx.sh |  3 ---
 es_systems.cfg               | 24 ++++++++++++++++++++++++
 install-retrodeck.sh         |  8 +++-----
 usr/bin/runemu.py            | 10 +++++-----
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100755 emulators/ryujinx.sh
 delete mode 100755 emulators/ryujinx/ryujinx.sh

diff --git a/emulators/ryujinx.sh b/emulators/ryujinx.sh
new file mode 100755
index 00000000..22cd431d
--- /dev/null
+++ b/emulators/ryujinx.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+ARG=${1//[\\]/}
+flatpak run org.ryujinx.Ryujinx --fullscreen $ARG
\ No newline at end of file
diff --git a/emulators/ryujinx/ryujinx.sh b/emulators/ryujinx/ryujinx.sh
deleted file mode 100755
index 671405df..00000000
--- a/emulators/ryujinx/ryujinx.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-ARG=${1//[\\]/}
-./emulators/ryujinx/Ryujinx --fullscreen $ARG
\ No newline at end of file
diff --git a/es_systems.cfg b/es_systems.cfg
index 08928555..82afd46c 100644
--- a/es_systems.cfg
+++ b/es_systems.cfg
@@ -1297,6 +1297,30 @@
 			</emulator>
 		</emulators>
 	</system>
+	<system>
+		<name>ps2</name>
+		<fullname>PlayStation 2</fullname>
+		<manufacturer>Sony</manufacturer>
+		<release>2000</release>
+		<hardware>console</hardware>
+		<path>~/retrodeck/storage/roms/ps2</path>
+		<extension>.bin .BIN .cue .CUE .img .IMG .mdf .MDF .pbp .PBP .toc .TOC .cbn .CBN .m3u .M3U .ccd .CCD .chd .CHD .iso .ISO</extension>
+		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
+		<platform>ps2</platform>
+		<theme>ps2</theme>
+		<emulators>
+			<emulator name="retroarch">
+				<cores>
+					<core default="true">pcsx2</core>
+				</cores>
+			</emulator>
+			<emulator name="retroarch">
+				<cores>
+					<core>play</core>
+				</cores>
+			</emulator>
+		</emulators>
+	</system>
 	<system>
 		<name>psp</name>
 		<fullname>PlayStation Portable</fullname>
diff --git a/install-retrodeck.sh b/install-retrodeck.sh
index ca547ebd..5006d98c 100755
--- a/install-retrodeck.sh
+++ b/install-retrodeck.sh
@@ -28,6 +28,7 @@ fi
 if [ test ! -d "$INSTALL_DIR/roms" ]; then
     ln -s $INSTALL_DIR/storage/roms $INSTALL_DIR/roms
 fi
+mkdir -p $INSTALL_DIR/roms/bios
 mkdir -p $INSTALL_DIR/roms/3do
 mkdir -p $INSTALL_DIR/roms/amiga
 mkdir -p $INSTALL_DIR/roms/amigacd32
@@ -174,10 +175,7 @@ mv $INSTALL_DIR/emulators/RetroArch-Linux-x86_64/RetroArch-Linux-x86_64.AppImage
 flatpak install flathub org.yuzu_emu.yuzu
 
 # Switch - Ryujinx
-cd $INSTALL_DIR/emulators
-wget https://github.com/Ryujinx/release-channel-master/releases/download/1.1.76/ryujinx-1.1.76-linux_x64.tar.gz
-tar -xvf ryujinx-1.1.76-linux_x64.tar.gz
-mv publish ryujinx
+flatpak install flathub org.ryujinx.Ryujinx
 
 # PS3 - RPCS3
 # DOS - dosbox-pure is included?
@@ -192,7 +190,7 @@ cp $INSTALL_DIR/patches/Splash.h $INSTALL_DIR/emulationstation/es-core/src/Splas
 cp $INSTALL_DIR/patches/GuiMenu.cpp $INSTALL_DIR/emulationstation/es-app/src/guis/GuiMenu.cpp
 # pathes applied
 cd emulationstation
-sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost openal # openal is needed for ryujinx
+sudo pacman -S base-devel cmake freeimage sdl2_mixer sdl2 rapidjson boost
 cmake -DENABLE_EMUELEC=1 -DGLES2=0 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0 -DRG552=1
 make -j$(nproc)
 cp $INSTALL_DIR/es_systems.cfg $INSTALL_DIR/emulationstation/
diff --git a/usr/bin/runemu.py b/usr/bin/runemu.py
index cd530f1c..243f7311 100755
--- a/usr/bin/runemu.py
+++ b/usr/bin/runemu.py
@@ -133,7 +133,7 @@ standalone_emulators: 'MutableMapping[str, StandaloneEmulator]' = {
 	'raze': StandaloneEmulator('raze', [INSTALL_DIR + '/usr/bin/raze.sh', '<path>']),
 	'solarus': StandaloneEmulator('solarus-run', [INSTALL_DIR + '/usr/bin/solarus.sh', '<path>']),
 	'yuzu': StandaloneEmulator('yuzu', [INSTALL_DIR + '/emulators/yuzu.sh', '<path>']),
-	'ryujinx': StandaloneEmulator('ryujinx', [INSTALL_DIR + '/emulators/ryujinx/ryujinx.sh', '<path>']),
+	'ryujinx': StandaloneEmulator('ryujinx', [INSTALL_DIR + '/emulators/ryujinx.sh', '<path>']),
 }
 
 def _load_customized_standalone_emulators():
@@ -219,9 +219,9 @@ class EmuRunner():
 			log(f'platform: {self.platform}')
 			log(f'core: {self.core}')
 		retroarch_binary = 'retroarch'
-		if self.core in {'pcsx_rearmed', 'parallel_n64'}:
-			retroarch_binary = 'retroarch32'
-			self.environment['LD_LIBRARY_PATH'] = '/usr/lib32'
+		#if self.core in {'pcsx_rearmed', 'parallel_n64'}:
+		#	retroarch_binary = 'retroarch32'
+		#	self.environment['LD_LIBRARY_PATH'] = '/usr/lib32'
 		
 		rom_path: 'Optional[Union[str, Path]]' = self.rom
 
@@ -387,7 +387,7 @@ def main():
 	except subprocess.CalledProcessError as cpe:
 		log(f'Process exited improperly with return code {cpe.returncode}')
 		exit_code = 1
-		requires_bios = {'atari5200', 'atari800', 'atari7800', 'atarilynx', 'colecovision', 'amiga', 'amigacd32', 'o2em', 'intellivision', 'pcengine', 'pcenginecd', 'pcfx', 'fds', 'segacd', 'saturn', 'dreamcast', 'naomi', 'atomiswave', 'x68000', 'neogeo', 'neogeocd', 'msx', 'msx2', 'sc-3000'}
+		requires_bios = {'atari5200', 'atari800', 'atari7800', 'atarilynx', 'colecovision', 'amiga', 'amigacd32', 'o2em', 'intellivision', 'pcengine', 'pcenginecd', 'pcfx', 'fds', 'segacd', 'saturn', 'dreamcast', 'naomi', 'atomiswave', 'x68000', 'neogeo', 'neogeocd', 'msx', 'msx2', 'sc-3000', 'pcsx2'}
 		if platform in requires_bios:
 			if platform == 'msx2':
 				platform_to_check = 'msx2'