Merge pull request #1806 from JustEnoughLinuxOS/dev

PR for release

README.md

@@ -80,7 +80,7 @@ limitations under the License.
 * JELOS is installed by restoring an image file and [Flashing](https://github.com/JustEnoughLinuxOS/distribution/tree/main#flashing) to a device's internal storage or an external sd card.
 * On x86 devices JELOS includes an installation tool.  The installation tool can be found in the tools menu, which is one of the systems listed within ES.
 * JELOS operating system is stored on an Ext4 partition that can be read by LINUX but is not natively readable on Windows. Currently it is not possible to access the primary JELOS Ext4 partition on Windows to transfer roms.
-* On devices that support a second sd card, the sd card can be formatted as EXT4, FAT32 or exFAT. JELOS will automatically detect the second SD card on boot and configure the relevant folders for storing roms.
+* On devices that support a second sd card, the sd card can be formatted as Ext4, FAT32, or exFAT. JELOS will automatically detect the second SD card on boot and configure the relevant folders for storing roms.
 
 ## Upgrading
 * Download and install the update online via the System Settings menu.
@@ -116,7 +116,7 @@ limitations under the License.
 * [Setting Up P2P Networking With ZeroTier](/documentation/SETUP_P2P_ZEROTIER.md)
 * [Configure TailScale VPN](/documentation/SETUP_VPN_TAILSCALE.md)
 * [Setting Up Wireguard VPN](/documentation/SETUP_VPN_WIREGUARD.md)
-* [Creating Custom Shader Presets for Per Game / Per System Use](https://github.com/gannon345/distribution/blob/main/documentation/GENERAL_CUSTOM_SHADERS.md)
+* [Creating Custom Shader Presets for Per Game / Per System Use](https://github.com/JustEnoughLinuxOS/distribution/blob/main/documentation/GENERAL_CUSTOM_SHADERS.md))
 
 ## Credits
 Like any Linux distribution, this project is not the work of one person.  It is the work of many persons all over the world who have developed the open source bits without which this project could not exist.  Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the open source community.

documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md

@@ -71,7 +71,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>**primehack:** primehack<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md

@@ -59,7 +59,7 @@ This document describes all available systems emulators and cores available for
 |NEC|TurboGrafx-16 (tg16)|1989|`tg16`|.pce .PCE .bin .BIN .zip .ZIP .7z .7Z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|TurboGrafx-CD (tg16cd)|1989|`tg16cd`|.cue .CUE .ccd .CCD .chd .CHD .toc .TOC .m3u .M3U|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |Nesbox|TIC-80 (tic-80)|2017|`tic-80`|.tic .TIC|**retroarch:** tic80 (default)<br>|
-|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>|
+|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>**retroarch:** desmume<br>|
 |Nintendo|Famicom (famicom)|1983|`famicom`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .FDS .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>|
 |Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .MGW .zip .ZIP .7z .7Z|**retroarch:** gw<br>|

documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md

@@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md

@@ -59,7 +59,7 @@ This document describes all available systems emulators and cores available for
 |NEC|TurboGrafx-16 (tg16)|1989|`tg16`|.pce .PCE .bin .BIN .zip .ZIP .7z .7Z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|TurboGrafx-CD (tg16cd)|1989|`tg16cd`|.cue .CUE .ccd .CCD .chd .CHD .toc .TOC .m3u .M3U|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |Nesbox|TIC-80 (tic-80)|2017|`tic-80`|.tic .TIC|**retroarch:** tic80 (default)<br>|
-|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>|
+|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>**retroarch:** desmume<br>|
 |Nintendo|Famicom (famicom)|1983|`famicom`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .FDS .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>|
 |Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .MGW .zip .ZIP .7z .7Z|**retroarch:** gw<br>|
@@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md

@@ -59,7 +59,7 @@ This document describes all available systems emulators and cores available for
 |NEC|TurboGrafx-16 (tg16)|1989|`tg16`|.pce .PCE .bin .BIN .zip .ZIP .7z .7Z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|TurboGrafx-CD (tg16cd)|1989|`tg16cd`|.cue .CUE .ccd .CCD .chd .CHD .toc .TOC .m3u .M3U|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |Nesbox|TIC-80 (tic-80)|2017|`tic-80`|.tic .TIC|**retroarch:** tic80 (default)<br>|
-|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>|
+|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>**retroarch:** desmume<br>|
 |Nintendo|Famicom (famicom)|1983|`famicom`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .FDS .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>|
 |Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .MGW .zip .ZIP .7z .7Z|**retroarch:** gw<br>|
@@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md

@@ -59,7 +59,7 @@ This document describes all available systems emulators and cores available for
 |NEC|TurboGrafx-16 (tg16)|1989|`tg16`|.pce .PCE .bin .BIN .zip .ZIP .7z .7Z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|TurboGrafx-CD (tg16cd)|1989|`tg16cd`|.cue .CUE .ccd .CCD .chd .CHD .toc .TOC .m3u .M3U|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |Nesbox|TIC-80 (tic-80)|2017|`tic-80`|.tic .TIC|**retroarch:** tic80 (default)<br>|
-|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>|
+|Nintendo|DS (nds)|2005|`nds`|.nds .zip .NDS .ZIP .7z|**drastic:** drastic-sa (default)<br>**retroarch:** melonds<br>**retroarch:** desmume<br>|
 |Nintendo|Famicom (famicom)|1983|`famicom`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .FDS .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>|
 |Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .MGW .zip .ZIP .7z .7Z|**retroarch:** gw<br>|
@@ -69,7 +69,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**retroarch:** dolphin<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md

@@ -70,7 +70,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Advance (Hacks) (gbah)|2001|`gbah`|.gba .GBA .zip .ZIP .7z .7Z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>|
 |Nintendo|Game Boy Color (gbc)|1998|`gbc`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .GB .gbc .GBC .zip .ZIP .7z .7Z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
-|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**primehack:** primehack<br>**retroarch:** dolphin<br>|
+|Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .GCM .iso .ISO .gcz .GCZ .ciso .CISO .wbfs .WBFS .rvz .RVZ .dol .DOL|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .SMC .fig .FIG .sfc .SFC .swc .SWC .zip .ZIP .7z .7Z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
 |Nintendo|N64 (n64)|1996|`n64`|.z64 .Z64 .n64 .N64 .v64 .V64 .zip .ZIP .7z .7Z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus-sa:** m64p_gliden64<br>**mupen64plus-sa:** m64p_gl64mk2<br>**mupen64plus-sa:** m64p_rice<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .NES .unif .UNIF .unf .UNF .zip .ZIP .7z .7Z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|

packages/apps/moonlight/autostart/010-moonlight

@@ -11,5 +11,5 @@ then
   cp /usr/config/moonlight/moonlight.conf /storage/.config/moonlight/moonlight.conf
 fi
 
-sed -i "s#@MWIDTH@#${FBWIDTH}#g" /storage/.config/moonlight/moonlight.conf
+sed -i "s#@MWIDTH@#${FBWIDTH}#g;
-sed -i "s#@MHEIGHT@#${FBHEIGHT}#g" /storage/.config/moonlight/moonlight.conf
+        s#@MHEIGHT@#${FBHEIGHT}#g" /storage/.config/moonlight/moonlight.conf

packages/apps/moonlight/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="moonlight"
-PKG_VERSION="0169cedb27552a358cfd6afb1d99e3c5e86f22bf"
+PKG_VERSION="6538d855d8cc6078745d76fa3695def2377a155d"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/moonlight-stream/moonlight-embedded"

packages/emulators/libretro/desmume-lr/package.mk

@@ -10,12 +10,12 @@ PKG_DEPENDS_TARGET="toolchain libpcap"
 PKG_SHORTDESC="DeSmuME - Nintendo DS libretro"
 PKG_TOOLCHAIN="make"
 
-if [ ! "${OPENGL}" = "no" ]; then
+if [ "${OPENGL_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
-fi
 
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
+elif [ "${OPENGLES_SUPPORT}" = yes ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_PATCH_DIRS+=" gles"
 fi
 
 

packages/emulators/libretro/desmume-lr/patches/gles/000-enable-gles.patch

@@ -0,0 +1,26 @@
+From 89112d650a16787a7b27fd176b976a67bf10f96d Mon Sep 17 00:00:00 2001
+From: SupervisedThinking <supervisedthinking@gmail.com>
+Date: Thu, 20 May 2021 15:57:36 +0200
+Subject: [PATCH] Makefile.libretro: disable OpenGL
+
+---
+ desmume/src/frontend/libretro/Makefile.libretro | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/desmume/src/frontend/libretro/Makefile.libretro
++++ b/desmume/src/frontend/libretro/Makefile.libretro
+@@ -75,10 +75,10 @@ ifneq (,$(findstring unix,$(platform)))
+          CXX = g++-x86
+       endif
+    else
+-      LIBS := -lpthread -lGL -lpcap
+-      CXXFLAGS += -DHAVE_OPENGL -std=gnu++11
+-      DESMUME_OPENGL = 1
+-	DESMUME_OPENGL_CORE = 1
++      LIBS := -lpthread -lpcap
++      CXXFLAGS += -std=gnu++11
++      DESMUME_OPENGL = 0
++      DESMUME_OPENGL_CORE = 0
+    endif
+ 
+    ifneq (,$(findstring clang,$(platform)))

packages/emulators/libretro/dosbox-pure-lr/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure-lr"
-PKG_VERSION="d0bdb9f4715166f4df78e42ac87e077784636ab0"
+PKG_VERSION="153a6513bc945cd7bcf2dcf772fde6fd8b5ea304"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/fbneo-lr/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="fbneo-lr"
-PKG_VERSION="be48662b5a8afaa9b66f2f6e28aca40de21fc428"
+PKG_VERSION="16bd79798e3c4aae65d6df788a25c01a0a17a32f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/emulators/libretro/gearboy-lr/package.mk

@@ -15,7 +15,7 @@
 ################################################################################
 
 PKG_NAME="gearboy-lr"
-PKG_VERSION="8161290995c685de47db8f72fc17ecc7f7e006a1"
+PKG_VERSION="b0d126cc3b23f1827bedfeea675cc60be28203fd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/gearcoleco-lr/package.mk

@@ -15,7 +15,7 @@
 ################################################################################
 
 PKG_NAME="gearcoleco-lr"
-PKG_VERSION="b8da617fab5897bef360fc613ee4227067f78fa2"
+PKG_VERSION="daf8e25d2374e9fe702acd767e9591b04d48cf42"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/gearsystem-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="gearsystem-lr"
-PKG_VERSION="d9454402f323713e4a40a6b222fc3b9232773b94"
+PKG_VERSION="e87091a4a44be7c6050ef71f3154c318ab0de3cc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"

packages/emulators/libretro/glsl-shaders/package.mk

@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="glsl-shaders"
-PKG_VERSION="88d1c3f59c62bf2926e3f594acf0b06eec253347"
+PKG_VERSION="5c7ac57950f637cabea856c3f31ebc04ff49f825"
 PKG_REV="1"
 PKG_ARCH="aarch64"
 PKG_LICENSE="GPL"

packages/emulators/libretro/libretro-database/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="4a98ea9726b3954a4e5a940d255bd14c307ddfba"
+PKG_VERSION="3e7bb62975b7ac33eb494dd68a1f14eb5ce2a5cb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/pcsx_rearmed-lr/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="pcsx_rearmed-lr"
-PKG_VERSION="3c53dce313b786d55ff3f9c363ba26f4c0b3476e"
+PKG_VERSION="8659d7fd2cdb11f63724ead0997f47f4c694f8c2"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"

packages/emulators/libretro/ppsspp-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp-lr"
-PKG_VERSION="ce4a266547d21657557628fcc9fc8e1c621a2d12"
+PKG_VERSION="30862d0752b4b544d5f2fe9cfe52a20c1878cfbd"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"

packages/emulators/libretro/puae-lr/package.mk

@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="puae-lr"
-PKG_VERSION="8800b86264ea919eea337202077047e5220a76cb"
+PKG_VERSION="2cc53e25d26ad1b79759e28f0f24631cb1466539"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/slang-shaders/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="slang-shaders"
-PKG_VERSION="75b81b5a6ed104f22081ae81f7a8111c68537c9b"
+PKG_VERSION="6485e4c6104a56f2fe47ab0b204aee2a47ed13b1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/swanstation-lr/package.mk

@@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
 
 PKG_NAME="swanstation-lr"
-PKG_VERSION="ab8cd2955b102856214290619e69aae5c5d70302"
+PKG_VERSION="e76104d5cabc27c6cab92d697df40da99d0af8d5"
 PKG_ARCH=""
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/swanstation"

packages/emulators/libretro/tic80-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="tic80-lr"
-PKG_VERSION="48d8a58401b2529fccbfdfbfc9f78e33f196d9dd"
+PKG_VERSION="68b94ee596e1ac218b8b9685fd0485c7ee8d2f18"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/nesbox/TIC-80"

packages/emulators/standalone/flycast-sa/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="flycast-sa"
-PKG_VERSION="a0bf24f7cc6c28f6c9e5032108c9ac6bba10f9d7"
+PKG_VERSION="9c61006941daf5ee387480eacf95b9115950787c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"

packages/emulators/standalone/hatarisa/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
 
 PKG_NAME="hatarisa"
-PKG_VERSION="ee8137d2d8e4554bad6e96b8c5c5d2975a12c9dd"
+PKG_VERSION="0bbf58014becef2007ce4e7fec5b75e35813bd01"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"

packages/emulators/standalone/pico-8/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="pico-8"
-PKG_VERSION="3c9b43d4397ded48708f63a4237f77f642515d1f"
+PKG_VERSION="f8adbe08805d9fe9171cb2e3078f383631d1331d"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE=""

packages/emulators/standalone/ppsspp-sa/package.mk

@@ -7,7 +7,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="${PKG_SITE}.git"
-PKG_VERSION="ce4a266547d21657557628fcc9fc8e1c621a2d12"
+PKG_VERSION="30862d0752b4b544d5f2fe9cfe52a20c1878cfbd"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"

packages/emulators/standalone/ppsspp-sa/sources/RK3326/controls.ini

@@ -0,0 +1,25 @@
+[ControlMapping]
+Up = 10-19
+Down = 10-20
+Left = 10-21
+Right = 10-22
+Circle = 10-189
+Cross = 10-190
+Square = 10-188
+Triangle = 10-191
+Start = 10-197
+Select = 10-196
+L = 10-193
+R = 10-192
+An.Up = 10-4002
+An.Down = 10-4003
+An.Left = 10-4000
+An.Right = 10-4001
+Fast-forward = 1-61
+Pause = 10-106
+Save State = 10-4010
+Load State = 10-4008
+RightAn.Up = 10-4007
+RightAn.Down = 10-4006
+RightAn.Left = 10-4005
+RightAn.Right = 10-4004

packages/emulators/standalone/ppsspp-sa/sources/RK3326/ppsspp.ini

@@ -0,0 +1,462 @@
+[General]
+FirstRun = False
+RunCount = 3
+Enable Logging = True
+AutoRun = True
+Browse = False
+IgnoreBadMemAccess = True
+CurrentDirectory = /storage
+ShowDebuggerOnLoad = False
+CheckForNewVersion = True
+Language = en_US
+ForceLagSync2 = False
+DiscordPresence = True
+UISound = False
+AutoLoadSaveState = 0
+EnableCheats = False
+CwCheatRefreshRate = 77
+CwCheatScrollPosition = 0.000000
+GameListScrollPosition = 0.000000
+ScreenshotsAsPNG = False
+UseFFV1 = False
+DumpFrames = False
+DumpVideoOutput = False
+DumpAudio = False
+SaveLoadResetsAVdumping = False
+StateSlot = 0
+EnableStateUndo = True
+StateLoadUndoGame = NA
+StateUndoLastSaveGame = NA
+StateUndoLastSaveSlot = -5
+RewindSnapshotInterval = 0
+ShowOnScreenMessage = True
+ShowRegionOnGameIcon = False
+ShowIDOnGameIcon = False
+GameGridScale = 1.000000
+GridView1 = True
+GridView2 = True
+GridView3 = False
+RightAnalogUp = 0
+RightAnalogDown = 0
+RightAnalogLeft = 0
+RightAnalogRight = 0
+RightAnalogPress = 0
+RightAnalogCustom = False
+RightAnalogDisableDiagonal = False
+SwipeUp = 0
+SwipeDown = 0
+SwipeLeft = 0
+SwipeRight = 0
+SwipeSensitivity = 1.000000
+SwipeSmoothing = 0.300000
+DoubleTapGesture = 0
+GestureControlEnabled = False
+ReportingHost = default
+AutoSaveSymbolMap = False
+CacheFullIsoInRam = False
+RemoteISOPort = 0
+LastRemoteISOServer = 
+LastRemoteISOPort = 0
+RemoteISOManualConfig = False
+RemoteShareOnStartup = False
+RemoteISOSubdir = /
+RemoteDebuggerOnStartup = False
+InternalScreenRotation = 1
+BackgroundAnimation = 1
+TransparentBackground = True
+UITint = 0.000000
+UISaturation = 1.000000
+PauseWhenMinimized = False
+DumpDecryptedEboots = False
+ShowMenuBar = True
+MemStickInserted = True
+EnablePlugins = True
+IgnoreCompatSettings = 
+[CPU]
+CPUCore = 1
+SeparateSASThread = True
+IOTimingMethod = 0
+FastMemoryAccess = True
+FunctionReplacements = True
+HideSlowWarnings = False
+HideStateWarnings = False
+PreloadFunctions = False
+JitDisableFlags = 0x00000000
+CPUSpeed = 0
+[Graphics]
+EnableCardboardVR = False
+CardboardScreenSize = 50
+CardboardXShift = 0
+CardboardYShift = 0
+iShowStatusFlags = 0
+GraphicsBackend = 3 (VULKAN)
+FailedGraphicsBackends = 
+DisabledGraphicsBackends = 
+VulkanDevice = 
+CameraDevice = 
+UseGeometryShader = False
+SkipBufferEffects = False
+SoftwareRenderer = False
+SoftwareRendererJit = True
+HardwareTransform = True
+SoftwareSkinning = True
+TextureFiltering = 1
+BufferFiltering = 1
+InternalResolution = 1
+HighQualityDepth = 1
+FrameSkip = 0
+FrameSkipType = 0
+AutoFrameSkip = False
+StereoRendering = False
+StereoToMonoShader = RedBlue
+FrameRate = 0
+FrameRate2 = -1
+AnalogFrameRate = 240
+AnalogFrameRateMode = 0
+UnthrottlingMode = CONTINUOUS
+AnisotropyLevel = 4
+MultiSampleLevel = 0
+VertexDecCache = False
+TextureBackoffCache = False
+FullScreen = True
+FullScreenMulti = False
+DisplayOffsetX = 0.500000
+DisplayOffsetY = 0.500000
+DisplayScale = 1.000000
+DisplayAspectRatio = 1.000000
+DisplayStretch = False
+ImmersiveMode = True
+SustainedPerformanceMode = False
+IgnoreScreenInsets = True
+ReplaceTextures = True
+SaveNewTextures = False
+IgnoreTextureFilenames = False
+ReplaceTexturesAllowLate = True
+TexScalingLevel = 1
+TexScalingType = 0
+TexDeposterize = False
+TexHardwareScaling = False
+VSyncInterval = False
+BloomHack = 0
+SplineBezierQuality = 2
+HardwareTessellation = False
+TextureShader = Off
+ShaderChainRequires60FPS = False
+SkipGPUReadbacks = False
+LogFrameDrops = False
+InflightFrames = 3
+RenderDuplicateFrames = False
+GpuLogProfiler = False
+[Sound]
+Enable = True
+AudioBackend = 0
+ExtraAudioBuffering = False
+GlobalVolume = 10
+ReverbVolume = 10
+AltSpeedVolume = -1
+AudioDevice = 
+AutoAudioDevice = True
+[Control]
+HapticFeedback = False
+ShowTouchCross = True
+ShowTouchCircle = True
+ShowTouchSquare = True
+ShowTouchTriangle = True
+Custom0Mapping = 0x0000000000000000
+Custom0Image = 0
+Custom0Shape = 0
+Custom0Toggle = False
+Custom0Repeat = False
+Custom1Mapping = 0x0000000000000000
+Custom1Image = 1
+Custom1Shape = 0
+Custom1Toggle = False
+Custom1Repeat = False
+Custom2Mapping = 0x0000000000000000
+Custom2Image = 2
+Custom2Shape = 0
+Custom2Toggle = False
+Custom2Repeat = False
+Custom3Mapping = 0x0000000000000000
+Custom3Image = 3
+Custom3Shape = 0
+Custom3Toggle = False
+Custom3Repeat = False
+Custom4Mapping = 0x0000000000000000
+Custom4Image = 4
+Custom4Shape = 0
+Custom4Toggle = False
+Custom4Repeat = False
+Custom5Mapping = 0x0000000000000000
+Custom5Image = 0
+Custom5Shape = 1
+Custom5Toggle = False
+Custom5Repeat = False
+Custom6Mapping = 0x0000000000000000
+Custom6Image = 1
+Custom6Shape = 1
+Custom6Toggle = False
+Custom6Repeat = False
+Custom7Mapping = 0x0000000000000000
+Custom7Image = 2
+Custom7Shape = 1
+Custom7Toggle = False
+Custom7Repeat = False
+Custom8Mapping = 0x0000000000000000
+Custom8Image = 3
+Custom8Shape = 1
+Custom8Toggle = False
+Custom8Repeat = False
+Custom9Mapping = 0x0000000000000000
+Custom9Image = 4
+Custom9Shape = 1
+Custom9Toggle = False
+Custom9Repeat = False
+ShowTouchPause = False
+ShowTouchControls = False
+DisableDpadDiagonals = False
+GamepadOnlyFocused = False
+TouchButtonStyle = 1
+TouchButtonOpacity = 65
+TouchButtonHideSeconds = 20
+AutoCenterTouchAnalog = False
+AnalogAutoRotSpeed = 8.000000
+TouchSnapToGrid = False
+TouchSnapGridSize = 64
+ActionButtonSpacing2 = 1.000000
+ActionButtonCenterX = 0.859485
+ActionButtonCenterY = 0.750000
+ActionButtonScale = 1.150000
+DPadX = 0.167447
+DPadY = 0.400000
+DPadScale = 1.150000
+ShowTouchDpad = True
+DPadSpacing = 1.000000
+StartKeyX = 0.634660
+StartKeyY = 0.856250
+StartKeyScale = 1.150000
+ShowTouchStart = True
+SelectKeyX = 0.500000
+SelectKeyY = 0.856250
+SelectKeyScale = 1.150000
+ShowTouchSelect = True
+UnthrottleKeyX = 0.365340
+UnthrottleKeyY = 0.856250
+UnthrottleKeyScale = 1.150000
+ShowTouchUnthrottle = True
+LKeyX = 0.080796
+LKeyY = 0.089583
+LKeyScale = 1.150000
+ShowTouchLTrigger = True
+RKeyX = 0.919204
+RKeyY = 0.089583
+RKeyScale = 1.150000
+ShowTouchRTrigger = True
+AnalogStickX = 0.167447
+AnalogStickY = 0.808333
+AnalogStickScale = 1.150000
+ShowAnalogStick = True
+RightAnalogStickX = 0.859485
+RightAnalogStickY = 0.808333
+RightAnalogStickScale = 1.150000
+ShowRightAnalogStick = False
+fcombo0X = 0.661592
+fcombo0Y = 0.500000
+comboKeyScale0 = 1.150000
+ShowComboKey0 = False
+fcombo1X = 0.796253
+fcombo1Y = 0.500000
+comboKeyScale1 = 1.150000
+ShowComboKey1 = False
+fcombo2X = 0.930913
+fcombo2Y = 0.500000
+comboKeyScale2 = 1.150000
+ShowComboKey2 = False
+fcombo3X = 0.661592
+fcombo3Y = 0.333333
+comboKeyScale3 = 1.150000
+ShowComboKey3 = False
+fcombo4X = 0.796253
+fcombo4Y = 0.333333
+comboKeyScale4 = 1.150000
+ShowComboKey4 = False
+fcombo5X = 0.338407
+fcombo5Y = 0.500000
+comboKeyScale5 = 1.150000
+ShowComboKey5 = False
+fcombo6X = 0.203747
+fcombo6Y = 0.500000
+comboKeyScale6 = 1.150000
+ShowComboKey6 = False
+fcombo7X = 0.069087
+fcombo7Y = 0.500000
+comboKeyScale7 = 1.150000
+ShowComboKey7 = False
+fcombo8X = 0.338407
+fcombo8Y = 0.333333
+comboKeyScale8 = 1.150000
+ShowComboKey8 = False
+fcombo9X = 0.203747
+fcombo9Y = 0.333333
+comboKeyScale9 = 1.150000
+ShowComboKey9 = False
+AnalogDeadzone = 0.150000
+AnalogInverseDeadzone = 0.000000
+AnalogSensitivity = 1.100000
+AnalogIsCircular = False
+AnalogLimiterDeadzone = 0.600000
+LeftStickHeadScale = 1.000000
+RightStickHeadScale = 1.000000
+HideStickBackground = False
+UseMouse = False
+MapMouse = False
+ConfineMap = False
+MouseSensitivity = 0.100000
+MouseSmoothing = 0.900000
+SystemControls = True
+[Network]
+EnableWlan = False
+EnableAdhocServer = False
+proAdhocServer = socom.cc
+PortOffset = 10000
+MinTimeout = 0
+ForcedFirstConnect = False
+EnableUPnP = False
+UPnPUseOriginalPort = False
+EnableNetworkChat = False
+ChatButtonPosition = 0
+ChatScreenPosition = 0
+EnableQuickChat = True
+QuickChat1 = Quick Chat 1
+QuickChat2 = Quick Chat 2
+QuickChat3 = Quick Chat 3
+QuickChat4 = Quick Chat 4
+QuickChat5 = Quick Chat 5
+[SystemParam]
+PSPModel = 1
+PSPFirmwareVersion = 660
+NickName = PPSSPP
+MacAddress = dc:39:74:d2:dd:86
+Language = 1
+ParamTimeFormat = 0
+ParamDateFormat = 0
+TimeZone = 0
+DayLightSavings = False
+ButtonPreference = 1
+LockParentalLevel = 0
+WlanAdhocChannel = 0
+WlanPowerSave = False
+EncryptSave = True
+SavedataUpgradeVersion = True
+MemStickSize = 16
+[Debugger]
+DisasmWindowX = -1
+DisasmWindowY = -1
+DisasmWindowW = -1
+DisasmWindowH = -1
+GEWindowX = -1
+GEWindowY = -1
+GEWindowW = -1
+GEWindowH = -1
+GEWindowTabsBL = 0x00000000
+GEWindowTabsBR = 0x00000000
+GEWindowTabsTR = 0x00000000
+ConsoleWindowX = -1
+ConsoleWindowY = -1
+FontWidth = 8
+FontHeight = 12
+DisplayStatusBar = True
+ShowBottomTabTitles = True
+ShowDeveloperMenu = False
+SkipDeadbeefFilling = False
+FuncHashMap = False
+MemInfoDetailed = False
+DrawFrameGraph = False
+[Upgrade]
+UpgradeMessage = 
+UpgradeVersion = 
+DismissedVersion = 
+[Theme]
+ThemeName = Default
+[VR]
+VREnable = True
+VREnable6DoF = True
+VREnableStereo = False
+VREnableMotions = True
+VRForce72Hz = True
+VRManualForceVR = False
+VRCameraDistance = 0.000000
+VRCameraHeight = 0.000000
+VRCameraSide = 0.000000
+VRCanvasDistance = 12.000000
+VRFieldOfView = 100.000000
+VRHeadUpDisplayScale = 0.300000
+VRMotionLength = 0.500000
+VRHeadRotationScale = 5.000000
+VRHeadRotationSmoothing = False
+VRHeadRotation = 0
+[Recent]
+MaxRecent = 60
+FileName0 = /storage/roms/psp/Final Fantasy III.iso
+FileName1 = /storage/roms/psp/Final Fantasy II.iso
+[Log]
+SYSTEMEnabled = True
+SYSTEMLevel = 2
+BOOTEnabled = True
+BOOTLevel = 2
+COMMONEnabled = True
+COMMONLevel = 2
+CPUEnabled = True
+CPULevel = 2
+FILESYSEnabled = True
+FILESYSLevel = 2
+G3DEnabled = True
+G3DLevel = 2
+HLEEnabled = True
+HLELevel = 2
+JITEnabled = True
+JITLevel = 2
+LOADEREnabled = True
+LOADERLevel = 2
+MEEnabled = True
+MELevel = 2
+MEMMAPEnabled = True
+MEMMAPLevel = 2
+SASMIXEnabled = True
+SASMIXLevel = 2
+SAVESTATEEnabled = True
+SAVESTATELevel = 2
+FRAMEBUFEnabled = True
+FRAMEBUFLevel = 2
+AUDIOEnabled = True
+AUDIOLevel = 2
+IOEnabled = True
+IOLevel = 2
+SCEAUDIOEnabled = True
+SCEAUDIOLevel = 2
+SCECTRLEnabled = True
+SCECTRLLevel = 2
+SCEDISPEnabled = True
+SCEDISPLevel = 2
+SCEFONTEnabled = True
+SCEFONTLevel = 2
+SCEGEEnabled = True
+SCEGELevel = 2
+SCEINTCEnabled = True
+SCEINTCLevel = 2
+SCEIOEnabled = True
+SCEIOLevel = 2
+SCEKERNELEnabled = True
+SCEKERNELLevel = 2
+SCEMODULEEnabled = True
+SCEMODULELevel = 2
+SCENETEnabled = True
+SCENETLevel = 2
+SCERTCEnabled = True
+SCERTCLevel = 2
+SCESASEnabled = True
+SCESASLevel = 2
+SCEUTILEnabled = True
+SCEUTILLevel = 2
+SCEMISCEnabled = True
+SCEMISCLevel = 2

packages/emulators/standalone/retroarch/autostart/001-controller

@@ -4,7 +4,8 @@
 
 . /etc/profile
 
-### Set up our controller variables.
+(
-tocon "Configuring controller..."
+  ### Set up our controller variables.
-/usr/bin/mkcontroller
+  tocon "Configuring controller..."
-
+  /usr/bin/mkcontroller
+) &

packages/emulators/standalone/retroarch/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="retroarch"
-PKG_VERSION="71fe2624d27eb4bb2ddb24c4ea2659d4118b37af"
+PKG_VERSION="2f7b330edcb46755b0b4a846340d1619b2f21582"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"

packages/emulators/tools/retroarch-overlays/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-overlays"
-PKG_VERSION="8508076ef0af16e3e05e3dadae916f8edddd302e"
+PKG_VERSION="0383f61bc4fbaf20eb3ffbdeb7ad29a302c8632d"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/common-overlays"
 PKG_URL="https://github.com/libretro/common-overlays/archive/${PKG_VERSION}.tar.gz"

packages/graphics/SDL2-rotated/package.mk

@@ -0,0 +1,123 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
+# Copyright (C) 2022-present Fewtarius
+
+PKG_NAME="SDL2-rotated"
+PKG_VERSION="$(get_pkg_version SDL2)"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.libsdl.org/"
+PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus pulseaudio libdrm"
+PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware."
+PKG_DEPENDS_HOST="toolchain:host distutilscross:host"
+PKG_PATCH_DIRS+="${DEVICE}"
+
+if [ ! "${OPENGL}" = "no" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGL=ON \
+                           -DVIDEO_OPENGL=ON \
+                           -DVIDEO_KMSDRM=OFF"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGL=OFF \
+                           -DVIDEO_OPENGL=OFF \
+                           -DVIDEO_KMSDRM=OFF"
+fi
+
+if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGLES=ON \
+                           -DVIDEO_OPENGLES=ON \
+                           -DVIDEO_KMSDRM=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGLES=OFF \
+                           -DVIDEO_OPENGLES=OFF \
+                           -DVIDEO_KMSDRM=OFF"
+fi
+
+if [ "${VULKAN_SUPPORT}" = "yes" ]; then
+  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_VULKAN=ON \
+                           -DVIDEO_OPENGL=OFF \
+                           -DVIDEO_VULKAN=ON"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_VULKAN=OFF \
+                           -DVIDEO_VULKAN=OFF"
+fi
+
+if [ "${DISPLAYSERVER}" = "wl" ]
+then
+  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
+  PKG_CMAKE_OPTS_TARGET+=" -DSDL_WAYLAND=ON \
+                           -DVIDEO_WAYLAND=ON \
+                           -DVIDEO_WAYLAND_QT_TOUCH=OFF \
+                           -DWAYLAND_SHARED=ON \
+                           -DVIDEO_X11=OFF \
+                           -DSDL_X11=OFF"
+else
+  PKG_CMAKE_OPTS_TARGET+=" -DVIDEO_WAYLAND=OFF \
+                           -DVIDEO_WAYLAND_QT_TOUCH=ON \
+                           -DWAYLAND_SHARED=OFF \
+                           -DVIDEO_X11=OFF \
+                           -DSDL_X11=OFF"
+fi
+
+PKG_DEPENDS_TARGET+=" librga"
+pre_make_host() {
+  sed -i "s| -lrga||g" ${PKG_BUILD}/CMakeLists.txt
+}
+pre_make_target() {
+  if ! `grep -rnw "${PKG_BUILD}/CMakeLists.txt" -e '-lrga'`; then
+    sed -i "s|--no-undefined|--no-undefined -lrga|" ${PKG_BUILD}/CMakeLists.txt
+  fi
+}
+
+pre_configure_target(){
+  export LDFLAGS="${LDFLAGS} -ludev"
+  PKG_CMAKE_OPTS_TARGET+="-DSDL_STATIC=OFF \
+                         -DLIBC=ON \
+                         -DGCC_ATOMICS=ON \
+                         -DALTIVEC=OFF \
+                         -DOSS=OFF \
+                         -DALSA=ON \
+                         -DALSA_SHARED=ON \
+                         -DJACK=OFF \
+                         -DJACK_SHARED=OFF \
+                         -DESD=OFF \
+                         -DESD_SHARED=OFF \
+                         -DARTS=OFF \
+                         -DARTS_SHARED=OFF \
+                         -DNAS=OFF \
+                         -DNAS_SHARED=OFF \
+                         -DLIBSAMPLERATE=OFF \
+                         -DLIBSAMPLERATE_SHARED=OFF \
+                         -DSNDIO=OFF \
+                         -DDISKAUDIO=OFF \
+                         -DDUMMYAUDIO=OFF \
+                         -DVIDEO_X11=OFF \
+                         -DVIDEO_MIR=OFF \
+                         -DMIR_SHARED=OFF \
+                         -DVIDEO_COCOA=OFF \
+                         -DVIDEO_DIRECTFB=OFF \
+                         -DVIDEO_VIVANTE=OFF \
+                         -DDIRECTFB_SHARED=OFF \
+                         -DFUSIONSOUND=OFF \
+                         -DFUSIONSOUND_SHARED=OFF \
+                         -DVIDEO_DUMMY=OFF \
+                         -DINPUT_TSLIB=ON \
+                         -DSDL_HIDAPI_JOYSTICK=ON \
+                         -DPTHREADS=ON \
+                         -DPTHREADS_SEM=ON \
+                         -DDIRECTX=OFF \
+                         -DSDL_DLOPEN=ON \
+                         -DCLOCK_GETTIME=OFF \
+                         -DRPATH=OFF \
+                         -DRENDER_D3D=OFF \
+                         -DPULSEAUDIO=ON"
+}
+
+post_makeinstall_target() {
+  sed -e "s:\(['=LI]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/sdl2-config
+  rm -rf ${INSTALL}/usr/bin
+  mkdir ${INSTALL}/usr/lib/SDL2-rotated
+  mv ${INSTALL}/usr/lib/libSDL* ${INSTALL}/usr/lib/SDL2-rotated
+}

packages/graphics/SDL2-rotated/patches/0001-no-cursor.patch

@@ -0,0 +1,31 @@
+From 7c4b7b8f46a3d688fe34c30741e260fa08a70813 Mon Sep 17 00:00:00 2001
+From: Fewtarius <fewtarius@gmail.com>
+Date: Sun, 4 Apr 2021 09:42:49 -0400
+Subject: [PATCH] Split V and P/M
+
+---
+ .../packages/SDL2/patches/0003-no-cursor.patch       | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+ create mode 100644 projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
+
+diff --git a/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch b/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
+new file mode 100644
+index 00000000..d912a67a
+--- /dev/null
++++ b/projects/Rockchip/devices/RG351P/packages/SDL2/patches/0003-no-cursor.patch
+@@ -0,0 +1,12 @@
++diff -rupN SDL2-2.0.10.orig/src/events/SDL_mouse.c SDL2-2.0.10.new/src/events/SDL_mouse.c
++--- SDL2-2.0.10.orig/src/events/SDL_mouse.c	2019-07-25 00:32:36.000000000 -0400
+++++ SDL2-2.0.10.new/src/events/SDL_mouse.c	2021-01-08 19:35:14.792357252 -0500
++@@ -158,7 +158,7 @@ SDL_MouseInit(void)
++ 
++     mouse->was_touch_mouse_events = SDL_FALSE; /* no touch to mouse movement event pending */
++ 
++-    mouse->cursor_shown = SDL_TRUE;
+++    mouse->cursor_shown = SDL_FALSE;
++ 
++     return (0);
++ }
+-- 
+2.25.1
+

packages/graphics/SDL2-rotated/patches/0002-egl_swapinterval_fix.patch

@@ -0,0 +1,25 @@
+diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
+index 87d693e8d..891d588c4 100644
+--- a/src/video/SDL_egl.c
++++ b/src/video/SDL_egl.c
+@@ -1032,7 +1032,7 @@ SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
+         return NULL;
+     }
+
+-    _this->egl_data->egl_swapinterval = 0;
++    _this->egl_data->egl_swapinterval = 1;
+
+     if (SDL_EGL_MakeCurrent(_this, egl_surface, egl_context) < 0) {
+         /* Save the SDL error set by SDL_EGL_MakeCurrent */
+diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
+index 3d76284fd..72163286b 100644
+--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
++++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
+@@ -82,6 +82,7 @@ int KMSDRM_GLES_SetSwapInterval(_THIS, int interval) {
+         return SDL_SetError("EGL not initialized");
+     }
+
++    interval = 1;
+     if (interval == 0 || interval == 1) {
+         _this->egl_data->egl_swapinterval = interval;
+     } else {

packages/graphics/SDL2-rotated/patches/0003-drm-resolution.patch

@@ -0,0 +1,59 @@
+diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
+index fbc2c96..cedc739 100644
+--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
++++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
+@@ -609,6 +609,24 @@ void KMSDRM_AddDisplay (_THIS, drmModeConnector *connector, drmModeRes *resource
+         goto cleanup;
+     }
+ 
++    // batocera - set resolution
++    {
++      FILE* fdDrmMode;
++      int drmMode;
++      if((fdDrmMode = fopen("/var/run/drmMode", "r")) != NULL) {
++	if(fscanf(fdDrmMode, "%i", &drmMode) == 1) {
++	  if(drmMode>=0 && drmMode<connector->count_modes) {
++	    drmModeCrtc *pcrtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
++	    if(pcrtc != NULL) {
++	      KMSDRM_drmModeSetCrtc(viddata->drm_fd, pcrtc->crtc_id, pcrtc->buffer_id, 0, 0, &connector->connector_id, 1, &connector->modes[drmMode]);
++	    }
++	  }
++	}
++	fclose(fdDrmMode);
++      }
++    }
++    //
++
+     /* Try to find a CRTC connected to this encoder */
+     crtc = KMSDRM_drmModeGetCrtc(viddata->drm_fd, encoder->crtc_id);
+ 
+@@ -1107,8 +1125,27 @@ KMSDRM_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+     SDL_DisplayMode mode;
+     int i;
+ 
++    // batocera
++    int wantedMode = 0;
++    {
++      FILE* fdDrmMode;
++      int drmMode;
++      if((fdDrmMode = fopen("/var/run/drmMode", "r")) != NULL) {
++	if(fscanf(fdDrmMode, "%i", &drmMode) == 1) {
++	  if(drmMode>=0 && drmMode<conn->count_modes) {
++	    wantedMode = drmMode;
++	  }
++	}
++	fclose(fdDrmMode);
++      }
++    }
++    //
++
+     for (i = 0; i < conn->count_modes; i++) {
+-        SDL_DisplayModeData *modedata = SDL_calloc(1, sizeof(SDL_DisplayModeData));
++        SDL_DisplayModeData *modedata;
++        if(i != wantedMode) continue; // batocera
++
++        modedata = SDL_calloc(1, sizeof(SDL_DisplayModeData));
+ 
+         if (modedata) {
+             modedata->mode_index = i;
+

packages/graphics/SDL2/package.mk

@@ -12,6 +12,12 @@ PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform development library d
 PKG_DEPENDS_HOST="toolchain:host distutilscross:host"
 PKG_PATCH_DIRS+="${DEVICE}"
 
+case ${ARCH} in
+  arm|aarch64)
+    PKG_DEPENDS_TARGET+=" SDL2-rotated"
+  ;;
+esac
+
 if [ ! "${OPENGL}" = "no" ]; then
   PKG_DEPENDS_TARGET+=" ${OPENGL} glu"
   PKG_CMAKE_OPTS_TARGET+=" -DSDL_OPENGL=ON \
@@ -61,20 +67,6 @@ else
                            -DSDL_X11=OFF"
 fi
 
-case ${DEVICE} in
-  RK3566-X55)
-    PKG_DEPENDS_TARGET+=" librga"
-    pre_make_host() {
-      sed -i "s| -lrga||g" ${PKG_BUILD}/CMakeLists.txt
-    }
-    pre_make_target() {
-      if ! `grep -rnw "${PKG_BUILD}/CMakeLists.txt" -e '-lrga'`; then
-        sed -i "s|--no-undefined|--no-undefined -lrga|" ${PKG_BUILD}/CMakeLists.txt
-      fi
-    }
-  ;;
-esac
-
 pre_configure_target(){
   export LDFLAGS="${LDFLAGS} -ludev"
   PKG_CMAKE_OPTS_TARGET+="-DSDL_STATIC=OFF \

packages/graphics/SDL2/patches/sdl2-patch-0004-touch-mouse.patch

@@ -0,0 +1,75 @@
+diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
+index d8210d5fa..4e932f9c7 100644
+--- a/src/events/SDL_touch.c
++++ b/src/events/SDL_touch.c
+@@ -35,6 +35,7 @@ static SDL_Touch **SDL_touchDevices = NULL;
+ #define SYNTHESIZE_TOUCH_TO_MOUSE 1
+ 
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
++static SDL_bool cursor_init = SDL_FALSE;
+ static SDL_bool finger_touching = SDL_FALSE;
+ static SDL_FingerID track_fingerid;
+ static SDL_TouchID  track_touchid;
+@@ -261,6 +262,11 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+         return -1;
+     }
+ 
++    if (!window) {
++        // Fallback to the main application window.
++        window = SDL_GetWindowFromID(1);
++    }
++
+     mouse = SDL_GetMouse();
+ 
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
+@@ -275,6 +281,13 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+             /* FIXME: maybe we should only restrict to a few SDL_TouchDeviceType */
+             if (id != SDL_MOUSE_TOUCHID) {
+                 if (window) {
++                    if (cursor_init == SDL_FALSE) {
++                        // TODO - Initialization hack to reset cursor position to <0, 0>
++                        SDL_SendMouseMotion(window, 0, SDL_TRUE, -window->w, -window->h);
++                        mouse->x = 0; mouse->y = 0;
++                        x = 0.0f; y = 0.0f;
++                        cursor_init = SDL_TRUE;
++                    }
+                     if (down) {
+                         if (finger_touching == SDL_FALSE) {
+                             int pos_x = (int)(x * (float)window->w);
+@@ -283,12 +296,12 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+                             if (pos_x > window->w - 1) pos_x = window->w - 1;
+                             if (pos_y < 0) pos_y = 0;
+                             if (pos_y > window->h - 1) pos_y = window->h - 1;
+-                            SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
+-                            SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
++                            SDL_SendMouseMotion(window, 0, 0, pos_x, pos_y);
++                            SDL_SendMouseButton(window, 0, SDL_PRESSED, SDL_BUTTON_LEFT);
+                         }
+                     } else {
+                         if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
+-                            SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
++                            SDL_SendMouseButton(window, 0, SDL_RELEASED, SDL_BUTTON_LEFT);
+                         }
+                     }
+                 }
+@@ -383,6 +396,11 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+         return -1;
+     }
+ 
++    if (!window) {
++        // Fallback to the main application window.
++        window = SDL_GetWindowFromID(1);
++    }
++
+     mouse = SDL_GetMouse();
+ 
+ #if SYNTHESIZE_TOUCH_TO_MOUSE
+@@ -398,7 +416,7 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid, SDL_Window * window,
+                         if (pos_x > window->w - 1) pos_x = window->w - 1;
+                         if (pos_y < 0) pos_y = 0;
+                         if (pos_y > window->h - 1) pos_y = window->h - 1;
+-                        SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
++                        SDL_SendMouseMotion(window, 0, 0, pos_x, pos_y);
+                     }
+                 }
+             }

packages/graphics/mesa/package.mk

@@ -17,8 +17,8 @@ case ${DEVICE} in
         PKG_GIT_CLONE_BRANCH="csf"
   ;;
   *)
-	PKG_VERSION="23.1.3"
+	PKG_VERSION="23.1.4"
-	PKG_SHA256="2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9"
+	PKG_SHA256="7261a17fb94867e3dc5a90d8a1f100fa04b0cbbde51d25302c0872b5e9a10959"
 	PKG_SITE="http://www.mesa3d.org/"
 	PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
   ;;

packages/hardware/quirks/autostart/020-configs

@@ -4,10 +4,12 @@
 
 . /etc/profile
 
-if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ] && \
+(
-   [ ! -f ".quirkconfigs" ]
+  if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ] && \
-then
+     [ ! -f ".quirkconfigs" ]
-  tocon "Applying ${QUIRK_DEVICE} specific configuration..."
+  then
-  rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null
+    tocon "Applying ${QUIRK_DEVICE} specific configuration..."
-  touch /storage/.quirkconfigs
+    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null
-fi
+    touch /storage/.quirkconfigs
+  fi
+) &

packages/hardware/quirks/devices/Anbernic RG351M/004-game-configs

@@ -13,3 +13,38 @@ if [ ! -d "/storage/.config/gzdoom/" ]; then
   sed -i '/vid_defheight=/c\vid_defheight=320' /storage/.config/gzdoom/gzdoom.ini
   sed -i '/vid_defwidth=/c\vid_defwidth=480' /storage/.config/gzdoom/gzdoom.ini
 fi
+
+#Map ppsspp controls
+if  grep RG351M -q "/stprage/.config/ppsspp/PSP/SYSTEM/controls.ini"
+then
+  exit 1
+else
+cat <<EOF >/storage/.config/ppsspp/PSP/SYSTEM/controls.ini
+#RG351M
+[ControlMapping]
+Up = 10-19
+Down = 10-20
+Left = 10-21
+Right = 10-22
+Circle = 10-189
+Cross = 10-190
+Square = 10-188
+Triangle = 10-191
+Start = 10-197
+Select = 10-196
+L = 10-193
+R = 10-192
+An.Up = 10-4002
+An.Down = 10-4003
+An.Left = 10-4000
+An.Right = 10-4001
+Fast-forward = 1-61
+Pause = 10-106
+Save State = 10-4010
+Load State = 10-4008
+RightAn.Up = 10-4007
+RightAn.Down = 10-4006
+RightAn.Left = 10-4005
+RightAn.Right = 10-4004
+EOF
+fi

packages/hardware/quirks/devices/Anbernic RG353P/005-game-configs

@@ -7,8 +7,8 @@
 #Set up gzdoom
 if [ ! -d "/storage/.config/gzdoom/" ]; then
   cp -rf /usr/config/gzdoom /storage/.config/
-  sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini
+  sed -i '/Joy10=/c\Joy10=togglemap;
-  sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini
+          /Joy9=/c\Joy9=menu_main;
-  sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defheight=/c\vid_defheight=480;
-  sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
 fi

packages/hardware/quirks/devices/Anbernic RG353V/005-game-configs

@@ -7,8 +7,8 @@
 #Set up gzdoom
 if [ ! -d "/storage/.config/gzdoom/" ]; then
   cp -rf /usr/config/gzdoom /storage/.config/
-  sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini
+  sed -i '/Joy10=/c\Joy10=togglemap;
-  sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini
+          /Joy9=/c\Joy9=menu_main;
-  sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defheight=/c\vid_defheight=480;
-  sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
 fi

packages/hardware/quirks/devices/Anbernic RG503/005-game-configs

@@ -5,5 +5,5 @@
 . /etc/profile
 
 #Set gzdoom resolution
-sed -i '/vid_defheight=/c\vid_defheight=544' /storage/.config/gzdoom/gzdoom.ini
+sed -i '/vid_defheight=/c\vid_defheight=544;
-sed -i '/vid_defwidth=/c\vid_defwidth=960' /storage/.config/gzdoom/gzdoom.ini
+        /vid_defwidth=/c\vid_defwidth=960' /storage/.config/gzdoom/gzdoom.ini

packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/004-game-configs

@@ -26,3 +26,40 @@ fi
 #Set gzdoom resolution
 sed -i '/vid_defheight=/c\vid_defheight=320' /storage/.config/gzdoom/gzdoom.ini
 sed -i '/vid_defwidth=/c\vid_defwidth=480' /storage/.config/gzdoom/gzdoom.ini
+
+#Set ppsspp config for OGA
+if [ ! -d "/storage/.config/ppsspp" ]; then
+    mkdir -p "/storage/.config/ppsspp"
+        cp -r "/usr/config/ppsspp" "/storage/.config/"
+fi
+
+#Map ppsspp controls
+if  grep OGABE -q "/storage/.config/ppsspp/PSP/SYSTEM/controls.ini"
+then
+  exit 1
+else
+cat <<EOF >/storage/.config/ppsspp/PSP/SYSTEM/controls.ini
+#OGABE
+[ControlMapping]
+Up = 10-19
+Down = 10-20
+Left = 10-21
+Right = 10-22
+Circle = 10-189
+Cross = 10-190
+Square = 10-188
+Triangle = 10-191
+Start = 10-197
+Select = 10-196
+L = 10-193
+R = 10-192
+An.Up = 10-4003
+An.Down = 10-4002
+An.Left = 10-4001
+An.Right = 10-4000
+Fast-forward = 1-61
+Pause = 10-106
+Save State = 10-4010
+Load State = 10-4008
+EOF
+fi

packages/hardware/quirks/devices/ODROID-GO Super/004-game-configs

@@ -29,3 +29,37 @@ if [ ! -d "/storage/.config/gzdoom/" ]; then
   sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini
   sed -i '/vid_defwidth=/c\vid_defwidth=854' /storage/.config/gzdoom/gzdoom.ini
 fi
+
+#Map ppsspp controls
+if  grep OGS -q "/storage/.config/ppsspp/PSP/SYSTEM/controls.ini"
+then
+  exit 1
+else
+cat <<EOF >/storage/.config/ppsspp/PSP/SYSTEM/controls.ini
+#OGS
+[ControlMapping]
+Up = 10-19
+Down = 10-20
+Left = 10-21
+Right = 10-22
+Circle = 10-189
+Cross = 10-190
+Square = 10-188
+Triangle = 10-191
+Start = 10-197
+Select = 10-196
+L = 10-193
+R = 10-192
+An.Up = 10-4003
+An.Down = 10-4002
+An.Left = 10-4001
+An.Right = 10-4000
+Pause = 10-106
+Save State = 10-4010
+Load State = 10-4008
+RightAn.Up = 10-4007
+RightAn.Down = 10-4006
+RightAn.Left = 10-4005
+RightAn.Right = 10-4004
+EOF
+fi

packages/hardware/quirks/devices/Powkiddy RK2023/005-game-configs

@@ -7,8 +7,8 @@
 #Set up gzdoom
 if [ ! -d "/storage/.config/gzdoom/" ]; then
   cp -rf /usr/config/gzdoom /storage/.config/
-  sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini
+  sed -i '/Joy10=/c\Joy10=togglemap;
-  sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini
+          /Joy9=/c\Joy9=menu_main;
-  sed -i '/vid_defheight=/c\vid_defheight=480' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defheight=/c\vid_defheight=480;
-  sed -i '/vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defwidth=/c\vid_defwidth=640' /storage/.config/gzdoom/gzdoom.ini
 fi

packages/hardware/quirks/devices/Powkiddy x55/002-hdmi

@@ -0,0 +1,36 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+hdmi_con() {
+  if [ -f "/sys/class/extcon/hdmi/state" ]
+  then
+    HDMI="$(cat /sys/class/extcon/hdmi/state)"
+    if [ "${HDMI}" = "HDMI=1" ]
+    then
+      if [ -f "/sys/devices/virtual/graphics/fbcon/rotate" ]
+      then
+        echo 0 >/sys/devices/virtual/graphics/fbcon/rotate
+      fi
+    fi
+  fi
+}
+
+###
+### Test for an HDMI connection and if there is none, configure the system to use
+### a rotation patched SDL2.
+cat <<EOF >/storage/.config/profile.d/006-hdmi
+HDMI="\$(cat /sys/class/extcon/hdmi/state)"
+if [ ! "\${HDMI}" = "HDMI=1" ]
+then
+  SDL=\$(readlink -f /usr/lib/SDL2-rotated/libSDL2.so 2>/dev/null)
+  export LD_PRELOAD="\${SDL}"
+fi
+EOF
+
+chmod 0755 /storage/.config/profile.d/006-hdmi
+
+### If hdmi is connected, set the framebuffer rotation back to normal.
+hdmi_con

packages/hardware/quirks/devices/Powkiddy x55/005-game-configs

@@ -7,8 +7,8 @@
 #Set up gzdoom
 if [ ! -d "/storage/.config/gzdoom/" ]; then
   cp -rf /usr/config/gzdoom /storage/.config/
-  sed -i '/Joy10=/c\Joy10=togglemap' /storage/.config/gzdoom/gzdoom.ini
+  sed -i '/Joy10=/c\Joy10=togglemap;
-  sed -i '/Joy9=/c\Joy9=menu_main' /storage/.config/gzdoom/gzdoom.ini
+          /Joy9=/c\Joy9=menu_main;
-  sed -i '/vid_defheight=/c\vid_defheight=720' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defheight=/c\vid_defheight=720;
-  sed -i '/vid_defwidth=/c\vid_defwidth=1280' /storage/.config/gzdoom/gzdoom.ini
+          /vid_defwidth=/c\vid_defwidth=1280' /storage/.config/gzdoom/gzdoom.ini
 fi

packages/jelos/autostart/006-display

@@ -4,7 +4,7 @@
 
 . /etc/profile
 
-tocon "Configuring backlight..."
+tocon "Configuring display..."
 
 ### Variables may need to be device specific here.
 BRIGHTNESS=$(get_setting system.brightness)
@@ -30,3 +30,15 @@ then
   printf "%.0f" $(echo "${BRIGHTNESS}") > /sys/class/backlight/${BRIGHTNESS_DEVICE}/brightness
 fi
 
+### Set the aspect ratio in ES.
+ASPECT=$(get_aspect_ratio)
+
+ES_CONFIG="/storage/.config/emulationstation/es_settings.cfg"
+ES_ASPECT="${ASPECT/:/-}"
+if [ "$(grep subset.aspect-ratio ${ES_CONFIG})" ]
+then
+  sed -i 's|<string name="subset.aspect-ratio".*$|<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>|g' ${ES_CONFIG}
+else
+  sed -i '/<\/config>/i \\t<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>' ${ES_CONFIG}
+fi
+

packages/jelos/autostart/010-uimode

@@ -4,7 +4,7 @@
 
 . /etc/profile
 
-tocon "Preparing the user interface..."
+tocon "Configuring user interface..."
 
 UIMODE=$(get_setting desktop.enabled)
 if [ "${UIMODE}" = "1" ] || \

packages/jelos/profile.d/02-distribution

@@ -12,7 +12,7 @@ J_CONF="${J_DIR}/configs/system.cfg"
 ES_CONF="/storage/.emulationstation/es_settings.cfg"
 JSLISTENCONF="${J_DIR}/configs/jslisten.cfg"
 
-get_setting() {
+function get_setting() {
   if [ ! -z "${3}" ]
   then
     ### Test to see if we have a game setting.
@@ -55,14 +55,14 @@ get_setting() {
   return
 }
 
-del_setting() {
+function del_setting() {
   if [[ "${1}" =~ ^[[:alnum:]] ]]
   then
     sed -i "/^${1}=/d" "${J_CONF}"
   fi
 }
 
-set_setting() {
+function set_setting() {
   if [[ "${1}" =~ ^[[:alnum:]] ]]
   then
     del_setting "${1}"
@@ -73,7 +73,7 @@ set_setting() {
   fi
 }
 
-set_audio() {
+function set_audio() {
   case ${1} in
   "default")
     AUDIO="alsa"
@@ -85,19 +85,45 @@ set_audio() {
   /usr/bin/rr_audio.sh ${AUDIO}
 }
 
-battery_percent() {
+function battery_percent() {
   awk 'BEGIN {FS="="} /POWER_SUPPLY_CAPACITY=/ {print $2}' /sys/class/power_supply/[Bb][Aa][Tt]*/uevent 2>/dev/null
 }
 
-get_es_setting() {
+function get_es_setting() {
   echo $(sed -n "s|\s*<${1} name=\"${2}\" value=\"\(.*\)\" />|\1|p" ${ES_CONF})
 }
 
-tocon() {
+function get_aspect_ratio() {
+  FBWIDTH=$(fbset | awk '/geometry/ {print $2}')
+  FBHEIGHT=$(fbset | awk '/geometry/ {print $3}')
+
+  ASPECT=$(printf "%.2f" $(echo "(${FBWIDTH} / ${FBHEIGHT})" | bc -l))
+
+  case ${ASPECT} in
+    1.50|0.67)
+      ASPECT="3:2"
+    ;;
+    1.33|0.75)
+      ASPECT="4:3"
+    ;;
+    1.67|0.60)
+      ASPECT="5:3"
+    ;;
+    1.7*|0.56)
+      ASPECT="16:9"
+    ;;
+    1.60|0.62)
+      ASPECT="16:10"
+    ;;
+  esac
+  echo ${ASPECT}
+}
+
+function tocon() {
   echo -ne "\033[1000H\033[2K==> ${*}" >/dev/console
 }
 
-log() {
+function log() {
   SOURCE=${1//\/*\//}
   MESSAGE=${*#${1}}
   MESSAGE=${MESSAGE# }

packages/jelos/sources/post-update

@@ -35,59 +35,6 @@ rsync -a --delete ${EXCLUDE} /usr/config/system/ /storage/.config/system/
 rsync -a --ignore-existing /usr/config/game /storage/.config/
 rsync -a /usr/config/modules /storage/.config/
 
-echo "Update logo..." >>${LOG}
-FBWIDTH=$(fbset | awk '/geometry/ {print $2}')
-FBHEIGHT=$(fbset | awk '/geometry/ {print $3}')
-
-ASPECT=$(printf "%.2f" $(echo "(${FBWIDTH} / ${FBHEIGHT})" | bc -l))
-
-case ${ASPECT} in
-  1.50|0.67)
-   ASPECT="3:2"
-  ;;
-  1.33|0.75)
-   ASPECT="4:3"
-  ;;
-  1.67|0.60)
-   ASPECT="5:3"
-  ;;
-  1.76|0.56)
-   ASPECT="16:9"
-  ;;
-  1.6|0.62)
-   ASPECT="16:10"
-  ;;
-esac
-
-### Set the aspect ratio in ES.
-ES_CONFIG="/storage/.config/emulationstation/es_settings.cfg"
-ES_ASPECT="${ASPECT/:/-}"
-if [ "$(grep subset.aspect-ratio ${ES_CONFIG})" ]
-then
-  sed -i 's|<string name="subset.aspect-ratio".*$|<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>|g' ${ES_CONFIG}
-else
-  sed -i '/<\/config>/i \\t<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>' ${ES_CONFIG}
-fi
-
-if [ -f "/storage/.config/emulationstation/resources/logo.png" ]
-then
-  rm -f /storage/.config/emulationstation/resources/logo.png ||:
-fi
-
-convert /usr/config/splash/splash.png \
-        -gravity center \
-        -crop ${ASPECT} +repage \
-        /tmp/.logo.png
-
-convert /tmp/.logo.png \
-        -quality 100 \
-        -resize ${FBWIDTH}x${FBHEIGHT} \
-        -background black \
-        -gravity center \
-        /storage/.config/emulationstation/resources/logo.png
-
-rm -f /tmp/.logo.png
-
 echo "Sync modules..." >>${LOG}
 rsync -a /usr/config/modules/* /storage/.config/modules/
 cp -f /usr/config/retroarch/retroarch-core-options.cfg /storage/.config/retroarch/retroarch-core-options.cfg

packages/jelos/sources/scripts/setrootpass

@@ -26,7 +26,9 @@ set_setting root.password "${ROOTPASS}"
 
 # Restart syncthing if it was enabled.
 SYNCSTATUS=$(get_setting syncthing.enabled)
-if [ "${SYNCSTATUS}" = "1" ]
+SYNCACTIVE=$(systemctl status syncthing | awk '/active/ {print $2}')
+if [ "${SYNCSTATUS}" = "1" ] &&
+   [ "${SYNCACTIVE}" = "active" ]
 then
   systemctl restart syncthing >/dev/null 2>&1
 fi

packages/jelos/sources/scripts/setsettings.sh

@@ -304,6 +304,30 @@ function match() {
 ### Game data functions
 ###
 
+### Configure retroarch paths
+function set_retroarch_paths() {
+  for RETROARCH_PATH in assets_directory cache_directory            \
+                        cheat_database_path content_database_path   \
+                        content_database_path joypad_autoconfig_dir \
+                        libretro_directory libretro_info_path       \
+                        overlay_directory video_shader_dir
+  do
+    clear_setting "${RETROARCH_PATH}"
+  done
+  flush_settings
+  cat <<EOF >>${RETROARCH_CONFIG}
+assets_directory = "/tmp/assets"
+cache_directory = "/tmp/cache"
+cheat_database_path = "/tmp/database/cht"
+content_database_path = "/tmp/database/rdb"
+joypad_autoconfig_dir = "/tmp/joypads"
+libretro_directory = "/tmp/cores"
+libretro_info_path = "/tmp/cores"
+overlay_directory = "/tmp/overlays"
+video_shader_dir = "/tmp/shaders"
+EOF
+}
+
 ### Configure retroarch hotkeys
 function configure_hotkeys() {
     log "Configure hotkeys..."
@@ -540,6 +564,10 @@ function set_autosave() {
         [1-3])
             log "Autosave enabled (${CHKAUTOSAVE})"
             add_setting "none" "savestate_directory" "${SNAPSHOTS}/${PLATFORM}"
+            if [ ! -d "${SNAPSHOTS}/${PLATFORM}" ]
+            then
+                mkdir "${SNAPSHOTS}/${PLATFORM}"
+            fi
             case ${AUTOSAVE} in
                 1)
                     log "Autosave active (${AUTOSAVE})"
@@ -744,6 +772,7 @@ function set_controllers() {
 ### Functions that cannot be parallelized
 ###
 
+set_retroarch_paths
 configure_hotkeys
 
 ###

packages/kernel/linux/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.4.4"
+PKG_VERSION="6.4.5"
 PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_SITE="http://www.kernel.org"
 PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host"

packages/network/bluez/autostart/009-bluetooth

@@ -2,13 +2,15 @@
 
 . /etc/profile
 
-if [ "$(get_setting bluetooth.enabled)" == "1" ]
+(
-then
+  if [ "$(get_setting bluetooth.enabled)" == "1" ]
-  tocon "Starting bluetooth..."
+  then
-  nohup systemctl start bluetooth &
+    tocon "Starting bluetooth..."
-  nohup systemctl start bluetooth-agent &
+    nohup systemctl start bluetooth &
-  nohup systemctl start bluetoothsense &
+    nohup systemctl start bluetooth-agent &
-  rfkill unblock bluetooth
+    nohup systemctl start bluetoothsense &
-else
+    rfkill unblock bluetooth
-  rfkill block bluetooth
+  else
-fi
+    rfkill block bluetooth
+  fi
+) &

packages/network/wireguard-tools/autostart/098-wireguard

@@ -4,8 +4,10 @@
 
 . /etc/profile
 
-if [ "$(get_setting wireguard.up)" == "1" ]
+(
-then
+  if [ "$(get_setting wireguard.up)" == "1" ]
-  tocon "Enabling wireguard..."
+  then
-  nohup wg-quick up /storage/.config/wireguard/wg0.conf &
+    tocon "Enabling wireguard..."
-fi
+    nohup wg-quick up /storage/.config/wireguard/wg0.conf &
+  fi
+) &

packages/sysutils/autostart/sources/autostart

@@ -33,6 +33,20 @@ do
   log "Run ${script}"
   ${script} 2>&1 >>${BOOTLOG}
 done
+wait
+
+### Run device start scripts
+if [ -d "/usr/lib/autostart/${HW_DEVICE}" ]
+then
+  for script in "/usr/lib/autostart/${HW_DEVICE}"/*
+  do
+    log "Run ${script}"
+    if [ -f "${script}" ]
+    then
+      "${script}" 2>&1 >>${BOOTLOG}
+    fi
+  done
+fi
 
 ### Run custom start scripts
 if [ -d "/storage/.config/autostart" ]
@@ -43,9 +57,10 @@ then
    ${script} 2>&1 >>${BOOTLOG}
   done
 fi
+wait
 
+tocon "Starting user interface..."
 log "Startup complete..."
-tocon "Startup complete..."
 
 clear >/dev/console
 

packages/sysutils/busybox/scripts/init

@@ -443,6 +443,20 @@ set_consolefont() {
   fi
 }
 
+hdmi_con() {
+  if [ -f "/sys/class/extcon/hdmi/state" ]
+  then
+    HDMI="$(cat /sys/class/extcon/hdmi/state)"
+    if [ "${HDMI}" = "HDMI=1" ]
+    then
+      if [ -f "/sys/devices/virtual/graphics/fbcon/rotate" ]
+      then
+        echo 0 >/sys/devices/virtual/graphics/fbcon/rotate
+      fi
+    fi
+  fi
+}
+
 load_splash() {
   clear >/dev/console
   echo -en "\033[1000H\033[2K$(cat /sysroot/etc/issue)\n\n" >/dev/console
@@ -737,6 +751,8 @@ check_update() {
     return 0
   fi
 
+  hdmi_con
+
   echo "${UPDATE_TAR} ${UPDATE_IMG} ${UPDATE_IMG_GZ}" 2>&1 | grep @DISTRONAME@ 2>&1 >/dev/null
   if [ "$?" -ne "0" ]
   then

packages/sysutils/ryzenadj/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="ryzenadj"
-PKG_VERSION="f6fbf9d17f70d9736bc8294ccd8438ae94804aa9"
+PKG_VERSION="7201ff25533698bfe3c402a87d479e02358bd929"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FlyGoat/RyzenAdj"
 PKG_URL="${PKG_SITE}.git"

packages/sysutils/systemd/scripts/userconfig-setup

@@ -36,59 +36,6 @@ then
       ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg}  >/dev/null 2>&1
     done
 
-    ### Configure the ES splash to the distribution splash
-    FBWIDTH=$(fbset | awk '/geometry/ {print $2}')
-    FBHEIGHT=$(fbset | awk '/geometry/ {print $3}')
-
-    ASPECT=$(printf "%.2f" $(echo "(${FBWIDTH} / ${FBHEIGHT})" | bc -l))
-
-    case ${ASPECT} in
-      1.50|0.67)
-        ASPECT="3:2"
-      ;;
-      1.33|0.75)
-        ASPECT="4:3"
-      ;;
-      1.67|0.60)
-        ASPECT="5:3"
-      ;;
-      1.76|0.56)
-        ASPECT="16:9"
-      ;;
-      1.6|0.62)
-        ASPECT="16:10"
-      ;;
-    esac
-
-    ### Set the aspect ratio in ES.
-    ES_CONFIG="/storage/.config/emulationstation/es_settings.cfg"
-    ES_ASPECT="${ASPECT/:/-}"
-    if [ "$(grep subset.aspect-ratio ${ES_CONFIG})" ]
-    then
-      sed -i 's|<string name="subset.aspect-ratio".*$|<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>|g' ${ES_CONFIG}
-    else
-      sed -i '/<\/config>/i \\t<string name="subset.aspect-ratio" value="'${ES_ASPECT}'"/>' ${ES_CONFIG}
-    fi
-
-    if [ -f "/storage/.config/emulationstation/resources/logo.png" ]
-    then
-      rm -f /storage/.config/emulationstation/resources/logo.png ||:
-    fi
-
-    convert /usr/config/splash/splash.png \
-            -gravity center \
-            -crop ${ASPECT} +repage \
-            /tmp/.logo.png 2>/dev/null
-
-    convert /tmp/.logo.png \
-            -quality 100 \
-            -resize ${FBWIDTH}x${FBHEIGHT} \
-            -background black \
-            -gravity center \
-            /storage/.config/emulationstation/resources/logo.png 2>/dev/null
-
-    rm -f /tmp/.logo.png
-
   fi
   mkdir -p /storage/.config/modprobe.d  >/dev/null 2>&1
   touch /storage/.configured  >/dev/null 2>&1

packages/themes/es-theme-art-book-next/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2021 Fewtarius
 
 PKG_NAME="es-theme-art-book-next"
-PKG_VERSION="28e21fda755e45be6701f56f78d2416282f5711c"
+PKG_VERSION="b231911544d89ead18e00c03670a336676d89147"
 PKG_ARCH="any"
 PKG_LICENSE="CUSTOM"
 PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

packages/ui/emulationstation/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="ef52409"
+PKG_VERSION="1d085bc"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"

packages/ui/emulationstation/sources/es_settings

@@ -44,3 +44,5 @@ then
   systemctl import-environment LANGUAGE
 fi
 
+systemctl import-environment LD_PRELOAD
+

packages/ui/emulationstation/sources/start_es.sh

@@ -44,4 +44,4 @@ then
   systemctl import-environment LANGUAGE
 fi
 
-emulationstation --log-path /var/log
+emulationstation --log-path /var/log --no-splash

packages/ui/emulationstation/system.d/emustation.service

@@ -6,7 +6,7 @@ ConditionPathExists=/var/lock/start.games
 Environment=HOME=/storage
 Environment=SDL_AUDIODRIVER=alsa
 ExecStartPre=/usr/bin/es_settings
-ExecStart=/usr/bin/emulationstation --log-path /var/log
+ExecStart=/usr/bin/emulationstation --log-path /var/log --no-splash
 KillMode=process
 TimeoutStopSec=3
 Restart=always

packages/virtual/arm/package.mk

@@ -27,10 +27,4 @@ if [ "${DISPLAYSERVER}" = "wl" ]; then
 fi
 
 ### Emulators and Cores
-PKG_DEPENDS_TARGET+=" retroarch pcsx_rearmed-lr gpsp-lr flycast-lr box86"
+PKG_DEPENDS_TARGET+=" retroarch pcsx_rearmed-lr gpsp-lr flycast-lr box86 desmume-lr"
-
-case "${DEVICE}" in
-  RK3399)
-    PKG_DEPENDS_TARGET+=" desmume-lr"
-  ;;
-esac

packages/virtual/emulators/package.mk

@@ -38,7 +38,7 @@ case "${DEVICE}" in
                       minivmac-lr play-lr"
   ;;
   RK358*)
-    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr gpsp-lr pcsx_rearmed-lr"
+    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr flycast-lr gpsp-lr pcsx_rearmed-lr"
     PKG_EMUS+=" amiberry aethersx2-sa duckstation-sa pcsx_rearmed-lr box64 scummvmsa yabasanshiro-sa box64 portmaster"
     LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-hd-lr citra-lr dolphin-lr mame-lr"
     PKG_RETROARCH+=" retropie-shaders"
@@ -51,7 +51,7 @@ case "${DEVICE}" in
     PKG_RETROARCH+=" retropie-shaders"
   ;;
   RK356*)
-    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr gpsp-lr pcsx_rearmed-lr"
+    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr flycast-lr gpsp-lr pcsx_rearmed-lr"
     PKG_DEPENDS_TARGET+=" common-shaders duckstation-sa glsl-shaders mupen64plus-sa scummvmsa box64 portmaster"
     PKG_EMUS+=" amiberry dolphin-sa drastic-sa yabasanshiro-sa"
     LIBRETRO_CORES+=" uae4arm"
@@ -65,7 +65,7 @@ case "${DEVICE}" in
     PKG_RETROARCH+=" retropie-shaders"
   ;;
   RK3326*)
-    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="flycast-lr gpsp-lr pcsx_rearmed-lr"
+    [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="flycast-lr desmume-lr gpsp-lr pcsx_rearmed-lr"
     PKG_DEPENDS_TARGET+=" common-shaders glsl-shaders"
     PKG_EMUS+=" amiberry drastic-sa mupen64plus-sa scummvmsa yabasanshiro-sa portmaster"
     LIBRETRO_CORES+=" uae4arm flycast-lr"
@@ -406,13 +406,21 @@ makeinstall_target() {
 
   ### Nintendo GameCube
   case ${DEVICE} in
-    AMD64|RK358*|RK356*|S922X*|RK3399)
+    AMD64|RK356*|S922X*|RK3399)
       add_emu_core gamecube dolphin dolphin-sa-gc true
-      add_emu_core gamecube primehack primehack false
+    ;;
+  esac
+  case ${DEVICE} in
+    AMD64|RK358*|RK356*|S922X*|RK3399)
       add_emu_core gamecube retroarch dolphin false
       add_es_system gamecube
     ;;
   esac
+  case ${DEVICE} in
+    AMD64)
+      add_emu_core gamecube primehack primehack false
+    ;;
+  esac
 
   ### Nintendo Wii
   case ${DEVICE} in
@@ -585,6 +593,11 @@ makeinstall_target() {
       add_emu_core nds melonds melonds-sa false
       add_emu_core nds retroarch desmume false
     ;;
+    RK3*)
+      add_emu_core nds drastic drastic-sa true
+      add_emu_core nds retroarch melonds false
+      add_emu_core nds retroarch desmume false
+    ;;
     *)
       add_emu_core nds drastic drastic-sa true
       add_emu_core nds retroarch melonds false

projects/Amlogic/packages/linux/package.mk

@@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"
 
 case ${DEVICE} in
   S922X*)
-    PKG_VERSION="6.1.39"
+    PKG_VERSION="6.1.40"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
   ;;
 esac

projects/PC/devices/AMD64/linux/linux.x86_64.conf

@@ -11372,7 +11372,7 @@ CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y
 CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
-CONFIG_IO_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
 
 #
 # x86 Debugging

projects/Rockchip/devices/RK3566-X55/options

@@ -64,7 +64,7 @@
     WINDOWMANAGER="no"
 
   # kernel serial console
-    EXTRA_CMDLINE="quiet rootwait console=ttyUSB0,1500000 fbcon=rotate:3 console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 video=HDMI-A-1:1280x720@60"
+    EXTRA_CMDLINE="quiet rootwait console=ttyUSB0,1500000 fbcon=rotate:3 console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20"
 
   # additional packages to install
   #  ADDITIONAL_PACKAGES=""

projects/Rockchip/packages/linux/package.mk

@@ -32,12 +32,12 @@ case ${DEVICE} in
   ;;
   *X55)
     PKG_URL="${PKG_SITE}/rk3566-x55-kernel.git"
-    PKG_VERSION="cd572b258"
+    PKG_VERSION="a514c4665"
     GET_HANDLER_SUPPORT="git"
     PKG_GIT_CLONE_BRANCH="main"
   ;;
   RK33*)
-    PKG_VERSION="6.1.39"
+    PKG_VERSION="6.1.40"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
   ;;
 esac

projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch

@@ -1,6 +1,6 @@
 diff -rupN linux.orig/Makefile linux/Makefile
 --- linux.orig/Makefile	2023-06-23 03:53:37.552116029 +0000
-+++ linux/Makefile	2023-07-02 20:04:12.325801424 +0000
++++ linux/Makefile	2023-07-22 17:35:56.978930533 +0000
 @@ -826,6 +826,8 @@ KBUILD_CFLAGS	+= $(call cc-disable-warni
  KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)
  KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)
@@ -21,7 +21,7 @@ diff -rupN linux.orig/Makefile linux/Makefile
  KBUILD_CFLAGS   += $(call cc-option,-Werror=designated-init)
 diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile
 --- linux.orig/arch/arm64/boot/dts/rockchip/Makefile	2023-06-23 03:53:36.244094795 +0000
-+++ linux/arch/arm64/boot/dts/rockchip/Makefile	2023-07-02 20:04:12.325801424 +0000
++++ linux/arch/arm64/boot/dts/rockchip/Makefile	2023-07-22 17:35:53.854832289 +0000
 @@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-or
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinephone-pro.dtb
@@ -32,8 +32,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
 diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts
 --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts	1970-01-01 00:00:00.000000000 +0000
-+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts	2023-07-19 13:58:38.063475368 +0000
++++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts	2023-07-22 22:08:08.804900015 +0000
-@@ -0,0 +1,1358 @@
+@@ -0,0 +1,1353 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -64,11 +64,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
 +		stdout-path = "serial2:1500000n8";
 +	};
 +
-+	memory {
-+		device_type = "memory";
-+		reg = <0x0 0x00200000 0x0 0xf7e00000>;
-+	};
-+
 +	volume-keys {
 +		compatible = "gpio-keys";
 +		autorepeat;
@@ -1394,7 +1389,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-linux.dts linux/
 +};
 diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi
 --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi	1970-01-01 00:00:00.000000000 +0000
-+++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi	2023-07-19 19:22:18.903393789 +0000
++++ linux/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi	2023-07-22 17:35:53.870832792 +0000
 @@ -0,0 +1,141 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
@@ -1539,7 +1534,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-rg552-opp.dtsi linux/a
 +};
 diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockchip.c
 --- linux.orig/drivers/gpio/gpio-rockchip.c	2023-07-16 19:38:02.962868756 +0000
-+++ linux/drivers/gpio/gpio-rockchip.c	2023-07-16 19:38:30.783741586 +0000
++++ linux/drivers/gpio/gpio-rockchip.c	2023-07-22 17:35:57.766955315 +0000
 @@ -335,13 +335,13 @@ static void rockchip_irq_demux(struct ir
  	unsigned long pending;
  	unsigned int irq;
@@ -1558,7 +1553,7 @@ diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockc
  		 * Triggering IRQ on both rising and falling edge
 diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig
 --- linux.orig/drivers/gpu/drm/panel/Kconfig	2023-06-23 03:53:39.968155272 +0000
-+++ linux/drivers/gpu/drm/panel/Kconfig	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/gpu/drm/panel/Kconfig	2023-07-22 17:35:58.626982361 +0000
 @@ -588,6 +588,15 @@ config DRM_PANEL_SHARP_LS043T1LE01
  	  Say Y here if you want to enable support for Sharp LS043T1LE01 qHD
  	  (540x960) DSI panel as found on the Qualcomm APQ8074 Dragonboard
@@ -1577,7 +1572,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/
  	depends on OF
 diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile
 --- linux.orig/drivers/gpu/drm/panel/Makefile	2023-06-23 03:53:39.968155272 +0000
-+++ linux/drivers/gpu/drm/panel/Makefile	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/gpu/drm/panel/Makefile	2023-07-22 17:35:58.626982361 +0000
 @@ -59,6 +59,7 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) +=
  obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
  obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
@@ -1588,7 +1583,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel
  obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o
 diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c
 --- linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c	2023-07-22 17:35:58.626982361 +0000
 @@ -0,0 +1,368 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +/*
@@ -1960,7 +1955,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv
 +MODULE_LICENSE("GPL v2");
 diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
 --- linux.orig/drivers/input/Kconfig	2023-06-23 03:53:40.600165543 +0000
-+++ linux/drivers/input/Kconfig	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/Kconfig	2023-07-22 17:35:58.778987141 +0000
 @@ -51,6 +51,19 @@ config INPUT_FF_MEMLESS
  	  To compile this driver as a module, choose M here: the
  	  module will be called ff-memless.
@@ -1983,7 +1978,7 @@ diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig
  	help
 diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
 --- linux.orig/drivers/input/Makefile	2023-06-23 03:53:40.600165543 +0000
-+++ linux/drivers/input/Makefile	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/Makefile	2023-07-22 17:35:58.810988147 +0000
 @@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i
  input-core-y += touchscreen.o
  
@@ -1994,7 +1989,7 @@ diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile
  obj-$(CONFIG_INPUT_VIVALDIFMAP)	+= vivaldi-fmap.o
 diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-polldev.c
 --- linux.orig/drivers/input/input-polldev.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux/drivers/input/input-polldev.c	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/input-polldev.c	2023-07-22 17:35:58.810988147 +0000
 @@ -0,0 +1,362 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +/*
@@ -2360,7 +2355,7 @@ diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-po
 +EXPORT_SYMBOL(input_unregister_polled_device);
 diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystick/Kconfig
 --- linux.orig/drivers/input/joystick/Kconfig	2023-06-23 03:53:40.604165608 +0000
-+++ linux/drivers/input/joystick/Kconfig	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/joystick/Kconfig	2023-07-22 17:35:58.782987267 +0000
 @@ -393,6 +393,12 @@ config JOYSTICK_FSIA6B
  	  To compile this driver as a module, choose M here: the
  	  module will be called fsia6b.
@@ -2376,7 +2371,7 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic
  	depends on MACH_NINTENDO64
 diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile
 --- linux.orig/drivers/input/joystick/Makefile	2023-06-23 03:53:40.604165608 +0000
-+++ linux/drivers/input/joystick/Makefile	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/joystick/Makefile	2023-07-22 17:35:58.782987267 +0000
 @@ -30,6 +30,7 @@ obj-$(CONFIG_JOYSTICK_PXRC)		+= pxrc.o
  obj-$(CONFIG_JOYSTICK_QWIIC)		+= qwiic-joystick.o
  obj-$(CONFIG_JOYSTICK_SENSEHAT)	+= sensehat-joystick.o
@@ -2387,7 +2382,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti
  obj-$(CONFIG_JOYSTICK_STINGER)		+= stinger.o
 diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/joystick/singleadcjoy.c
 --- linux.orig/drivers/input/joystick/singleadcjoy.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux/drivers/input/joystick/singleadcjoy.c	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/input/joystick/singleadcjoy.c	2023-07-22 17:35:58.782987267 +0000
 @@ -0,0 +1,1416 @@
 +/*----------------------------------------------------------------------------*/
 +
@@ -3807,7 +3802,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/
 +module_exit(joypad_exit);
 diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/touchscreen/goodix.c
 --- linux.orig/drivers/input/touchscreen/goodix.c	2023-06-23 03:53:40.656166453 +0000
-+++ linux/drivers/input/touchscreen/goodix.c	2023-07-17 06:09:30.498252404 +0000
++++ linux/drivers/input/touchscreen/goodix.c	2023-07-22 17:35:58.806988021 +0000
 @@ -1010,7 +1010,7 @@ retry_get_irq_gpio:
  	default:
  		if (ts->gpiod_int && ts->gpiod_rst) {
@@ -3819,7 +3814,7 @@ diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/tou
  	}
 diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/supply/cw2015_battery.c
 --- linux.orig/drivers/power/supply/cw2015_battery.c	2023-06-23 03:53:42.860202281 +0000
-+++ linux/drivers/power/supply/cw2015_battery.c	2023-07-02 20:04:12.325801424 +0000
++++ linux/drivers/power/supply/cw2015_battery.c	2023-07-22 17:35:59.927023244 +0000
 @@ -553,7 +553,7 @@ static enum power_supply_property cw_bat
  };
  
@@ -3831,7 +3826,7 @@ diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/
  	.num_properties	= ARRAY_SIZE(cw_battery_properties),
 diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-polldev.h
 --- linux.orig/include/linux/input-polldev.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux/include/linux/input-polldev.h	2023-07-02 20:04:12.325801424 +0000
++++ linux/include/linux/input-polldev.h	2023-07-22 17:35:57.254939213 +0000
 @@ -0,0 +1,58 @@
 +/* SPDX-License-Identifier: GPL-2.0-only */
 +#ifndef _INPUT_POLLDEV_H