Merge pull request #386 from JustEnoughLinuxOS/dev

PR for release

BUILDING.md

@@ -105,7 +105,7 @@ sudo apt install gcc make git unzip wget \
                 xmlstarlet patchutils gawk gperf xfonts-utils default-jre python xsltproc libjson-perl \
                 lzop libncurses5-dev device-tree-compiler u-boot-tools rsync p7zip libparse-yapp-perl \
                 zip binutils-aarch64-linux-gnu dos2unix p7zip-full libvpx-dev bsdmainutils bc meson p7zip-full \
-                qemu-user-binfmt zstd parted
+                qemu-user-binfmt zstd parted imagemagick
 ```
 
 Next, build the version of JELOS for your device.  See the table above for dependencies.  If you're building for the RG351V, RG351P will be built first to provide the build root dependency.  To execute a build, run `make {device}`

Dockerfile

@@ -10,7 +10,7 @@ RUN apt update  \
       xmlstarlet patchutils gawk gperf xfonts-utils default-jre python3 python-is-python3 xsltproc libjson-perl \
       lzop libncurses5-dev device-tree-compiler u-boot-tools rsync p7zip libparse-yapp-perl \
       zip binutils-aarch64-linux-gnu dos2unix p7zip-full libvpx-dev bsdmainutils bc meson p7zip-full \
-      qemu-user-binfmt zstd parted \
+      qemu-user-binfmt zstd parted imagemagick \
       && apt autoremove --purge -y \
       && apt clean -y \
       && rm -rf /var/lib/apt/lists/*

config/blocklist

@@ -2,4 +2,3 @@ np2kai # Last major commit before hiatus is broken
 vicesa # Doesn't support updating with the script.
 hatari # Broken include - need to fix
 duckstationsa # Latest commits break device patching. Need to research.
-dosbox-pure # Latest segfaults, need to investigate.

packages/games/emulators/PPSSPPSDL/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 # Copyright (C) 2022-present Fewtarius
 PKG_NAME="PPSSPPSDL"
-PKG_VERSION="190f503565d17f03f9ca51ce2fa644ce27cd3e25"
+PKG_VERSION="d11640a070d7516b6a4660a0543dd9ee285e0d53"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/emulators/amiberry/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="amiberry"
 PKG_ARCH="arm aarch64"
-PKG_VERSION="aa0da258fc0a61c85014dfa70225ff25d7b4a119"
+PKG_VERSION="bd47107842453368024b4a76530159e64bd30ab8"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/midwan/amiberry"
 PKG_URL="${PKG_SITE}.git"

packages/games/emulators/duckstationsa/config/settings.ini

@@ -1,6 +1,26 @@
 [Main]
 SettingsVersion = 3
 StartFullscreen = true
+EmulationSpeed = 1.000000
+FastForwardSpeed = 0.000000
+TurboSpeed = 0.000000
+SyncToHostRefreshRate = true
+IncreaseTimerResolution = true
+InhibitScreensaver = true
+StartPaused = false
+PauseOnFocusLoss = false
+PauseOnMenu = true
+SaveStateOnExit = true
+ConfirmPowerOff = true
+LoadDevicesFromSaveStates = false
+ApplyGameSettings = true
+AutoLoadCheats = true
+DisableAllEnhancements = false
+RewindEnable = false
+RewindFrequency = 10.000000
+RewindSaveSlots = 10
+RunaheadFrameCount = 0
+
 
 [BIOS]
 SearchDirectory = /storage/roms/bios
@@ -8,16 +28,67 @@ PathNTSCU =
 PathNTSCJ = 
 PathPAL = 
 PatchTTYEnable = false
-PatchFastBoot = false
+PatchFastBoot = true
+
 
 [GPU]
 Renderer = Software
+Adapter = 
+ResolutionScale = 1
+Multisamples = 1
+UseDebugDevice = false
+PerSampleShading = false
+UseThread = false
+ThreadedPresentation = true
+UseSoftwareRendererForReadbacks = false
+TrueColor = false
+ScaledDithering = false
+TextureFilter = Nearest
+DownsampleMode = Disabled
+DisableInterlacing = false
+ForceNTSCTimings = false
+WidescreenHack = false
+ChromaSmoothing24Bit = false
+PGXPEnable = false
+PGXPCulling = true
+PGXPTextureCorrection = true
+PGXPVertexCache = false
+PGXPCPU = false
+PGXPPreserveProjFP = false
+PGXPTolerance = -1.000000
+PGXPDepthBuffer = false
+PGXPDepthClearThreshold = 300.000000
+
 
 [Display]
 Rotate = 1
+CropMode = Overscan
+ActiveStartOffset = 0
+ActiveEndOffset = 0
+LineStartOffset = 0
+LineEndOffset = 0
+Force4_3For24Bit = false
+AspectRatio = 4:3
+CustomAspectRatioNumerator = 4
+LinearFiltering = true
+IntegerScaling = false
+Stretch = false
+PostProcessing = false
+ShowOSDMessages = true
+ShowFPS = false
+ShowVPS = false
+ShowSpeed = false
+ShowResolution = false
+ShowStatusIndicators = true
+ShowEnhancements = false
+DisplayAllFrames = true
+VSync = false
+MaxFPS = 0.000000
+
 
 [Hotkeys]
 
+
 [Logging]
 LogLevel = Error
 LogFilter = 
@@ -26,8 +97,9 @@ LogToDebug = false
 LogToWindow = false
 LogToFile = false
 
+
 [Controller1]
-Type = DigitalController
+Type = AnalogController
 ButtonUp = Controller0/Button11
 ButtonDown = Controller0/Button12
 ButtonLeft = Controller0/Button13
@@ -50,9 +122,109 @@ AxisRightX = Controller0/Axis2
 AxisRightY = Controller0/Axis3
 AnalogDPadInDigitalMode = false
 
+
 [GameList]
 RecursivePaths = /storage/roms/psx
 
+
 [MemoryCards]
 UsePlaylistTitle = true
 Directory = /storage/roms/psx
+Card1Type = PerGameTitle
+Card2Type = None
+
+
+[Console]
+Region = Auto
+Enable8MBRAM = false
+
+
+[CPU]
+ExecutionMode = Recompiler
+OverclockEnable = false
+OverclockNumerator = 1
+OverclockDenominator = 1
+RecompilerMemoryExceptions = false
+RecompilerBlockLinking = true
+RecompilerICache = false
+FastmemMode = MMap
+
+
+[CDROM]
+ReadaheadSectors = 8
+RegionCheck = false
+LoadImageToRAM = false
+MuteCDAudio = false
+ReadSpeedup = 1
+SeekSpeedup = 1
+
+
+[Audio]
+Backend = SDL
+OutputVolume = 100
+FastForwardVolume = 100
+BufferSize = 2048
+Resampling = true
+OutputMuted = false
+Sync = true
+DumpOnBoot = false
+
+
+[Hacks]
+DMAMaxSliceTicks = 1000
+DMAHaltTicks = 100
+GPUFIFOSize = 16
+GPUMaxRunAhead = 128
+
+
+[Controller2]
+Type = None
+
+
+[Controller3]
+Type = None
+
+
+[Controller4]
+Type = None
+
+
+[Controller5]
+Type = None
+
+
+[Controller6]
+Type = None
+
+
+[Controller7]
+Type = None
+
+
+[Controller8]
+Type = None
+
+
+[ControllerPorts]
+MultitapMode = Disabled
+
+
+[Debug]
+ShowVRAM = false
+DumpCPUToVRAMCopies = false
+DumpVRAMToCPUCopies = false
+ShowGPUState = false
+ShowCDROMState = false
+ShowSPUState = false
+ShowTimersState = false
+ShowMDECState = false
+ShowDMAState = false
+
+
+[TextureReplacements]
+EnableVRAMWriteReplacements = false
+PreloadTextures = false
+DumpVRAMWrites = false
+DumpVRAMWriteForceAlphaChannel = true
+DumpVRAMWriteWidthThreshold = 128
+DumpVRAMWriteHeightThreshold = 128

packages/games/emulators/duckstationsa/patches/duckstationsa-patch-007-inhibit-vulkan.patch

@@ -0,0 +1,17 @@
+diff --git a/src/duckstation-nogui/nogui_host_interface.cpp b/src/duckstation-nogui/nogui_host_interface.cpp
+index a8e4ddf2..eda7baa3 100644
+--- a/src/duckstation-nogui/nogui_host_interface.cpp
++++ b/src/duckstation-nogui/nogui_host_interface.cpp
+@@ -105,10 +105,10 @@ bool NoGUIHostInterface::CreateDisplay(bool fullscreen)
+   Assert(!m_display);
+   switch (g_settings.gpu_renderer)
+   {
+-    case GPURenderer::HardwareVulkan:
++/*    case GPURenderer::HardwareVulkan:
+       m_display = std::make_unique<FrontendCommon::VulkanHostDisplay>();
+       break;
+-
++*/
+     case GPURenderer::HardwareOpenGL:
+ #ifndef _WIN32
+     default:

packages/games/emulators/gzdoom/sources/start_gzdoom.sh

@@ -11,13 +11,11 @@ RUN_DIR="/storage/roms/doom"
 CONFIG="/storage/.config/game/gzdoom/gzdoom.ini"
 SAVE_DIR="/storage/roms/gamedata/gzdoom"
 
-if [ ! -L "/storage/.config/gzdoom" ]
-then
+if [ ! -L "/storage/.config/gzdoom" ]; then
   ln -sf "/storage/.config/game/gzdoom" "/storage/.config/gzdoom"
 fi
 
-if [ ! -f "/storage/.config/game/gzdoom/gzdoom.ini" ]
-then
+if [ ! -f "/storage/.config/game/gzdoom/gzdoom.ini" ]; then
   cp -rf /usr/config/game/gzdoom/gzdoom.ini /storage/.config/game/gzdoom/
 fi
 
@@ -27,7 +25,7 @@ params=" -config ${CONFIG} -savedir ${SAVE_DIR}"
 params+=" +gl_es 1 +vid_preferbackend 3 +cl_capfps 0 +vid_fps 1"
 
 # EXT can be wad, WAD, iwad, IWAD, pwad, PWAD or doom
-EXT=${1#*.}
+EXT=${1##*.}
 
 # If its not a simple wad (extension .doom) read the file and parse the data
 if [ ${EXT} == "doom" ]; then
@@ -45,4 +43,4 @@ else
 fi
 
 cd "${RUN_DIR}"
-/usr/bin/gzdoom ${params} >/var/log/gzdoom.log 2>&1
+echo ${params} | xargs /usr/bin/gzdoom >/var/log/gzdoom.log 2>&1

packages/games/emulators/hatarisa/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
 
 PKG_NAME="hatarisa"
-PKG_VERSION="4371dcd647fc85d31c0629400adaeaa4212040d9"
-PKG_SHA256="0d483c75eeed5c0fe99fa2ce42c441379d437d4f5103754f705c8a37f02e7c7e"
+PKG_VERSION="e81c9addd39898e2897056b2bc3fd6908afabf9e"
+PKG_SHA256="d3dc44ea719695be0bce2646ca4a431470b2008b7f9ed4c243b2f867a432996c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"

packages/games/emulators/hypseus-singe/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="hypseus-singe"
-PKG_VERSION="bb839ebb784265758bd7473d59111efe190fdc89"
+PKG_VERSION="9d20d5f92ab612ac7596da05b991d89333679ae5"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL3"

packages/games/emulators/lzdoom/sources/start_lzdoom.sh

@@ -11,13 +11,11 @@ RUN_DIR="/storage/roms/doom"
 CONFIG="/storage/.config/game/lzdoom/lzdoom.ini"
 SAVE_DIR="/storage/roms/gamedata/lzdoom"
 
-if [ ! -L "/storage/.config/lzdoom" ]
-then
+if [ ! -L "/storage/.config/lzdoom" ]; then
   ln -sf "/storage/.config/game/lzdoom" "/storage/.config/lzdoom"
 fi
 
-if [ ! -f "/storage/.config/game/lzdoom/lzdoom.ini" ]
-then
+if [ ! -f "/storage/.config/game/lzdoom/lzdoom.ini" ]; then
   cp -rf /usr/config/game/lzdoom/lzdoom.ini /storage/.config/game/lzdoom/
 fi
 
@@ -27,7 +25,7 @@ params=" -config ${CONFIG} -savedir ${SAVE_DIR}"
 params+=" -width 1152 -height 1920 +vid_fps 1 +cl_capfps 0 +vid_renderer 0 +vid_glswfb 0"
 
 # EXT can be wad, WAD, iwad, IWAD, pwad, PWAD or doom
-EXT=${1#*.}
+EXT=${1##*.}
 
 # If its not a simple wad (extension .doom) read the file and parse the data
 if [ ${EXT} == "doom" ]; then
@@ -45,4 +43,4 @@ else
 fi
 
 cd "${RUN_DIR}"
-/usr/bin/lzdoom ${params} >/var/log/lzdoom.log 2>&1
+echo ${params} | xargs /usr/bin/lzdoom >/var/log/lzdoom.log 2>&1

packages/games/emulators/mupen64plussa/mupen64plussa-video-gliden64/package.mk

@@ -2,13 +2,11 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 
 PKG_NAME="mupen64plussa-video-gliden64"
-PKG_VERSION="Public_Release_4_0"
-#PKG_VERSION="github-actions"
-PKG_SHA256="6b379cf109433527155b479d67a32c903bf074003907bea26de224a573501af6"
+PKG_VERSION="2973f5351b6326ca588b60521522df34ed7a426e"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/gonetz/GLideN64"
-PKG_URL="https://github.com/gonetz/GLideN64/archive/refs/tags/${PKG_VERSION}.tar.gz"
+PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain boost libpng SDL2 SDL2_net zlib freetype nasm:host mupen64plussa-core"
 PKG_SHORTDESC="mupen64plus-video-gliden64"
 PKG_LONGDESC="Mupen64Plus Standalone GLide64 Video Driver"

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="pico-8"
-PKG_VERSION="a76086bd3ad4d18da3a2dd8283d3bac4783df388"
+PKG_VERSION="49e2ffa6372739a1661e1a92d6d9684ae1e423f3"
 PKG_SHA256=""
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/emulators/raze/config/common/games/_Scan Build Engine Games.sh

@@ -36,6 +36,13 @@ for i in "${!SUPPORTED_GRP[@]}"; do
 	find_names+=("${SUPPORTED_GRP[$i]}")
 done
 grp_files=$(find "${BUILDENGINEPATH}" -mindepth 1 -type f \( "${find_names[@]}" \))
+# This is a hack that ensures any expansion GRP file gets written out as a
+# build file last. For example, VACATION.GRP is an expansion for DUKE3D.GRP.
+# For the expansion to work, both GRP files must be present, but the expansion
+# GRP must be passed to the Raze engine. It just so happens that all of the
+# expansion GRP files are named alphabetically later than base game GRP files,
+# meaning we can get by with a simple lexical sort before processing.
+grp_files=$(echo "${grp_files}" | sort)
 echo "Adding games..." >/dev/console
 while read -r grp_file; do
 	abs_path=$(dirname "${grp_file}")

packages/games/emulators/raze/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="raze"
-PKG_VERSION="7f18e9c54946ce98a5ed2dd485f5250d82ede323"
+PKG_VERSION="1c0c41e88d5521fbdf5cd5ae1eb2f7de073036ab"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/coelckers/Raze"
 PKG_URL="${PKG_SITE}.git"

packages/games/emulators/raze/sources/start_raze.sh

@@ -24,7 +24,7 @@ mkdir -p ${SAVE_DIR}
 params=" -config ${CONFIG} -savedir ${SAVE_DIR}"
 params+=" +gl_es 1 +vid_preferbackend 3 +cl_capfps 0 +cl_nomeleeblur 1 +vid_fps 1"
 
-EXT=${1#*.}
+EXT=${1##*.}
 
 if [ ${EXT} == "build" ]; then
   dos2unix "${1}"

packages/games/emulators/retroarch/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
 
 PKG_NAME="retroarch"
-PKG_VERSION="4b7be8de3fca295c2dc18b3f8ea6d473dbd7ffaa"
+PKG_VERSION="e1a139ec0f26aed87c1ff9042e733e2c4b1df39b"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"

packages/games/emulators/scummvmsa/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="scummvmsa"
-PKG_VERSION="b3d0813300f5e5d7f8a575b6e1e3b26bfbbaf304"
-PKG_SHA256="e6d047c1eafba6324b1574f8cf476c181a48ea43c8a9d692c178888e06b3512b"
+PKG_VERSION="f492ace2f0c11fb504a47a02201ea3f359be8251"
+PKG_SHA256="2c10b80eaa9347ae6b3e4de4fc9285206170d402adb149fbdb6ca094da3a2183"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"

packages/games/libretro/dosbox-pure/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure"
-PKG_VERSION="cab2031ed21dbbc1cc04dcd1243fb1b978c79914"
+PKG_VERSION="6f2ded6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/libretro/dosbox-pure/patches/01-revert-svga-memory-core-option.patch

@@ -0,0 +1,62 @@
+diff --git a/core_options.h b/core_options.h
+index a00b36a..7e6b4db 100644
+--- a/core_options.h
++++ b/core_options.h
+@@ -409,21 +409,6 @@ static retro_core_option_v2_definition option_defs[] =
+ 		},
+ 		"svga_s3"
+ 	},
+-	{
+-		"dosbox_pure_svgamem",
+-		"SVGA Memory (restart required)", NULL,
+-		"The amount of memory available to the emulated SVGA card.", NULL,
+-		"Video",
+-		{
+-			{ "0",  "512KB" },
+-			{ "1", "1MB" },
+-			{ "2", "2MB (default)" },
+-			{ "3", "3MB" },
+-			{ "4", "4MB" },
+-			{ "8", "8MB (not always recognized)" },
+-		},
+-		"2"
+-	},
+ 	{
+ 		"dosbox_pure_voodoo",
+ 		"3dfx Voodoo Emulation", NULL,
+diff --git a/dosbox_pure_libretro.cpp b/dosbox_pure_libretro.cpp
+index c51753a..9c4f405 100644
+--- a/dosbox_pure_libretro.cpp
++++ b/dosbox_pure_libretro.cpp
+@@ -3556,7 +3556,6 @@ static bool check_variables(bool is_startup = false)
+ 		case 'p': dbmachine = "pcjr"; break;
+ 	}
+ 	Variables::DosBoxSet("dosbox", "machine", dbmachine, false, true);
+-	Variables::DosBoxSet("dosbox", "vmemsize", retro_get_variable("dosbox_pure_svgamem", "2"), false, true);
+ 	if (dbp_reboot_machine)
+ 		control->GetSection("dosbox")->GetProp("machine")->OnChangedByConfigProgram(), dbp_reboot_machine = 0;
+ 
+@@ -3640,7 +3639,6 @@ static bool check_variables(bool is_startup = false)
+ 	}
+ 
+ 	Variables::RetroVisibility("dosbox_pure_svga", machine_is_svga);
+-	Variables::RetroVisibility("dosbox_pure_svgamem", machine_is_svga);
+ 	Variables::RetroVisibility("dosbox_pure_voodoo", machine_is_svga);
+ 	Variables::RetroVisibility("dosbox_pure_voodoo_perf", machine_is_svga);
+ 	if (machine_is_svga)
+diff --git a/src/hardware/vga_s3.cpp b/src/hardware/vga_s3.cpp
+index 06eafe7..ac82258 100644
+--- a/src/hardware/vga_s3.cpp
++++ b/src/hardware/vga_s3.cpp
+@@ -546,11 +546,6 @@ void SVGA_Setup_S3Trio(void) {
+ 	} else if (vga.vmemsize < 4096*1024)	{
+ 		vga.vmemsize = 3072*1024;
+ 		vga.s3.reg_36 = 0x5a;		// 3mb fast page mode
+-#ifdef C_DBP_LIBRETRO
+-	} else if (vga.vmemsize == 8192*1024)	{ // hack more mem than supported by real Trio64 card
+-		vga.vmemsize = 8192*1024;
+-		vga.s3.reg_36 = 0x7a;		// 8mb fast page mode
+-#endif
+ 	} else {	// Trio64 supported only up to 4M
+ 		vga.vmemsize = 4096*1024;
+ 		vga.s3.reg_36 = 0x1a;		// 4mb fast page mode

packages/games/libretro/fbneo/package.mk

@@ -3,8 +3,8 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
 
 PKG_NAME="fbneo"
-PKG_VERSION="78fc08a6a03bc7d6de50ce58a17a2f1f6e986edb"
-PKG_SHA256="008de4d233b525189113207f772f686662ecaa4c171a80992c17d3108351b034"
+PKG_VERSION="fabeca6640f84520e68399d8b4329dda8be839cb"
+PKG_SHA256="c065247d484575389aed63525f62aa77f3c3a1ba55fb61378854986a22734c5a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/games/libretro/genesis-plus-gx-wide/package.mk

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-wide"
-PKG_VERSION="85c258f1d5656795071ddcb18c46fa01511998be"
-PKG_SHA256="1f46f7913141d06b76f5183250f9f918b84720232c4451b4447ed447aabc85a7"
+PKG_VERSION="bd8f1a765d54452095bd701e6b03759b1fa221a3"
+PKG_SHA256="48edde44b89d417d5a6f8bee793c43e1b54f94fcda1985ab62adb3af8f5c2a3c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/games/libretro/genesis-plus-gx/package.mk

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx"
-PKG_VERSION="ad92df802d02ffba132c77ea573439b8614ae408"
-PKG_SHA256="be8f23cb054d6fbc98007f64b7032d3e84258626bd149fedb915a72c7a00caa9"
+PKG_VERSION="9f407e830e41f4cbddf55af275008b64b98d6b68"
+PKG_SHA256="8fc49b6efd2248c6cf57d2553e5b9ae2884daf9888b0957d08854f6e5f33017c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

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

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="9ef0d56875b62bdc16e6dc82619a7389a9b25eb1"
-PKG_SHA256="9fe52c7ecc92d38ba2a0d63e5779c0b47ecbae34b4f3ab4a1568cef579696d07"
+PKG_VERSION="4a158a091cc8db9cf0e664b84bb0c9e86e13668f"
+PKG_SHA256="d51ed92a358c2d03e7979447f3248cf421af587b4d49b119ea8593c5c842ae63"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/games/libretro/mame/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019 Trond Haugland (trondah@gmail.com)
 
 PKG_NAME="mame"
-PKG_VERSION="fdb7edfb0d142ddb93aa558daa6a771a40fe1c4e"
-PKG_SHA256="4cf932879e107b8cd3b4649894a7d3c1d49f970dc8f6d82c1aa43020e1ea4962"
+PKG_VERSION="08be808a3b1957d07c5d5e43d26e60818feb3738"
+PKG_SHA256="4193d38bec5110d42ce3720b0d3d5be381382c425f18d377ddbb9e3d47fbff5d"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mame"

packages/games/libretro/mame/patches/mame-missing-include.patch

@@ -1,11 +0,0 @@
-diff -rupN mame.orig/src/lib/netlist/plib/ppmf.h mame/src/lib/netlist/plib/ppmf.h
---- mame.orig/src/lib/netlist/plib/ppmf.h	2022-07-04 11:02:16.563354243 -0400
-+++ mame/src/lib/netlist/plib/ppmf.h	2022-07-04 11:03:01.483272032 -0400
-@@ -81,6 +81,7 @@ namespace plib {
- #include "ptypes.h"
- 
- #include <algorithm>
-+#include <cstddef> // ptrdiff_t
- #include <cstdint> // uintptr_t
- #include <type_traits>
- #include <utility>

packages/games/libretro/mame2003-plus/package.mk

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus"
-PKG_VERSION="55c1297356510537cbeb126c9ca013357d085b44"
-PKG_SHA256="d968c6c202febb0f66c5d4099aa239d3d2a1e24dc56c86f4f0f29d33e0d5bf7b"
+PKG_VERSION="0e52288cb2a75b8c4cbd96d58c0f36b043f70156"
+PKG_SHA256="9976960465e95a63df0ff6cf24cdd29da153e543abbb07caaf9d227185d3986a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"

packages/games/libretro/mesen/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="mesen"
-PKG_VERSION="a03ff76e33d77e695a70c42c8c47dc84d7a161ac"
-PKG_SHA256="a6af9093bd0713d2eaa9cf92be51861eca9a29bc98c27925f4aa442a1199a8b7"
+PKG_VERSION="4026a25a993d5536d4aad135c24738eaf9f0f7eb"
+PKG_SHA256="52d9ea2ceb3d9f8a2c12509fae145877ec1736b72895fda9b01862923c30cb67"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/Mesen"

packages/games/libretro/ppsspp/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp"
-PKG_VERSION="190f503565d17f03f9ca51ce2fa644ce27cd3e25"
+PKG_VERSION="d11640a070d7516b6a4660a0543dd9ee285e0d53"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"

packages/games/libretro/px68k/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="px68k"
-PKG_VERSION="0183381d655be213d9c27207e1a29ad372a7a16d"
-PKG_SHA256="9f26706569d8c9711565cf23a6f5f5683e262f48d8a8e8820514bda0e9680cd9"
+PKG_VERSION="12332c0f51f1468759380433b78dde87ab763d7d"
+PKG_SHA256="e0517a84f3f9a7df8cdebeb1d0e31e602ed8962cd5373d3083c9ef7efc5c0610"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Unknown"

packages/games/libretro/sameboy/package.mk

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="sameboy"
-PKG_VERSION="2b91bec122cbea0edd2ee4effaf993a053a84b24"
-PKG_SHA256="27e02b20d3b351bee129313ec7212857ff005cb57f30dc7322dc021bf4ac7822"
+PKG_VERSION="09138330990da32362246c7034cf4de2ea0a2a2b"
+PKG_SHA256="9ef470c7c6bee83bbeb1e861a1c76b722d78de5e5a3849e7132d03d40fa8828d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"

packages/games/tools/doomscan/package.mk

@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2022-present travis134
+
+PKG_NAME="doomscan"
+PKG_VERSION="3bba0abe4dd13c7c77f6d5e355a8e70ee650720a"
+PKG_ARCH="any"
+PKG_SITE="https://github.com/travis134/doomscan"
+PKG_URL="${PKG_SITE}.git"
+PKG_PRIORITY="optional"
+PKG_SECTION="tools"
+PKG_SHORTDESC="Creates .doom files based on user selection of WAD and PK3 files."
+PKG_TOOLCHAIN="manual"
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/share
+  cp -r ${PKG_BUILD}/doomscan ${INSTALL}/usr/share
+  cp "${PKG_BUILD}/_Scan Doom Games.sh" ${INSTALL}/usr/share/doomscan
+  chmod 0755 ${INSTALL}/usr/share/doomscan "${INSTALL}/usr/share/doomscan/_Scan Doom Games.sh"
+
+  mkdir -p ${INSTALL}/usr/lib/autostart/common
+  cp ${PKG_DIR}/sources/autostart/common/* ${INSTALL}/usr/lib/autostart/common
+}

packages/games/tools/doomscan/sources/autostart/common/011-doomscan

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright (C) 2022-present travis134
+
+#If doomscan does not exist copy doomscan folder to roms/doom
+if [ ! -e "/storage/roms/doom/doomscan" ]; then
+	cp -r /usr/share/doomscan /storage/roms/doom
+	chmod +x /storage/roms/doom/doomscan -R
+	mv "/storage/roms/doom/doomscan/_Scan Doom Games.sh" "/storage/roms/doom/_Scan Doom Games.sh"
+fi

packages/games/tools/retroarch-assets/package.mk

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="d1cbfdb85124f5b1ccd710626026156dc0a96ddf"
-PKG_SHA256="d423ca4f52b638b57bedf4186a50303895badb28a3f023b584fb2802f846cfb4"
+PKG_VERSION="ee33f8ef693b42a8e23ca3fd48f43f345e7cd087"
+PKG_SHA256="b110163b0898b56be5245fd77a626b69fe5624234a5bf6af22487e2c2ee50a33"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-assets"
 PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"

packages/graphics/plymouth-lite/package.mk

@@ -10,12 +10,11 @@ PKG_DEPENDS_INIT="toolchain ccache:init libpng"
 PKG_DEPENDS_TARGET="toolchain libpng"
 PKG_LONGDESC="Boot splash screen based on Fedora's Plymouth code"
 
-if [ "$UVESAFB_SUPPORT" = yes ]; then
-  PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT v86d:init"
+if [ "${UVESAFB_SUPPORT}" = yes ]; then
+  PKG_DEPENDS_INIT="${PKG_DEPENDS_INIT} v86d:init"
 fi
 
 pre_configure_init() {
-  # plymouth-lite dont support to build in subdirs
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}-init
 }
@@ -23,22 +22,10 @@ pre_configure_init() {
 makeinstall_init() {
   mkdir -p ${INSTALL}/usr/bin
   cp ply-image ${INSTALL}/usr/bin
-
-  mkdir -p ${INSTALL}/splash
-  find_file_path splash/splash.conf && cp ${FOUND_PATH} ${INSTALL}/splash
-  find_file_path "splash/splash-*.png" && cp ${FOUND_PATH} ${INSTALL}/splash
 }
 
 pre_configure_target() {
-  # plymouth-lite dont support to build in subdirs
   cd ${PKG_BUILD}
   rm -rf .${TARGET_NAME}-init
 }
 
-post_makeinstall_target() {
-
-  mkdir -p ${INSTALL}/usr/config/splash
-
-  find_file_path "splash/splash-*.png" && cp ${FOUND_PATH} ${INSTALL}/usr/config/splash
-
-}

packages/jelos/sources/post-update

@@ -21,6 +21,12 @@ 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/ &
 
+if [ ! -L "/storage/.config/emulationstation/resources/logo.png" ]
+then
+  rm -f /storage/.config/emulationstation/resources/logo.png ||:
+  ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
+fi
+
 ### Update add-ons and themes
 wait < <(jobs -p)
 

packages/jelos/sources/scripts/runemu.sh

@@ -277,7 +277,7 @@ then
 			jslisten set "retroarch"
 			if [ "$EMU" = "fbneo" ]
 			then
-				RUNTHIS='/usr/bin/retroarch -L /usr/lib/libretro/fbneo_libretro.so --subsystem neocd --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
+				RUNTHIS='/usr/bin/retroarch -L /tmp/cores/fbneo_libretro.so --subsystem neocd --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
 			fi
 		;;
 		"psx")
@@ -329,7 +329,7 @@ else
         case ${PLATFORM} in
                 "doom")
 			# EXT can be wad, WAD, iwad, IWAD, pwad, PWAD or doom
-			EXT=${ROMNAME#*.}
+			EXT=${ROMNAME##*.}
 
 			# If its not a simple wad (extension .doom) read the file and parse the data
 			if [ ${EXT} == "doom" ]; then
@@ -347,7 +347,7 @@ else
 	then
 	RUNTHIS='${EMUPERF} /usr/bin/${RABIN} -L /storage/.config/retroarch/cores/${EMU}.so --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
 	else
-	RUNTHIS='${EMUPERF} /usr/bin/${RABIN} -L /usr/lib/libretro/${EMU}.so --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
+	RUNTHIS='${EMUPERF} /usr/bin/${RABIN} -L /tmp/cores/${EMU}.so --config ${RATMPCONF} --appendconfig ${RAAPPENDCONF} "${ROMNAME}"'
 	fi
 	CONTROLLERCONFIG="${arguments#*--controllers=*}"
 
@@ -454,6 +454,8 @@ fi
 clear_screen
 
 ### Restore the overclock mode
+if [ -e "/usr/bin/overclock" ]
+then
 	OVERCLOCK=$(get_setting "system.overclock")
 	if [ ! -z "${OVERCLOCK}" ]
 	then
@@ -464,6 +466,7 @@ then
 			systemctl restart fancontrol
 		fi
 	fi
+fi
 
 $VERBOSE && log "Checking errors: ${ret_error} "
 if [ "${ret_error}" == "0" ]

packages/jelos/sources/scripts/show_splash

@@ -16,9 +16,9 @@ if [ "${SPLASH_TYPE}" == "intro" ] || [ "${SPLASH_TYPE}" == "exit" ]
 then
   if [ ${vres} -gt ${hres} ]
   then
-    SPLASH="/usr/config/splash/splash-${hres}l.png"
+    SPLASH="/usr/config/splash/splashl.png"
   else
-    SPLASH="/usr/config/splash/splash-${hres}.png"
+    SPLASH="/usr/config/splash/splash.png"
   fi
 else
   exit 0

packages/jelos/sources/scripts/wifictl

@@ -49,9 +49,27 @@ set_powersave() {
   fi
 }
 
+get_wifi_state() {
+  STATE=$(connmanctl state | awk '/State/ {print $3}' 2>/dev/null)
+  echo ${STATE}
+}
+
+check_wifi() {
+  SSID_CHK=$(grep "${SSID}" ${WIFICFG} 2>/dev/null)
+  KEY_CHK=$(grep "${PSK}" ${WIFICFG} 2>/dev/null)
+  STATE=$(get_wifi_state)
+  if [ -n "${SSID_CHK}" ] && \
+     [ -n "${KEY_CHK}" ] && \
+     [ "${STATE}" = "online" ]
+  then
+    exit 0
+  fi
+}
+
 set_wifi() {
   case "${1}" in
     "enable")
+      check_wifi
       set_setting wifi.enabled 1
       # Create the WIFI config.
       cat > "${WIFICFG}" <<EOF
@@ -64,10 +82,13 @@ Name=${SSID}
 Passphrase=${PSK}
 EOF
 
+      STATE=$(get_wifi_state)
+      if [ ! "${STATE}" = "online" ]
+      then
         connmanctl enable wifi 2>/dev/null
+      fi
       set_powersave 2>/dev/null
-      connmanctl scan wifi 2>/dev/null
-      connmanctl connect $(get_wifi_service "${SSID}") 2>/dev/null
+      nohup connmanctl connect $(get_wifi_service "${SSID}") 2>/dev/null &
     ;;
     "disable")
       connmanctl disable wifi 2>/dev/null

packages/sysutils/busybox/scripts/init

@@ -427,11 +427,17 @@ set_consolefont() {
   progress "Set console font"
   if [ -e /dev/fb0 ]; then
     hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
-    if [ "${hres}" -lt "1152" ]
+    if [ "${hres}" -gt "0" ] && [ "${hres}" -lt "640" ]
+    then
+      setfont -C /dev/tty0 ter-v12n.psf
+    elif [ "${hres}" -ge "640" ] && [ "${hres}" -lt "720" ]
     then
       setfont -C /dev/tty0 ter-v14n.psf
+    elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ]
+    then
+      setfont -C /dev/tty0 ter-v18n.psf
     else
-      setfont -C /dev/tty0 ter-v32n.psf
+      setfont -C /dev/tty0 ter-v24n.psf
     fi
   fi
 }
@@ -478,26 +484,16 @@ load_splash() {
       if [ -z "$SPLASHIMAGE" ]; then
         vres="$(fbset 2>/dev/null | awk '/geometry/ { print $3 }')"
         hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
-        RES="${hres}"
 
         
         # Test to determine if the display is rotated
         # and set the splash to suit.
         if [ ${vres} -gt ${hres} ]
         then
-          RES="${RES}l"
-          if [ ! -f "/splash/splash-${RES}.png" ]
-          then
-            RES="1080l"
-          fi
-        else
-          if [ ! -f "/splash/splash-${RES}.png" ]
-          then
-            RES="1080"
-          fi
+          RES="l"
         fi
 
-        SPLASHIMAGE="/splash/splash-${RES}.png"
+        SPLASHIMAGE="/splash/splash${RES}.png"
 
       fi
 

packages/sysutils/systemd/scripts/userconfig-setup

@@ -31,12 +31,12 @@ then
   ### Remove and link es configs so they are managed with OS updates.
   for es_cfg in es_features.cfg es_systems.cfg
   do
-    rm -f /storage/.config/emulationstation/${es_cfg}
     ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg}
   done
 
-  hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')"
-  cp -f /usr/config/splash/splash-${hres}.png /storage/.config/emulationstation/resources/logo.png
+  ### Link the ES splash to the distribution splash
+  rm -f /storage/.config/emulationstation/resources/logo.png
+  ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
 fi
 
 if [ ! -e "/storage/.cache/ld.so.cache" ]

packages/themes/thememaster/sources/autostart/common/011-thememaster

@@ -11,7 +11,7 @@ then
 	mv /storage/roms/ports/ThemeMaster/ThemeMaster.sh /storage/roms/ports/ThemeMaster.sh
 fi
 
-#Check if gamelist.xml exists, if not create gamelist.xml to hide portmaster by default.
+#Check if gamelist.xml exists, if not create gamelist.xml to hide ThemeMaster by default.
 if [[ ! -e /storage/roms/ports/gamelist.xml ]];
 then
 touch /storage/roms/ports/gamelist.xml
@@ -26,7 +26,7 @@ touch /storage/roms/ports/gamelist.xml
 </gameList>
 EOF
 
-#If gamelist.xml exists and no portmaster entry exists then add portmaster entry & set to hidden.
+#If gamelist.xml exists and no ThemeMaster entry exists then add ThemeMaster entry & set to hidden.
 else
 if ! grep -R "ThemeMaster" "/storage/roms/ports/gamelist.xml"
 then

packages/tools/pugixml/package.mk

@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="pugixml"
+PKG_VERSION="1.12.1"
+PKG_SHA256="1e28ab24b6e04e013d96f45d25e9f2d04c921dc68c613fd010ecaaad3892c14d"
+PKG_LICENSE="MIT"
+PKG_SITE="https://pugixml.org/"
+PKG_URL="https://github.com/zeux/pugixml/archive/v${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="Light-weight, simple and fast XML parser for C++ with XPath support."
+PKG_BUILD_FLAGS="+pic"

packages/ui/emulationstation/config/common/es_systems.cfg

@@ -2212,7 +2212,7 @@
     <release>1993</release>
     <hardware>game engine</hardware>
     <path>/storage/roms/doom</path>
-    <extension>.doom</extension>
+    <extension>.sh .SH .doom</extension>
     <command>/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%"</command>
     <platform>pc</platform>
     <theme>doom</theme>

packages/ui/emulationstation/package.mk

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

packages/ui/splash/package.mk

@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2020-present Fewtarius
+
+PKG_NAME="splash"
+PKG_VERSION="$(date +%Y%m%d)"
+PKG_ARCH="any"
+PKG_LICENSE="apache2"
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain imagemagick"
+PKG_LONGDESC="Boot splash screens"
+PKG_TOOLCHAIN="manual"
+
+make_init() {
+  :
+}
+
+make_target() {
+  :
+}
+
+mksplash() {
+  SPLASH="${ROOT}/distributions/${DISTRO}/splash/splash.png"
+  if [ -n "${SPLASH_RESOLUTION}" ]
+  then
+
+    # Switch the resolution so the rotated image will scale correctly.
+    HRES=$(echo "${SPLASH_RESOLUTION}" | awk 'BEGIN {FS="x"} {print $1}')
+    VRES=$(echo "${SPLASH_RESOLUTION}" | awk 'BEGIN {FS="x"} {print $2}')
+    if [ "${VRES}" -gt "${HRES}" ]
+    then
+      convert ${SPLASH} -quality 100 -background black -resize ${VRES}x${HRES} -gravity center -extent ${VRES}x${HRES} ${1}/splash.png
+    else
+      convert ${SPLASH} -quality 100 -background black -resize ${SPLASH_RESOLUTION} -gravity center -extent ${SPLASH_RESOLUTION} ${1}/splash.png
+    fi
+    convert ${SPLASH} -rotate 270 -quality 100 -background black -resize ${SPLASH_RESOLUTION} -gravity center -extent ${SPLASH_RESOLUTION} ${1}/splashl.png
+  else
+    cp ${SPLASH} ${INSTALL}/splash
+    convert ${SPLASH} -quality 100 -rotate 270 -background black ${INSTALL}/splash/splashl.png
+  fi
+}
+
+makeinstall_init() {
+  mkdir -p ${INSTALL}/splash
+  mksplash ${INSTALL}/splash
+}
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/config/splash
+  mksplash ${INSTALL}/usr/config/splash
+}

packages/virtual/gamesupport/package.mk

@@ -7,7 +7,7 @@ PKG_SITE="www.jelos.org"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Game support software metapackage."
 
-PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb jelosaddons sdljoytest"
+PKG_GAMESUPPORT="sixaxis rg351p-js2xbox gptokeyb jstest-sdl gamecontrollerdb jelosaddons sdljoytest doomscan"
 
 PKG_DEPENDS_TARGET="${PKG_GAMESUPPORT}"
 

packages/virtual/image/package.mk

@@ -4,7 +4,7 @@
 PKG_NAME="image"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
-PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug usb-modeswitch unzip poppler socat p7zip file bluez initramfs jelos"
+PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware ${BOOTLOADER} busybox util-linux corefonts network misc-packages debug usb-modeswitch unzip poppler socat p7zip file bluez splash initramfs jelos"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Root package used to build and create complete image"
 

packages/virtual/initramfs/package.mk

@@ -7,7 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init"
+PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init splash:init plymouth-lite:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init"
 PKG_SECTION="virtual"
 PKG_LONGDESC="debug is a Metapackage for installing initramfs"
 

projects/Rockchip/devices/RG351MP/options

@@ -44,6 +44,9 @@
     KERNEL_MAKE_EXTRACMD=""
     KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
    
+  # Display Resolution
+    SPLASH_RESOLUTION="640x480"
+ 
   # Mali GPU family
     MALI_FAMILY="bifrost-g31"
     OPENGLES="libmali"

projects/Rockchip/devices/RG351P/options

@@ -44,6 +44,9 @@
     KERNEL_MAKE_EXTRACMD=""
     KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
    
+  # Display Resolution
+    SPLASH_RESOLUTION="320x480"
+ 
   # Mali GPU family
     MALI_FAMILY="bifrost-g31"
     OPENGLES="libmali"

projects/Rockchip/devices/RG351V/options

@@ -44,6 +44,9 @@
     KERNEL_MAKE_EXTRACMD=""
     KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
    
+  # Display Resolution
+    SPLASH_RESOLUTION="640x480"
+ 
   # Mali GPU family
     MALI_FAMILY="bifrost-g31"
     OPENGLES="libmali"

projects/Rockchip/devices/RG353P/options

@@ -45,6 +45,9 @@
     KERNEL_MAKE_EXTRACMD=""
     KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
 
+  # Display Resolution
+    SPLASH_RESOLUTION="640x480"
+ 
   # Define the CPU
     HW_CPU="Rockchip RK3566"
  

projects/Rockchip/devices/RG503/options

@@ -45,6 +45,9 @@
     KERNEL_MAKE_EXTRACMD=""
     KERNEL_MAKE_EXTRACMD+=" rockchip/${DEVICE_DTB}.dtb"
   
+  # Display Resolution
+    SPLASH_RESOLUTION="960x544"
+ 
   # Define the CPU
     HW_CPU="Rockchip RK3566"
  

projects/Rockchip/devices/RG552/options

@@ -46,6 +46,9 @@
   # Define the CPU
     HW_CPU="Rockchip RK3399"
 
+  # Display Resolution
+    SPLASH_RESOLUTION="1152x1920"
+ 
   # Mali GPU family
     MALI_FAMILY="midgard-t86x"
     MALI_VERSION="r18p0"

projects/Rockchip/packages/linux/package.mk

@@ -29,7 +29,7 @@ case ${DEVICE} in
   ;;
   RG353P|RG503)
     PKG_URL="${PKG_SITE}/rk356x-kernel.git"
-    PKG_VERSION="e75a81b17"
+    PKG_VERSION="ce84246cd"
   ;;
 esac
 

projects/Rockchip/packages/sleep/sources/sleep.sh

@@ -29,6 +29,12 @@ case $1 in
 
   ;;
   post)
+    alsactl restore -f /storage/.config/asound.state
+
+    if [[ "${HW_DEVICE}" =~ RG351 ]]
+    then
+      modprobe -i dwc2
+    fi
 
     if [ "${DEVICE_FAKE_JACKSENSE}" == "true" ]
     then
@@ -40,14 +46,6 @@ case $1 in
       nohup systemctl start volume &
     fi
 
-    if [[ "${HW_DEVICE}" =~ RG351 ]]
-    then
-      modprobe -i dwc2
-      systemctl restart volume
-    fi
-
-    alsactl restore -f /storage/.config/asound.state
-
     DEVICE_VOLUME=$(get_setting "audio.volume" 2>/dev/null)
     amixer set "${DEVICE_AUDIO_MIXER}" ${DEVICE_VOLUME}% 2>&1 >/dev/null
 

scripts/build_distro

@@ -60,7 +60,7 @@ fi
 
 # Clean OS specific packages.
 PKG_CLEAN="${PKG_CLEAN} system-utils plymouth-lite initramfs busybox linux grub u-boot SDL2 modules \
-           emulationstation retroarch lib32 jelos"
+           emulationstation retroarch lib32 splash jelos"
 
 if [ -d "build.${DISTRO}-${DEVICE_ROOT}.${ARCH}/initramfs" ]
 then

tools/sync

@@ -1,16 +0,0 @@
-#!/bin/bash
-HOST="www.jelos.org"
-USER="root"
-WWWPATH="/var/www/html/releases"
-
-if [ ! -z "${ARCH}" ] || [ ! -z "${DEVICE}" ] || [ ! -z "${DISTRO}" ]
-then
-  export DISTRO=JELOS
-  export ARCH=aarch64
-  export DEVICE=RG552
-fi
-
-ssh ${USER}@${HOST} mkdir -p ${WWWPATH}/${DEVICE}/{distribution,sources}
-ssh ${USER}@${HOST} rm -f ${WWWPATH}/${DEVICE}/distribution/*
-rsync -av --delete --progress --stats release/${ARCH}/${DEVICE}/{*img*,*tar*} ${USER}@${HOST}:${WWWPATH}/${DEVICE}/distribution/
-rsync -av --delete --progress --stats --exclude="j/jelos-*" --include="*.tar.gz" build.${DISTRO}-${DEVICE}.${ARCH}-sources/* ${USER}@${HOST}:${WWWPATH}/${DEVICE}/sources