Merge pull request #2201 from JustEnoughLinuxOS/dev

PR for release

.gitignore

@@ -49,6 +49,9 @@
 # system document cache
 .doc_cache/
 
+# tmp space
+.tmp/
+
 # release images
 release/
 

Dockerfile

@@ -1,6 +1,7 @@
 FROM ubuntu:jammy
 
 ARG DEBIAN_FRONTEND=noninteractive
+SHELL ["/usr/bin/bash", "-c"]
 
 RUN apt-get update \
  && apt-get dist-upgrade -y \
@@ -18,9 +19,14 @@ RUN adduser --disabled-password --gecos '' docker \
 
 RUN apt-get install -y \
     bc default-jre file gawk gcc git golang-go gperf libjson-perl libncurses5-dev \
-    libparse-yapp-perl libxml-parser-perl lzop make patchutils python-is-python3 \
+    libparse-yapp-perl libxml-parser-perl lzop make patchutils python-is-python3  \
     python3 parted unzip wget curl xfonts-utils xsltproc zip zstd
 
+### Cross compiling on ARM
+RUN if [ "$(uname -m)" = "aarch64" ]; then apt-get install -y --no-install-recommends qemu-user-binfmt libc6-dev-amd64-cross; fi
+RUN if [ ! -d /lib64 ]; then ln -sf /usr/x86_64-linux-gnu/lib64 /lib64; fi
+RUN if [ ! -d /lib/x86_64-linux-gnu ]; then ln -sf /usr/x86_64-linux-gnu/lib /lib/x86_64-linux-gnu; fi
+
 RUN mkdir -p /work && chown docker /work
 
 WORKDIR /work

Makefile

@@ -101,7 +101,8 @@ docker-%: PWD := $(shell pwd)
 docker-%: DOCKER_CMD:= $(shell if which docker 2>/dev/null 1>/dev/null; then echo "docker"; elif which podman 2>/dev/null 1>/dev/null; then echo "podman"; fi)
 
 # Podman requires some extra args (`--userns=keep-id` and `--security-opt=label=disable`).  Set those args if using podman
-docker-%: PODMAN_ARGS:= $(shell if ! which docker 2>/dev/null 1>/dev/null && which podman 2> /dev/null 1> /dev/null; then echo "--userns=keep-id --security-opt=label=disable -v /proc/mounts:/etc/mtab"; fi)
+#   Make sure that docker isn't just an alias for podman
+docker-%: PODMAN_ARGS:= $(shell if echo "$$(docker --version 2>/dev/null || podman --version 2>/dev/null )" | grep podman 1>/dev/null ; then echo "--userns=keep-id --security-opt=label=disable -v /proc/mounts:/etc/mtab"; fi)
 
 # Launch docker as interactive if this is an interactive shell (allows ctrl-c for manual and running non-interactive - aka: build server)
 docker-%: INTERACTIVE=$(shell [ -t 0 ] && echo "-it")

config/emulators/gameandwatch.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="gameandwatch"
-SYSTEM_FULLNAME="Game and Watch"
+SYSTEM_FULLNAME="Game & Watch"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="1980"
 SYSTEM_HARDWARE="portable"

config/emulators/gamecube.conf

@@ -1,4 +1,5 @@
 SYSTEM_NAME="gamecube"
+SYSTEM_FULLNAME="GameCube"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="2001"
 SYSTEM_HARDWARE="console"
@@ -7,4 +8,3 @@ SYSTEM_EXTENSION=".gcm .iso .gcz .ciso .wbfs .rvz .dol"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="gc"
 SYSTEM_THEME="gc"
-SYSTEM_FULLNAME="GameCube"

config/emulators/megacd.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="megacd"
-SYSTEM_FULLNAME="Mega-CD"
+SYSTEM_FULLNAME="Mega CD"
 SYSTEM_MANUFACTURER="Sega"
 SYSTEM_RELEASE="1991"
 SYSTEM_HARDWARE="console"

config/emulators/mplayer.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="mplayer"
-SYSTEM_FULLNAME="MPlayer"
+SYSTEM_FULLNAME="Media Player"
 SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="unknown"
 SYSTEM_HARDWARE="system"

config/emulators/msx2.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="msx2"
-SYSTEM_FULLNAME="MSX2"
+SYSTEM_FULLNAME="MSX 2"
 SYSTEM_MANUFACTURER="Microsoft"
 SYSTEM_RELEASE="1988"
 SYSTEM_HARDWARE="computer"

config/emulators/n64.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="n64"
-SYSTEM_FULLNAME="N64"
+SYSTEM_FULLNAME="Nintendo 64"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="1996"
 SYSTEM_HARDWARE="console"

config/emulators/nds.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="nds"
-SYSTEM_FULLNAME="DS"
+SYSTEM_FULLNAME="Nintendo DS"
 SYSTEM_PATH="/storage/roms/nds"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="2005"

config/emulators/nes.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="nes"
-SYSTEM_FULLNAME="NES"
+SYSTEM_FULLNAME="Nintendo Entertainment System"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="1985"
 SYSTEM_HARDWARE="console"

config/emulators/odyssey2.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="odyssey2"
-SYSTEM_FULLNAME="Odyssey"
+SYSTEM_FULLNAME="Odyssey 2"
 SYSTEM_MANUFACTURER="Magnavox"
 SYSTEM_RELEASE="1979"
 SYSTEM_HARDWARE="console"

config/emulators/ps3.conf

@@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Sony"
 SYSTEM_RELEASE="2006"
 SYSTEM_HARDWARE="console"
 SYSTEM_PATH="/storage/roms/ps3"
-SYSTEM_EXTENSION=".ps3 .bin"
+SYSTEM_EXTENSION=".ps3 .psn"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="ps3"
 SYSTEM_THEME="ps3"

config/emulators/sega32x.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="sega32x"
-SYSTEM_FULLNAME="32X"
+SYSTEM_FULLNAME="Sega 32X"
 SYSTEM_MANUFACTURER="Sega"
 SYSTEM_RELEASE="1994"
 SYSTEM_HARDWARE="console"

config/emulators/segacd.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="segacd"
-SYSTEM_FULLNAME="CD"
+SYSTEM_FULLNAME="Sega CD"
 SYSTEM_MANUFACTURER="Sega"
 SYSTEM_RELEASE="1991"
 SYSTEM_HARDWARE="console"

config/emulators/supergrafx.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="supergrafx"
-SYSTEM_FULLNAME="Super Grafx"
+SYSTEM_FULLNAME="SuperGrafx"
 SYSTEM_MANUFACTURER="NEC"
 SYSTEM_RELEASE="1989"
 SYSTEM_HARDWARE="console"

config/emulators/switch.conf

@@ -1,4 +1,5 @@
 SYSTEM_NAME="switch"
+SYSTEM_FULLNAME="Switch"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="2017"
 SYSTEM_HARDWARE="console"
@@ -7,4 +8,3 @@ SYSTEM_EXTENSION=".xci .nsp .nca .nso .nro"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="switch"
 SYSTEM_THEME="switch"
-SYSTEM_FULLNAME="Switch"

config/emulators/wii.conf

@@ -1,4 +1,5 @@
 SYSTEM_NAME="wii"
+SYSTEM_FULLNAME="Wii"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="2006"
 SYSTEM_HARDWARE="console"
@@ -7,4 +8,3 @@ SYSTEM_EXTENSION=".gcm .iso .gcz .ciso .wbfs .rvz .dol .wad"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="wii"
 SYSTEM_THEME="wii"
-SYSTEM_FULLNAME="Wii"

config/emulators/wiiu.conf

@@ -1,4 +1,5 @@
 SYSTEM_NAME="wiiu"
+SYSTEM_FULLNAME="Wii U"
 SYSTEM_MANUFACTURER="Nintendo"
 SYSTEM_RELEASE="2012"
 SYSTEM_HARDWARE="console"
@@ -7,4 +8,3 @@ SYSTEM_EXTENSION=".wud .wux .wua"
 SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\""
 SYSTEM_PLATFORM="wiiu"
 SYSTEM_THEME="wiiu"
-SYSTEM_FULLNAME="Wii U"

config/emulators/zmachine.conf

@@ -1,5 +1,5 @@
 SYSTEM_NAME="zmachine"
-SYSTEM_FULLNAME="Z-Machine"
+SYSTEM_FULLNAME="Z-machine"
 SYSTEM_MANUFACTURER="Infocom"
 SYSTEM_RELEASE="1979"
 SYSTEM_HARDWARE="game engine"

documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md

@@ -37,35 +37,34 @@ This document describes all available systems emulators and cores available for
 |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)<br>|
 |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)<br>|
 |id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech<br>|
-|Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
+|Infocom|Z-machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)<br>|
+|JELOS|Media Player (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
 |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh||
-|JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)<br>|
 |JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)<br>|
 |JELOS|Ports (ports)|2021|`ports`|.sh||
 |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi||
 |JELOS|Tools (tools)|2021|`modules`|.sh||
 |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)<br>**retroarch:** fake08<br>|
-|Magnavox|Odyssey (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
+|Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)<br>|
 |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure<br>**retroarch:** dosbox_svn<br>|
 |Microsoft|MSX (msx)|1983|`msx`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<br>|
-|Microsoft|MSX2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<br>|
+|Microsoft|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<br>|
 |Microsoft|Xbox (xbox)|2001|`xbox`|.iso|**xemu:** xemu-sa (default)<br>|
 |Milton Bradley|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |NEC|PC Engine (pcengine)|1987|`pcengine`|.pce .bin .zip .7z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|PC Engine CD (pcenginecd)|1988|`pcenginecd`|.cue .ccd .chd .toc .m3u|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|PC-8800 (pc-8800)|1981|`pc88`|.d88 .m3u|**retroarch:** quasi88 (default)<br>|
 |NEC|PC-9800 (pc-9800)|1983|`pc98`|.d98 .zip .fdi .fdd .2hd .tfd .d88d .hdm .xdf .dup .hdi .thd .nhd .hdd .hdn|**retroarch:** np2kai (default)<br>|
 |NEC|PC-FX (pcfx)|1994|`pcfx`|.chd .cue .ccd .toc|**retroarch:** beetle_pcfx (default)<br>|
-|NEC|Super Grafx (supergrafx)|1989|`sgfx`|.pce .sgx .cue .ccd .chd .zip .7z|**retroarch:** beetle_supergrafx<br>**retroarch:** beetle_pce<br>|
+|NEC|SuperGrafx (supergrafx)|1989|`sgfx`|.pce .sgx .cue .ccd .chd .zip .7z|**retroarch:** beetle_supergrafx<br>**retroarch:** beetle_pce<br>|
 |NEC|TurboGrafx-16 (tg16)|1989|`tg16`|.pce .bin .zip .7z|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |NEC|TurboGrafx-CD (tg16cd)|1989|`tg16cd`|.cue .ccd .chd .toc .m3u|**retroarch:** beetle_pce_fast (default)<br>**retroarch:** beetle_pce<br>**retroarch:** beetle_supergrafx<br>|
 |Nesbox|TIC-80 (tic-80)|2017|`tic-80`|.tic|**retroarch:** tic80 (default)<br>|
 |Nintendo|3DS (3ds)|2010|`3ds`|.3ds .3dsx .elf .axf .cci .cxi .app|**retroarch:** citra (default)<br>**citra:** citra-sa<br>|
-|Nintendo|DS (nds)|2005|`nds`|.nds .zip .7z|**retroarch:** melonds (default)<br>**retroarch:** desmume<br>**melonds:** melonds-sa<br>|
 |Nintendo|Famicom (famicom)|1983|`famicom`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Famicom Disk System (fds)|1986|`fds`|.fds .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>|
-|Nintendo|Game and Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
+|Nintendo|Game &amp; Watch (gameandwatch)|1980|`gameandwatch`|.mgw .zip .7z|**retroarch:** gw<br>|
 |Nintendo|Game Boy (gb)|1989|`gb`|.gb .gbc .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy (Hacks) (gbh)|1989|`gbh`|.gb .zip .7z|**retroarch:** gambatte (default)<br>**retroarch:** sameboy<br>**retroarch:** gearboy<br>**retroarch:** tgbdual<br>**retroarch:** mgba<br>**retroarch:** vbam<br>|
 |Nintendo|Game Boy Advance (gba)|2001|`gba`|.gba .zip .7z|**retroarch:** mgba (default)<br>**retroarch:** gbsp<br>**retroarch:** vbam<br>**retroarch:** vba_next<br>**retroarch:** beetle_gba<br>**nanoboyadvance:** nanoboyadvance-sa<br>|
@@ -74,9 +73,10 @@ This document describes all available systems emulators and cores available for
 |Nintendo|Game Boy Color (Hacks) (gbch)|1998|`gbch`|.gb .gbc .zip .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 .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>**primehack:** primehack<br>|
 |Nintendo|MSU-1 (snesmsu1)|2012|`snesmsu1`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** beetle_supafaust<br>|
-|Nintendo|N64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
-|Nintendo|NES (nes)|1985|`nes`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
+|Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
+|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**retroarch:** melonds (default)<br>**retroarch:** desmume<br>**melonds:** melonds-sa<br>|
+|Nintendo|Nintendo Entertainment System (nes)|1985|`nes`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>|
 |Nintendo|Pokémon Mini (pokemini)|2001|`pokemini`|.min .zip .7z|**retroarch:** pokemini (default)<br>|
 |Nintendo|Satellaview (satellaview)|1995|`satellaview`|.smc .fig .bs .sfc .bsx .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>|
 |Nintendo|Super Famicom (sfc)|1990|`sfc`|.smc .fig .sfc .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>**retroarch:** beetle_supafaust<br>**retroarch:** bsnes<br>**retroarch:** bsnes_mercury_performance<br>**retroarch:** bsnes_hd_beta<br>|
@@ -89,19 +89,19 @@ This document describes all available systems emulators and cores available for
 |Panasonic|3DO (3do)|1993|`3do`|.iso .bin .chd .cue|**retroarch:** opera (default)<br>|
 |Philips|VideoPac (videopac)|1978|`videopac`|.bin .zip .7z|**retroarch:** o2em (default)<br>|
 |Sammy|Atomiswave (atomiswave)|2003|`atomiswave`|.lst .bin .dat .zip .7z|**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
-|Sega|32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)<br>|
-|Sega|CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
 |Sega|Dreamcast (dreamcast)|1998|`dreamcast`|.cdi .gdi .chd .m3u|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
 |Sega|Game Gear (gamegear)|1990|`gamegear`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
 |Sega|Game Gear (Hacks) (ggh)|1990|`gamegearh`|.bin .gg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
 |Sega|Genesis (genesis)|1989|`genesis`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
 |Sega|Genesis (Hacks) (genh)|1989|`genh`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
 |Sega|Master System (mastersystem)|1985|`mastersystem`|.bin .sms .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>**retroarch:** smsplus<br>|
+|Sega|Mega CD (megacd)|1991|`megacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
 |Sega|Mega Drive (megadrive)|1990|`megadrive`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
 |Sega|Mega Drive (megadrive-japan)|1988|`megadrive-japan`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** genesis_plus_gx_wide<br>**retroarch:** picodrive<br>|
-|Sega|Mega-CD (megacd)|1991|`megacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
 |Sega|Naomi (naomi)|1998|`naomi`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021<br>**retroarch:** flycast (default)<br>**flycast:** flycast-sa<br>|
 |Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**retroarch:** yabasanshiro (default)<br>**retroarch:** beetle_saturn<br>|
+|Sega|Sega 32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)<br>|
+|Sega|Sega CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)<br>**retroarch:** picodrive<br>|
 |Sega|SG-1000 (sg-1000)|1983|`sg-1000`|.bin .sg .zip .7z|**retroarch:** gearsystem (default)<br>**retroarch:** genesis_plus_gx<br>**retroarch:** picodrive<br>|
 |Sharp|X1 (x1)|1982|`x1`|.dx1 .2d .2hd .tfd .d88d .hdm .xdf .dup .tap .cmd .zip .7z|**retroarch:** x1 (default)<br>|
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
@@ -113,7 +113,7 @@ This document describes all available systems emulators and cores available for
 |SNK|Neo Geo Pocket Color (ngpc)|1999|`ngpc`|.ngc .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |Sony|PlayStation (psx)|1994|`psx`|.bin .cue .img .mdf .pbp .toc .cbn .m3u .ccd .chd .iso|**retroarch:** beetle_psx (default)<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
 |Sony|PlayStation 2 (ps2)|2000|`ps2`|.iso .mdf .nrg .bin .img .dump .gz .cso .chd|**pcsx2:** pcsx2-sa (default)<br>**retroarch:** pcsx2<br>|
-|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .bin|**rpcs3:** rpcs3-sa (default)<br>|
+|Sony|PlayStation 3 (ps3)|2006|`ps3`|.ps3 .psn|**rpcs3:** rpcs3-sa (default)<br>|
 |Sony|PlayStation Portable (psp)|2004|`psp`|.iso .cso .pbp .chd|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sony|PlayStation Vita (psvita)|2011|`launcher`|.sh|**vita3k:** vita3k-sa (default)<br>|
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|