Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

This commit is contained in:
icenine451 2023-04-27 16:51:40 -04:00
commit b18e90ae7a
3 changed files with 37 additions and 11 deletions

View file

@ -137,6 +137,14 @@
<entry>~/bin/cpcemu/cpcemu</entry>
</rule>
</emulator>
<emulator name="CSPECT">
<!-- Sinclair ZX Spectrum Next emulator #CSpect -->
<rule type="staticpath">
<entry>~/Applications/CSpect/CSpect.exe</entry>
<entry>~/.local/bin/CSpect/CSpect.exe</entry>
<entry>~/bin/CSpect/CSpect.exe</entry>
</rule>
</emulator>
<emulator name="DESMUME">
<!-- Nintendo DS emulator DeSmuME -->
<rule type="systempath">

View file

@ -999,7 +999,10 @@
<extension>.bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
<command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM%</command>
<!-- <command label="Mupen64Plus (Standalone)">%EMULATOR_MUPEN64PLUS% &#45;&#45;nogui %ROM%</command> -->
<command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM%</command>
<!-- <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM%</command> -->
<!-- <command label="simple64 (Standalone)">%EMULATOR_SIMPLE64% &ndash;&ndash;nogui %ROM%</command> -->
<!-- <command label="Rosalie's Mupen GUI (Standalone)">%EMULATOR_ROSALIES-MUPEN-GUI% &ndash;&ndash;nogui -q %ROM%</command> -->
<!-- <command label="ares (Standalone)">%EMULATOR_ARES% &ndash;&ndash;fullscreen &ndash;&ndash;system "Nintendo 64" %ROM%</command> -->
<platform>n64</platform>
<theme>n64</theme>
</system>
@ -1178,7 +1181,7 @@
<path>%ROMPATH%/pc98</path>
<extension>.2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .m3u .M3U .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP</extension>
<command label="Neko Project II Kai">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM%</command>
<command label="Neko Project II">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM%</command>
<command label="Neko Project II">%STARTDIR%=%GAMEDIR% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM%</command>
<platform>pc98</platform>
<theme>pc98</theme>
</system>
@ -1248,10 +1251,11 @@
<name>ps2</name>
<fullname>Sony PlayStation 2</fullname>
<path>%ROMPATH%/ps2</path>
<extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
<command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
<extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
<command label="LRPS2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
<command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
<!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndash;disc %ROM%</command> -->
<!-- <command label="Play! (Standalone)">%EMULATOR_PLAY!% &ndash;&ndashdisc %ROM%</command> -->
<platform>ps2</platform>
<theme>ps2</theme>
</system>
@ -1760,7 +1764,6 @@
<platform>wii</platform>
<theme>wii</theme>
</system>
<system>
<name>wiiu</name>
<fullname>Nintendo Wii U</fullname>
@ -1770,7 +1773,6 @@
<platform>wiiu</platform>
<theme>wiiu</theme>
</system>
<system>
<name>wonderswan</name>
<fullname>Bandai WonderSwan</fullname>
@ -1820,15 +1822,17 @@
<platform>xbox</platform>
<theme>xbox</theme>
</system>
<!--
<system>
<name>xbox360</name>
<fullname>Microsoft Xbox 360</fullname>
<path>%ROMPATH%/xbox360</path>
<extension>.iso .ISO .xex .XEX</extension>
<extension>. .iso .ISO .xex .XEX</extension>
<command>PLACEHOLDER %ROM%</command>
<platform>xbox360</platform>
<theme>xbox360</theme>
</system>
-->
<!--
<system>
<name>zmachine</name>

View file

@ -236,7 +236,21 @@ modules:
url: https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz
sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
# When updating this module remember to check those: https://gitlab.com/es-de/emulationstation-de/-/tree/v1.2.6/resources/systems/unix
- name: libgit2-glib
buildsystem: meson
config-opts:
- -Dssh=false
sources:
- type: archive
url: https://download.gnome.org/sources/libgit2-glib/1.1/libgit2-glib-1.1.0.tar.xz
sha256: c38dd7575daf8141e1e422333a575faf65f3c9210c08e83e981b88dd41bf1ef3
x-checker-data:
type: gnome
name: libgit2-glib
stable-only: true
# When updating this module remember to check those:
# https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml
# But we don't include them 1:1 as RetroDECK got some specific configs in some cases
- name: emulationstation-de
buildsystem: cmake-ninja
@ -248,7 +262,7 @@ modules:
sources:
- type: git
url: https://gitlab.com/es-de/emulationstation-de
branch: 608d8a3c09abc5db398cdadc09e18fd2dfbaf570
branch: 9bcc112f7c7efd3216bd3f12370f55fdee011bd4
- type: shell
commands:
- sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK