Merge pull request #1603 from JustEnoughLinuxOS/dev

PR for release

BUILDING.md

@@ -173,19 +173,28 @@ JELOS supports various build variables which alter the behavior of the distribut
 > Note: <sup>1</sup> this property will change to yes/no for consistency in a future release.
 
 ### Special env variables
-For development build, you can use the following env variables to customize the image. Some of them can be included in your `.bashrc` startup shell script.
+For development build, you can use the following env variables to customize the image or change build time functionality. They can be included in your `.bashrc` startup shell script.
+|Variable|Function|
+|----|----|
+|LOCAL_SSH_KEYS_FILE|Enables using ssh public keys for access without the root password.|
+|LOCAL_WIFI_SSID|The SSID of the network the device should connect too automatically.|
+|LOCAL_WIFI_KEY|The WIFI authentication key for the connection."|
+|SCREENSCRAPER_DEV_LOGIN|Login information for screenscraper.fr.|
+|GAMESDB_APIKEY|Login information for thegamesdb.net.|
+|CHEEVOS_DEV_LOGIN|Login information for retroachievements.org.|
+|CLEAN_PACKAGES|Allows specifying packages to clean during a build.|
 
-**SSH keys**
+#### SSH keys
 ```
 export LOCAL_SSH_KEYS_FILE=~/.ssh/jelos/authorized_keys
 ```
-**WiFi SSID and password**
+#### WiFi SSID and password
 ```
 export LOCAL_WIFI_SSID=MYWIFI
 export LOCAL_WIFI_KEY=secret
 ```
 
-**Screenscraper, GamesDB, and RetroAchievements**
+#### Screenscraper, GamesDB, and RetroAchievements
 
 To enable Screenscraper, GamesDB, and RetroAchievements, register at each site and apply the api keys in ~/developer_settings.conf or add them as environment variables. Unsetting one of the variables will disable it in EmulationStation. This configuration is picked up by EmulationStation during the build.
 
@@ -198,6 +207,11 @@ export GAMESDB_APIKEY="APIKEY"
 export CHEEVOS_DEV_LOGIN="z=RETROACHIEVEMENTSUSERNAME&y=APIKEYID"
 ```
 
+#### Cleaning additional packages
+```
+CLEAN_PACKAGES="linux ppsspp-sa" make AMD64
+```
+
 ### Creating a patch for a package
 It is common to have imported package source code modifed to fit the use case. It's recommended to use a special shell script to built it in case you need to iterate over it. See below.
 

distributions/JELOS/options

@@ -50,7 +50,7 @@
 # a BSP kernel and a rotated display when using DEVICE_ROOT.
   if [ -n "${DEVICE_ROOT}" ]
   then
-    CLEAN_DEVICE_ROOT="linux u-boot SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa"
+    CLEAN_DEVICE_ROOT="linux u-boot u-boot-script SDL2 retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa"
   fi
 
 # additional drivers to install:

packages/compat/box64/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="box64"
-PKG_VERSION="4110956ddaf3c58a1e8e50aa7adba2ed43e3a6b7"
+PKG_VERSION="9698844cc3894f29e101fe9282141d4a5e27267f"
 PKG_ARCH="aarch64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ptitSeb/box64"

packages/emulators/libretro/beetle-pce-fast-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-fast-lr"
-PKG_VERSION="daecc614f6cdbfa1cd754c39f31c4b3f2c658f98"
+PKG_VERSION="c7d3c17ce7aafc71ff58914d2dd0a5be30df11d1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/beetle-pce-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-pce-lr"
-PKG_VERSION="df307b982c39efc5cc611bae5eb4849e1700d36e"
+PKG_VERSION="ea636e724d2217339e32d23a4b8eabed9e3503a6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/emulators/libretro/beetle-supergrafx-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="beetle-supergrafx-lr"
-PKG_VERSION="9cd2f13c3f44a708f95c3243ca86d2ba5f39aaae"
+PKG_VERSION="50b80ade59371c2e610ae244bc81d0bf51674a16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="bsnes-lr"
-PKG_VERSION="3c1868250b90f5961eccd044a780489c29e4c40f"
+PKG_VERSION="4f4e22e83a92e2e3999e5792f52085e1ecd662e2"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure-lr"
-PKG_VERSION="490d59bdd06e40ce5bd3a16259af6e8d62c60e70"
+PKG_VERSION="1be1646b2fa173b5d960be1b1d8cb2dbaf305f51"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

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

@@ -1,62 +0,0 @@
-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/emulators/libretro/fake08-lr/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Lakka (https://www.lakka.tv)
 
 PKG_NAME="fake08-lr"
-PKG_VERSION="eed6109d121e4de8ad1a2d6f81d712648462592f"
+PKG_VERSION="14243c0e18425acbe557a81eb9c230dd44e85982"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/jtothebell/fake-08"
 PKG_URL="${PKG_SITE}.git"

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

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

packages/emulators/libretro/genesis-plus-gx-lr/package.mk

@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-lr"
-PKG_VERSION="e50eaa6d698b401f381c46f90b922cc6b1ae1970"
+PKG_VERSION="b024aa0de43556b5bd7e30230a177f2d7fc8cc28"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-wide-lr"
-PKG_VERSION="08bc39b8bb1fb8b3c541c4b99119458c6294df11"
+PKG_VERSION="5e79dce6ed60b0d749fb2164b360850198edfe89"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

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

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="libretro-database"
-PKG_VERSION="90a33aa566022437ae08b139efa5ef9a1eb6eb91"
+PKG_VERSION="a80e58a1e99298a295c4e94add869ea54b3f8ec0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/emulators/libretro/mame2003-plus-lr/package.mk

@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus-lr"
-PKG_VERSION="56be1182df7333513538dcb7cf6a0cac15d732f3"
+PKG_VERSION="2ec0caa3bb1bd4b995414e050a575f78d3f6725c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"

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

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp-lr"
-PKG_VERSION="5ae9c9c64e5605881a3e3f5bc43ec39271dc9b2f"
+PKG_VERSION="264c6d740b86b1b445e0a9b6505a9884449b99f1"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
@@ -28,65 +28,68 @@ PKG_DEPENDS_TARGET="toolchain SDL2 ffmpeg libzip zstd"
 PKG_LONGDESC="A PSP emulator for Android, Windows, Mac, Linux and Blackberry 10, written in C++."
 GET_HANDLER_SUPPORT="git"
 
-PKG_LIBNAME="ppsspp_libretro.so"
+
-PKG_LIBPATH="lib/${PKG_LIBNAME}"
+pre_configure_target() {
+  PKG_LIBNAME="ppsspp_libretro.so"
+  PKG_LIBPATH="lib/${PKG_LIBNAME}"
 
 
-if [ ! "${OPENGL}" = "no" ]; then
+  if [ ! "${OPENGL}" = "no" ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew glslang"
+    PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew glslang"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
+    PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=OFF \
-                           -DUSING_GLES2=OFF"
+                             -DUSING_GLES2=OFF"
-fi
+  fi
 
-if [ "${OPENGLES_SUPPORT}" = yes ]; then
+  if [ "${OPENGLES_SUPPORT}" = yes ]; then
-  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
+    PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=ON \
+    PKG_CMAKE_OPTS_TARGET+=" -DUSING_FBDEV=ON \
-                           -DUSING_EGL=OFF \
+                             -DUSING_EGL=OFF \
-                           -DUSING_GLES2=ON \
+                             -DUSING_GLES2=ON \
-                           -DVULKAN=OFF \
+                             -DVULKAN=OFF \
-                           -DUSE_VULKAN_DISPLAY_KHR=OFF\
+                             -DUSE_VULKAN_DISPLAY_KHR=OFF\
-                           -DUSING_X11_VULKAN=OFF"
+                             -DUSING_X11_VULKAN=OFF"
-fi
+  fi
 
-if [ "${VULKAN_SUPPORT}" = "yes" ]
+  if [ "${VULKAN_SUPPORT}" = "yes" ]
-then
+  then
-  PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
+    PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN_DISPLAY_KHR=ON \
-                           -DVULKAN=ON \
+                             -DVULKAN=ON \
-                           -DEGL_NO_X11=1
+                             -DEGL_NO_X11=1
-                           -DMESA_EGL_NO_X11_HEADERS=1"
+                             -DMESA_EGL_NO_X11_HEADERS=1"
-else
+  else
-  PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
+    PKG_CMAKE_OPTS_TARGET+=" -DVULKAN=OFF"
-fi
+  fi
 
-if [ "${DISPLAYSERVER}" = "wl" ]; then
+  if [ "${DISPLAYSERVER}" = "wl" ]; then
-  PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
+    PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=ON"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=ON"
-else
+  else
-  PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=OFF"
+    PKG_CMAKE_OPTS_TARGET+=" -DUSE_WAYLAND_WSI=OFF"
-fi
+  fi
 
-case ${TARGET_ARCH} in
+  case ${TARGET_ARCH} in
-  aarch64)
+    aarch64)
-  PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=aarch64"
+      PKG_CMAKE_OPTS_TARGET+=" -DFORCED_CPU=aarch64"
-  ;;
+    ;;
-esac
+  esac
 
-PKG_CMAKE_OPTS_TARGET+="${PKG_CMAKE_OPTS_TARGET} \
+  PKG_CMAKE_OPTS_TARGET+="${PKG_CMAKE_OPTS_TARGET} \
-                        -DUSE_SYSTEM_FFMPEG=OFF \
+                          -DUSE_SYSTEM_FFMPEG=OFF \
-                        -DCMAKE_BUILD_TYPE=Release \
+                          -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_SYSTEM_NAME=Linux \
+                          -DCMAKE_SYSTEM_NAME=Linux \
-                        -DBUILD_SHARED_LIBS=OFF \
+                          -DBUILD_SHARED_LIBS=OFF \
-                        -DANDROID=OFF \
+                          -DANDROID=OFF \
-                        -DWIN32=OFF \
+                          -DWIN32=OFF \
-                        -DAPPLE=OFF \
+                          -DAPPLE=OFF \
-			-DLIBRETRO=ON \
+                          -DLIBRETRO=ON \
-                        -DCMAKE_CROSSCOMPILING=ON \
+                          -DCMAKE_CROSSCOMPILING=ON \
-                        -DUSING_QT_UI=OFF \
+                          -DUSING_QT_UI=OFF \
-                        -DUNITTEST=OFF \
+                          -DUNITTEST=OFF \
-                        -DSIMULATOR=OFF \
+                          -DSIMULATOR=OFF \
-                        -DHEADLESS=OFF \
+                          -DHEADLESS=OFF \
-                        -DUSE_DISCORD=OFF"
+                          -DUSE_DISCORD=OFF"
+}
 
 pre_make_target() {
   # fix cross compiling

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

@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="puae-lr"
-PKG_VERSION="605264f15d31c42b1fe546fd47a6ffb1301c03c8"
+PKG_VERSION="e7a4debc10aa9fa0c649940882eb4979c1819ab1"
 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="9a632e837030503fee15007980455834866a4812"
+PKG_VERSION="b9d3443a2736cf6db8408c49877ffc299e756511"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="stella-lr"
-PKG_VERSION="ee13c16930e2f43bf68dd86425356d4081c81eb0"
+PKG_VERSION="d5eeba505c97142fa93f82a16db2f0b27f511e3c"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"

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

@@ -41,13 +41,13 @@ pre_configure_target() {
 makeinstall_target() {
 
   mkdir -p ${INSTALL}/usr/bin
-  cp ${PKG_BUILD}/.${HOST_NAME}/gzdoom ${INSTALL}/usr/bin
+  cp ${PKG_BUILD}/.${TARGET_NAME}/gzdoom ${INSTALL}/usr/bin
   cp ${PKG_DIR}/scripts/start_gzdoom.sh ${INSTALL}/usr/bin/
   chmod +x ${INSTALL}/usr/bin/*
 
   mkdir -p ${INSTALL}/usr/config/gzdoom
   cp ${PKG_DIR}/config/* ${INSTALL}/usr/config/gzdoom
-  cp ${PKG_BUILD}/.${HOST_NAME}/*.pk3 ${INSTALL}/usr/config/gzdoom
+  cp ${PKG_BUILD}/.${TARGET_NAME}/*.pk3 ${INSTALL}/usr/config/gzdoom
-  cp -r ${PKG_BUILD}/.${HOST_NAME}/soundfonts ${INSTALL}/usr/config/gzdoom
+  cp -r ${PKG_BUILD}/.${TARGET_NAME}/soundfonts ${INSTALL}/usr/config/gzdoom
-  cp -r ${PKG_BUILD}/.${HOST_NAME}/fm_banks ${INSTALL}/usr/config/gzdoom
+  cp -r ${PKG_BUILD}/.${TARGET_NAME}/fm_banks ${INSTALL}/usr/config/gzdoom
 }

packages/emulators/standalone/gzdoom-sa/zmusic/package.mk

@@ -40,4 +40,7 @@ makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/{lib,include}
   cp -f ${PKG_BUILD}/build/source/libzmusic* ${SYSROOT_PREFIX}/usr/lib/
   cp -f ${PKG_BUILD}/include/zmusic.h ${SYSROOT_PREFIX}/usr/include
+
+  mkdir -p ${INSTALL}/usr/lib
+  cp -f ${PKG_BUILD}/build/source/libzmusic* ${INSTALL}/usr/lib
 }

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

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

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="pico-8"
-PKG_VERSION="7a4cddfdfc2fbbe631b53c8e4c418186fadc939f"
+PKG_VERSION="3614c2772e923898d8bf2225d108584ac2e5cfca"
 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="5ae9c9c64e5605881a3e3f5bc43ec39271dc9b2f"
+PKG_VERSION="264c6d740b86b1b445e0a9b6505a9884449b99f1"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"

packages/emulators/standalone/retroarch/package.mk

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

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="7f80735ae776fa99b3e06df3d810d6dc016d9e15"
+PKG_VERSION="5049db390a2247ca441210dd33a253bac087dd5a"
 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/emulators/tools/retroarch-joypads/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="retroarch-joypads"
-PKG_VERSION="03b51f6c33aab6fcc371ad2b06efc559c27c82d1"
+PKG_VERSION="ce8c5441884fffa1872a7de218157f23e15591e9"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-joypad-autoconfig"
 PKG_URL="${PKG_SITE}.git"

packages/hardware/quirks/devices/ATARI VCS 800 Onyx/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/AYANEO AIR Plus/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/AYANEO AIR/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/Anbernic RG353P/001-deviceconfig

@@ -34,5 +34,6 @@ DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc"
 # Volume Keys
 DEVICE_KEY_VOLUMEDOWN=114
 DEVICE_KEY_VOLUMEUP=115
-DEVICE_VOL_MODIFIER="BTN_MODE"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/Anbernic RG353V/001-deviceconfig

@@ -35,5 +35,6 @@ DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc"
 # Volume Keys
 #DEVICE_KEY_VOLUMEDOWN=
 #DEVICE_KEY_VOLUMEUP=
-DEVICE_VOL_MODIFIER="BTN_MODE"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/Anbernic RG503/001-deviceconfig

@@ -36,5 +36,6 @@ DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc"
 # Volume Keys
 DEVICE_KEY_VOLUMEDOWN=114
 DEVICE_KEY_VOLUMEUP=115
-DEVICE_VOL_MODIFIER="BTN_MODE"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/GPD G1619-04/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER=="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-deviceconfig

@@ -27,5 +27,6 @@ FAST_CORES="taskset -c 2-5"
 # Volume Keys
 DEVICE_KEY_VOLUMEDOWN=114
 DEVICE_KEY_VOLUMEUP=115
-DEVICE_VOL_MODIFIER="BTN_MODE"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/LENOVO 81TC/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER=="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/Powkiddy RK2023/001-deviceconfig

@@ -34,5 +34,6 @@ DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc"
 # Volume Keys
 DEVICE_KEY_VOLUMEDOWN=114
 DEVICE_KEY_VOLUMEUP=115
-DEVICE_VOL_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/Powkiddy x55/001-deviceconfig

@@ -34,5 +34,6 @@ DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc"
 # Volume Keys
 DEVICE_KEY_VOLUMEDOWN=114
 DEVICE_KEY_VOLUMEUP=115
-DEVICE_VOL_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYA_MODIFIER="BTN_TR2"
+DEVICE_FUNC_KEYB_MODIFIER="BTN_TL2"
 EOF

packages/hardware/quirks/devices/Valve Jupiter/001-deviceconfig

@@ -7,7 +7,8 @@ DEVICE_VOLUMECTL=true
 DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_VOL_MODIFIER="ABS_RZ"
+DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
+DEVICE_FUNC_KEYB_MODIFIER=="ABS_Z"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/jelos/autostart/004-upgrade

@@ -4,14 +4,14 @@
 
 . /etc/profile
 
-if [ "$(cat /storage/.config/boot.hint 2>/dev/null)" = "UPDATE" ]
+if [ "$(cat /storage/.boot.hint 2>/dev/null)" = "UPDATE" ]
 then
   if [ -e "/usr/share/post-update" ]
   then
     tocon "Performing post-update configuration..."
     /usr/share/post-update >/var/log/upgrade.log 2>&1
   fi
-  rm /storage/.config/boot.hint
+  rm /storage/.boot.hint
 else
   echo "No update hint found." >/var/log/upgrade.log 2>&1
 fi

packages/jelos/profile.d/02-distribution

@@ -16,7 +16,7 @@ get_setting() {
   if [ ! -z "${3}" ]
   then
     ### Test to see if we have a game setting.
-    VAR="$2\[\"$(echo ${3} | sed 's/[\(\)]/\\&/g')\"\]\.$1"
+    VAR="$2\[\"$(echo ${3} | sed 's/\W/\\&/g')\"]\.$1"
     OUTPUT=$(awk 'BEGIN {FS="="} /^'"${VAR}"'/ {print $NF}' ${J_CONF})
     if [ ! -z "${OUTPUT}" ]
     then

packages/jelos/sources/post-update

@@ -115,3 +115,9 @@ do
     set_setting display.${DPROP} 50
   fi
 done
+
+### Update JSListen
+for JSL in jslisten_hotkeys jslisten_profile
+do
+  cp -f /usr/config/${JSL} /storage/.config
+done

packages/sysutils/busybox/scripts/init

@@ -981,7 +981,7 @@ check_update() {
   umount /sysroot &>/dev/null
   update_file "System" "${UPDATE_SYSTEM}" "/flash/${IMAGE_SYSTEM}"
   update_bootloader
-  echo "UPDATE" >/storage/boot.hint
+  echo "UPDATE" >/storage/.boot.hint
   sync
   StartProgress countdown "Update complete. Reboot in 5s... " 5 "NOW"
   do_cleanup

packages/sysutils/system-utils/sources/scripts/volume_sense

@@ -24,7 +24,8 @@ VOL_EVENT='*(KEY_VOLUME*, value *' # This matches all volume events
 VOL_UP='*UP), value *'  # Differentiate 'up' volume event
 VOL_DOWN='*DOWN), value *' #Differentiate 'down' volume event
 
-V_FUNC_KEY_EVENT='*('${DEVICE_VOL_MODIFIER}'), value *'
+V_FUNC_KEYA_EVENT='*('${DEVICE_FUNC_KEYA_MODIFIER}'), value *'
+V_FUNC_KEYB_EVENT='*('${DEVICE_FUNC_KEYB_MODIFIER}'), value *'
 
 # Matches if a button was pressed (1), released (0) or held down (2)
 PRESS='value [1-9]'
@@ -37,7 +38,8 @@ VOLUME_REPEAT_MOD=4
 BRIGHTNESS_REPEAT_MOD=4
 
 # Variable to keep track of Fn being currently pressed
-FUNC_PRESSED=no
+FUNCA_PRESSED=no
+FUNCB_PRESSED=no
 
 CONTROLLER_DISCONNECTED="*error reading: No such device"
 DEVICE_DISCONNECTED="*error reading: No such device"
@@ -122,15 +124,18 @@ mkcontroller 2>/dev/null ||:
              REPEAT_NUM=0
              continue
           fi
-
           # Setup for 'brightness' if Fn pressed
-          if [[ "${FUNC_PRESSED}" == "yes" ]]; then
+          if [[ "${FUNCA_PRESSED}" == "yes" ]]; then
-            COMMAND=/usr/bin/brightness
+            COMMAND="/usr/bin/brightness"
             UP="up"
             DOWN="down"
             REPEAT_MOD=${BRIGHTNESS_REPEAT_MOD}
-          # Default to 'volume' if Fn is not pressed
+          elif [[ "${FUNCB_PRESSED}" == "yes" ]]; then
+	    COMMAND="/usr/bin/say"
+            UP="-b"
+            DOWN="-b"
           else
+            # Default to 'volume' if Fn a or b is not pressed
             COMMAND="/usr/bin/system_utils vol"
             UP="+"
             DOWN="-"
@@ -152,21 +157,36 @@ mkcontroller 2>/dev/null ||:
           # Run the commands to adjust volume/brightness
           if [[ "${line}" == ${VOL_UP} ]]; then
             ${COMMAND} ${UP} ${INCREMENT_AMOUNT} > /dev/null
+            read -t 0.1
           elif [[ "${line}" == ${VOL_DOWN} ]]; then
             ${COMMAND} ${DOWN} ${INCREMENT_AMOUNT} > /dev/null
+            read -t 0.1
           fi
         ;;
 
-        (${V_FUNC_KEY_EVENT})
+        (${V_FUNC_KEYA_EVENT})
 
           #Reset the number of repeats when Fn is pressed/release
           #  as repeat speed is different between volume/brightness
           REPEAT_NUM=0
 
           if [[ "${line}" =~ ${PRESS} ]]; then
-            FUNC_PRESSED=yes
+            FUNCA_PRESSED=yes
           elif [[ "${line}" =~ ${RELEASE} ]]; then
-            FUNC_PRESSED=no
+            FUNCA_PRESSED=no
+          fi
+        ;;
+
+        (${V_FUNC_KEYB_EVENT})
+
+          #Reset the number of repeats when Fn is pressed/release
+          #  as repeat speed is different between volume/brightness
+          REPEAT_NUM=0
+
+          if [[ "${line}" =~ ${PRESS} ]]; then
+            FUNCB_PRESSED=yes
+          elif [[ "${line}" =~ ${RELEASE} ]]; then
+            FUNCB_PRESSED=no
           fi
         ;;
     esac