From 95dba168523c0b91c01dbee8532572f35f177912 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Sat, 21 Oct 2023 13:23:05 +0100
Subject: [PATCH 1/9] quirks: cleanup Hardkernel ODROID-N2 audio quirk

---
 .../quirks/devices/Hardkernel ODROID-N2/050-audio_path   | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path
index 0253d7bbf4..3db271a642 100755
--- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path	
+++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path	
@@ -3,9 +3,6 @@
 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
 
 cat <<EOF >/storage/.config/profile.d/002-audio_path
-DEVICE_PLAYBACK_PATH_SPK="SPK"
-DEVICE_PLAYBACK_PATH_HP="HP"
-DEVICE_PLAYBACK_PATH="Playback Mux"
 DEVICE_PIPEWIRE_PROFILE="pro-audio"
 EOF
 
@@ -14,12 +11,6 @@ amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on'
 amixer -c 0 -q sset 'TDMOUT_B SRC SEL' 'IN 0'
 amixer -c 0 -q sset 'TOHDMITX I2S SRC' 'I2S B'
 amixer -c 0 -q sset 'TOHDMITX' 'on'
-amixer -c 0 -q sset 'FRDDR_B SINK 1 SEL' 'OUT 2'
-amixer -c 0 -q sset 'FRDDR_B SRC 1 EN' 'on'
-amixer -c 0 -q sset 'TDMOUT_C SRC SEL' 'IN 1'
 amixer -c 0 -q sset 'TOACODEC SRC' 'I2S B'
 amixer -c 0 -q sset 'TOACODEC OUT EN' 'on'
-amixer -c 0 -q sset 'TOACODEC Lane Select' '0'
 amixer -c 0 -q sset 'ACODEC' '255'
-amixer -c 0 -q sset 'FRDDR_C SINK 1 SEL' 'OUT 3'
-amixer -c 0 -q sset 'FRDDR_C SRC 1 EN' 'on'

From a799dbaa503fde1f3adcd34c7e74d21df8d3c363 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Sat, 21 Oct 2023 15:56:46 +0100
Subject: [PATCH 2/9] quirks: remove Amlogic blue led quirk and move it to dtb

---
 .../Hardkernel ODROID-N2/020-no_blinking_led      |  1 -
 .../quirks/platforms/S922X/020-no_blinking_led    |  1 -
 .../linux/patches/S922X/000-s922x-devices.patch   | 15 +++++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100755 packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led
 delete mode 100755 packages/hardware/quirks/platforms/S922X/020-no_blinking_led

diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led
deleted file mode 100755
index 056bc304f1..0000000000
--- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led	
+++ /dev/null
@@ -1 +0,0 @@
-echo none > /sys/class/leds/n2\:blue/trigger
diff --git a/packages/hardware/quirks/platforms/S922X/020-no_blinking_led b/packages/hardware/quirks/platforms/S922X/020-no_blinking_led
deleted file mode 100755
index 842d188b7e..0000000000
--- a/packages/hardware/quirks/platforms/S922X/020-no_blinking_led
+++ /dev/null
@@ -1 +0,0 @@
-echo none > /sys/class/leds/blue\:/trigger
diff --git a/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch b/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
index aaaf4a85f8..9093b89a7a 100644
--- a/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
+++ b/projects/Amlogic/packages/linux/patches/S922X/000-s922x-devices.patch
@@ -339,7 +339,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
 +                        color = <LED_COLOR_ID_BLUE>;
 +                        function = LED_FUNCTION_STATUS;
 +                        gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-+                        linux,default-trigger = "heartbeat";
++                        linux,default-trigger = "none";
 +                };
 +
 +                led-red {
@@ -1353,7 +1353,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-powkiddy-rgb10-max-
 +                        color = <LED_COLOR_ID_BLUE>;
 +                        function = LED_FUNCTION_STATUS;
 +                        gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
-+                        linux,default-trigger = "heartbeat";
++                        linux,default-trigger = "none";
 +                };
 +
 +                led-red {
@@ -8581,3 +8581,14 @@ diff -rupN linux.orig/sound/soc/meson/axg-card.c linux/sound/soc/meson/axg-card.
  
  	for_each_rtd_codec_dais(rtd, i, codec_dai) {
  		ret = snd_soc_dai_set_tdm_slot(codec_dai,
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
+@@ -45,7 +45,7 @@
+ 		led-blue {
+ 			label = "n2:blue";
+ 			gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
+-			linux,default-trigger = "heartbeat";
++			linux,default-trigger = "none";
+ 		};
+ 	};
+ 

From 4a8d5d8c9922b1c2bf4bd4617a2f15ecddf18ce5 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Sat, 21 Oct 2023 18:06:50 +0100
Subject: [PATCH 3/9] documentation: update for S922X

---
 .../S922X/SUPPORTED_EMULATORS_AND_CORES.md                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
index cdc198015c..bccb089abe 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -104,8 +103,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed (default)<br>**retroarch:** beetle_psx<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -114,7 +114,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**retroarch:** scummvm (default)<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|

From 7001b2e4be213d0603d4a48344cd755ffb1ac163 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 22 Oct 2023 10:44:31 +0000
Subject: [PATCH 4/9] Bump Linux to 6.5.8, update emulators, cores, and theme.

---
 packages/apps/moonlight/package.mk            |   2 +-
 .../emulators/libretro/bsnes-lr/package.mk    |   2 +-
 .../libretro/dosbox-pure-lr/package.mk        |   2 +-
 .../emulators/libretro/fake08-lr/package.mk   |   2 +-
 .../libretro/genesis-plus-gx-lr/package.mk    |   2 +-
 .../libretro/mame2003-plus-lr/package.mk      |   2 +-
 .../emulators/libretro/o2em-lr/package.mk     |   2 +-
 .../emulators/libretro/ppsspp-lr/package.mk   |   2 +-
 .../emulators/libretro/scummvm-lr/package.mk  |   2 +-
 .../emulators/standalone/cemu-sa/package.mk   |   2 +-
 ...karound-for-missing-language-message.patch |  11 --
 .../standalone/flycast-sa/package.mk          |   2 +-
 .../emulators/standalone/ppsspp-sa/package.mk |   2 +-
 .../emulators/standalone/retroarch/package.mk |   2 +-
 .../emulators/standalone/yuzu-sa/package.mk   |   2 +-
 .../tools/retroarch-assets/package.mk         |   2 +-
 packages/kernel/linux/package.mk              |   2 +-
 ...asus-ally-cs35l41-6.3-with-asus-keys.patch |  38 ----
 .../AMD64/008-revert-judge-aspm-mode.patch    | 162 ------------------
 .../themes/es-theme-art-book-next/package.mk  |   2 +-
 20 files changed, 17 insertions(+), 228 deletions(-)
 delete mode 100644 packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch
 delete mode 100644 packages/kernel/linux/patches/AMD64/007-asus-ally-cs35l41-6.3-with-asus-keys.patch
 delete mode 100644 packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch

diff --git a/packages/apps/moonlight/package.mk b/packages/apps/moonlight/package.mk
index a5d1755519..f8c3b2800b 100644
--- a/packages/apps/moonlight/package.mk
+++ b/packages/apps/moonlight/package.mk
@@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]
 then
   PKG_SITE+="qt"
   PKG_URL="${PKG_SITE}.git"
-  PKG_VERSION="2d1e16fe50b2c3a41108ca46c879124048334287"
+  PKG_VERSION="413993ab6fc97bbd3650d06ccb1a54a915f58fee"
   PKG_DEPENDS_TARGET+=" qt5"
   PKG_TOOLCHAIN="manual"
   make_target() {
diff --git a/packages/emulators/libretro/bsnes-lr/package.mk b/packages/emulators/libretro/bsnes-lr/package.mk
index 1fdc287470..3124f98743 100644
--- a/packages/emulators/libretro/bsnes-lr/package.mk
+++ b/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="6e73d33127a1e2e4b5e49f4aa4f0619364e473c2"
+PKG_VERSION="e71eca1199d1359af53c806811dc3f05c64f8d91"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/emulators/libretro/dosbox-pure-lr/package.mk b/packages/emulators/libretro/dosbox-pure-lr/package.mk
index 4092a3d10a..c8ab537ff1 100644
--- a/packages/emulators/libretro/dosbox-pure-lr/package.mk
+++ b/packages/emulators/libretro/dosbox-pure-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dosbox-pure-lr"
-PKG_VERSION="ec0c8e4798e207ae2b9cda2cd3e94d1d0e6a38c2"
+PKG_VERSION="3793b9f291f37d99f662de0d3058c6b0ac1607fc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/libretro/fake08-lr/package.mk b/packages/emulators/libretro/fake08-lr/package.mk
index 860502f298..636ceb0310 100644
--- a/packages/emulators/libretro/fake08-lr/package.mk
+++ b/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="b0f0f424b7cd4b53d4a7181e5677ea44747bf661"
+PKG_VERSION="8594cfd27029857d6e0937e8f35a88f652aadccc"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/jtothebell/fake-08"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
index 3ed72d8a30..c8dcf3193b 100644
--- a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
+++ b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="genesis-plus-gx-lr"
-PKG_VERSION="8d644682b6a88d662d1a07e063fa863633a99311"
+PKG_VERSION="3dc6af4b93b54ff524e7e93cc1407ad26c1f0340"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
diff --git a/packages/emulators/libretro/mame2003-plus-lr/package.mk b/packages/emulators/libretro/mame2003-plus-lr/package.mk
index f7a0f3d654..b7a4151097 100644
--- a/packages/emulators/libretro/mame2003-plus-lr/package.mk
+++ b/packages/emulators/libretro/mame2003-plus-lr/package.mk
@@ -21,7 +21,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus-lr"
-PKG_VERSION="e1719ffa2efe76549e57b833660e8f7cc517b391"
+PKG_VERSION="419021fc003bd00fee2ce896d3e802caa5d1274a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
diff --git a/packages/emulators/libretro/o2em-lr/package.mk b/packages/emulators/libretro/o2em-lr/package.mk
index 99e6d9e57c..a62e2ff44d 100644
--- a/packages/emulators/libretro/o2em-lr/package.mk
+++ b/packages/emulators/libretro/o2em-lr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="o2em-lr"
-PKG_VERSION="a2a12472fde910b6089ac3ca6de805bd58a9c999"
+PKG_VERSION="44fe5f306033242f7d74144105e19a7d4939477e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Artistic License"
diff --git a/packages/emulators/libretro/ppsspp-lr/package.mk b/packages/emulators/libretro/ppsspp-lr/package.mk
index ff7d629748..82a473e4b3 100644
--- a/packages/emulators/libretro/ppsspp-lr/package.mk
+++ b/packages/emulators/libretro/ppsspp-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp-lr"
-PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
+PKG_VERSION="e93f9f64cc3979ff7d1dddc2fbec7ddc410da3dc"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
diff --git a/packages/emulators/libretro/scummvm-lr/package.mk b/packages/emulators/libretro/scummvm-lr/package.mk
index c96c1054f0..f43bcc0965 100644
--- a/packages/emulators/libretro/scummvm-lr/package.mk
+++ b/packages/emulators/libretro/scummvm-lr/package.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="scummvm-lr"
-PKG_VERSION="c2f97be7773ca5b20ea52b070b19a9e546f1c876"
+PKG_VERSION="d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
diff --git a/packages/emulators/standalone/cemu-sa/package.mk b/packages/emulators/standalone/cemu-sa/package.mk
index df55e387a7..dece87c3d2 100644
--- a/packages/emulators/standalone/cemu-sa/package.mk
+++ b/packages/emulators/standalone/cemu-sa/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="cemu-sa"
-PKG_VERSION="d8b9a74"
+PKG_VERSION="f3c95f7"
 PKG_ARCH="x86_64"
 PKG_LICENSE="MPL-2.0"
 PKG_SITE="https://github.com/cemu-project/Cemu"
diff --git a/packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch b/packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch
deleted file mode 100644
index 2971389902..0000000000
--- a/packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/CemuApp.cpp
-+++ b/src/gui/CemuApp.cpp
-@@ -132,7 +132,6 @@
- 	{
- 		if (!wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) || !m_locale.Init(wxLANGUAGE_DEFAULT))
- 		{
--            m_locale.Init(wxLANGUAGE_ENGLISH);
-             m_locale.AddCatalogLookupPathPrefix(ActiveSettings::GetDataPath("resources").generic_string());
-             m_locale.AddCatalog("cemu");
- 		}
-
diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk
index 55b5639e7f..085f604c5e 100644
--- a/packages/emulators/standalone/flycast-sa/package.mk
+++ b/packages/emulators/standalone/flycast-sa/package.mk
@@ -4,7 +4,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="flycast-sa"
-PKG_VERSION="e96b38ff5c03e736d4990658d4163fa5dd58f002"
+PKG_VERSION="35b7be39053a7564026417c33a4b956fe23e2608"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
diff --git a/packages/emulators/standalone/ppsspp-sa/package.mk b/packages/emulators/standalone/ppsspp-sa/package.mk
index 8b7eebd4d9..cf84feec1e 100644
--- a/packages/emulators/standalone/ppsspp-sa/package.mk
+++ b/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="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3"
+PKG_VERSION="e93f9f64cc3979ff7d1dddc2fbec7ddc410da3dc"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"
diff --git a/packages/emulators/standalone/retroarch/package.mk b/packages/emulators/standalone/retroarch/package.mk
index 155c2287f8..fe8b98edb3 100644
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="retroarch"
-PKG_VERSION="7011d0c3de5be8e2a8244eda46d5055bb8f4e6be"
+PKG_VERSION="b53bce6877642b66739c82cee6c6af8d0a09ac1c"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
diff --git a/packages/emulators/standalone/yuzu-sa/package.mk b/packages/emulators/standalone/yuzu-sa/package.mk
index 0ec376dccc..1646a3fc2a 100644
--- a/packages/emulators/standalone/yuzu-sa/package.mk
+++ b/packages/emulators/standalone/yuzu-sa/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
 
 PKG_NAME="yuzu-sa"
-PKG_VERSION="53f904b740c00ee491565578012a8c739bd9ed77"
+PKG_VERSION="249db0a59bb4aadb031f270ed79044f91defb98d"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
diff --git a/packages/emulators/tools/retroarch-assets/package.mk b/packages/emulators/tools/retroarch-assets/package.mk
index 33e744d43b..5bcf1641f1 100644
--- a/packages/emulators/tools/retroarch-assets/package.mk
+++ b/packages/emulators/tools/retroarch-assets/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="retroarch-assets"
-PKG_VERSION="7b735ef18bcc6508b1c9a626eb237779ff787179"
+PKG_VERSION="39c44632e3be156246f2bd34cff08ac9f842126e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-assets"
 PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"
diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk
index 85b851535b..063c24fdba 100644
--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.4.16"
+PKG_VERSION="6.5.8"
 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"
diff --git a/packages/kernel/linux/patches/AMD64/007-asus-ally-cs35l41-6.3-with-asus-keys.patch b/packages/kernel/linux/patches/AMD64/007-asus-ally-cs35l41-6.3-with-asus-keys.patch
deleted file mode 100644
index 7593c0d2b5..0000000000
--- a/packages/kernel/linux/patches/AMD64/007-asus-ally-cs35l41-6.3-with-asus-keys.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
-index d1094bb1aa42..e74683295691 100644
---- a/drivers/hid/hid-asus.c
-+++ b/drivers/hid/hid-asus.c
-@@ -910,6 +910,11 @@ static int asus_input_mapping(struct hid_device *hdev,
- 
- 		/* Fn+Right Aura mode next on N-Key keyboard */
- 		case 0xb3: asus_map_key_clear(KEY_PROG3);		break;
-+		
-+		case 0xa5: asus_map_key_clear(KEY_F15);		break; /* ROG Ally left back */
-+		case 0xa6: asus_map_key_clear(KEY_F16);		break; /* ROG Ally QAM button */
-+		case 0xa7: asus_map_key_clear(KEY_F17);		break; /* ROG Ally ROG long-press */
-+		case 0xa8: asus_map_key_clear(KEY_F18);		break; /* ROG Ally ROG long-press-release */
- 
- 		default:
- 			/* ASUS lazily declares 256 usages, ignore the rest,
-@@ -1267,6 +1272,9 @@ static const struct hid_device_id asus_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
- 	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
-+	  { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-+	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY),
-+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
- 	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),
- 	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },
-diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index c2e9b6d1fd7d..cd6efa46a2bd 100644
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -207,6 +207,7 @@
- #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866
- #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6
-+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_ALLY	0x1abe
- #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b
- #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
- 
diff --git a/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch b/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch
deleted file mode 100644
index b66011a7f6..0000000000
--- a/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c linux-6.4.16/drivers/misc/cardreader/rts5227.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rts5227.c	2023-09-15 23:51:13.267034740 +0000
-@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct
- 		}
- 	}
- 
--	if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
-+	if (option->force_clkreq_0)
- 		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG,
- 				FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
- 	else
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c linux-6.4.16/drivers/misc/cardreader/rts5228.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rts5228.c	2023-09-15 23:51:13.267034740 +0000
-@@ -435,10 +435,17 @@ static void rts5228_init_from_cfg(struct
- 			option->ltr_enabled = false;
- 		}
- 	}
-+
-+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+				| PM_L1_1_EN | PM_L1_2_EN))
-+		option->force_clkreq_0 = false;
-+	else
-+		option->force_clkreq_0 = true;
- }
- 
- static int rts5228_extra_init_hw(struct rtsx_pcr *pcr)
- {
-+	struct rtsx_cr_option *option = &pcr->option;
- 
- 	rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1,
- 			CD_RESUME_EN_MASK, CD_RESUME_EN_MASK);
-@@ -469,6 +476,17 @@ static int rts5228_extra_init_hw(struct
- 	else
- 		rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
- 
-+	/*
-+	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-+	 * to drive low, and we forcibly request clock.
-+	 */
-+	if (option->force_clkreq_0)
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-+	else
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-+
- 	rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
- 
- 	if (pcr->rtd3_en) {
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c linux-6.4.16/drivers/misc/cardreader/rts5249.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rts5249.c	2023-09-15 23:51:13.267034740 +0000
-@@ -327,11 +327,12 @@ static int rts5249_extra_init_hw(struct
- 		}
- 	}
- 
-+
- 	/*
- 	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
- 	 * to drive low, and we forcibly request clock.
- 	 */
--	if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG)
-+	if (option->force_clkreq_0)
- 		rtsx_pci_write_register(pcr, PETXCFG,
- 			FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
- 	else
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c linux-6.4.16/drivers/misc/cardreader/rts5260.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rts5260.c	2023-09-15 23:51:13.267034740 +0000
-@@ -517,10 +517,17 @@ static void rts5260_init_from_cfg(struct
- 			option->ltr_enabled = false;
- 		}
- 	}
-+
-+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+				| PM_L1_1_EN | PM_L1_2_EN))
-+		option->force_clkreq_0 = false;
-+	else
-+		option->force_clkreq_0 = true;
- }
- 
- static int rts5260_extra_init_hw(struct rtsx_pcr *pcr)
- {
-+	struct rtsx_cr_option *option = &pcr->option;
- 
- 	/* Set mcu_cnt to 7 to ensure data can be sampled properly */
- 	rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07);
-@@ -539,6 +546,17 @@ static int rts5260_extra_init_hw(struct
- 
- 	rts5260_init_hw(pcr);
- 
-+	/*
-+	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-+	 * to drive low, and we forcibly request clock.
-+	 */
-+	if (option->force_clkreq_0)
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-+	else
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-+
- 	rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00);
- 
- 	return 0;
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c linux-6.4.16/drivers/misc/cardreader/rts5261.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rts5261.c	2023-09-15 23:51:13.267034740 +0000
-@@ -498,10 +498,17 @@ static void rts5261_init_from_cfg(struct
- 			option->ltr_enabled = false;
- 		}
- 	}
-+
-+	if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN
-+				| PM_L1_1_EN | PM_L1_2_EN))
-+		option->force_clkreq_0 = false;
-+	else
-+		option->force_clkreq_0 = true;
- }
- 
- static int rts5261_extra_init_hw(struct rtsx_pcr *pcr)
- {
-+	struct rtsx_cr_option *option = &pcr->option;
- 	u32 val;
- 
- 	rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1,
-@@ -547,6 +554,17 @@ static int rts5261_extra_init_hw(struct
- 	else
- 		rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00);
- 
-+	/*
-+	 * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced
-+	 * to drive low, and we forcibly request clock.
-+	 */
-+	if (option->force_clkreq_0)
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW);
-+	else
-+		rtsx_pci_write_register(pcr, PETXCFG,
-+				 FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
-+
- 	rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB);
- 
- 	if (pcr->rtd3_en) {
-diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c
---- linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c	2023-09-15 23:50:58.706129852 +0000
-+++ linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c	2023-09-15 23:51:13.271034986 +0000
-@@ -1326,11 +1326,8 @@ static int rtsx_pci_init_hw(struct rtsx_
- 			return err;
- 	}
- 
--	if (pcr->aspm_mode == ASPM_MODE_REG) {
-+	if (pcr->aspm_mode == ASPM_MODE_REG)
- 		rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30);
--		rtsx_pci_write_register(pcr, PETXCFG,
--				FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH);
--	}
- 
- 	/* No CD interrupt if probing driver with card inserted.
- 	 * So we need to initialize pcr->card_exist here.
diff --git a/packages/themes/es-theme-art-book-next/package.mk b/packages/themes/es-theme-art-book-next/package.mk
index 445971a6f5..c3e8c0c0d0 100644
--- a/packages/themes/es-theme-art-book-next/package.mk
+++ b/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="86369b3cc7c76a2b6921d5ec7010e0b363471754"
+PKG_VERSION="b9979c32d9ba25a31b28e9ff159e8397ca0b307a"
 PKG_ARCH="any"
 PKG_LICENSE="CUSTOM"
 PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos"

From 4186d5295701b0ac7fd7ec6f7aff001efe215154 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 22 Oct 2023 11:00:59 +0000
Subject: [PATCH 5/9] Bump Linux to 6.1.59 for S922X and RK3399.

---
 projects/Amlogic/packages/linux/package.mk  | 2 +-
 projects/Rockchip/packages/linux/package.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk
index ff882ed636..9e2cccabd0 100644
--- a/projects/Amlogic/packages/linux/package.mk
+++ b/projects/Amlogic/packages/linux/package.mk
@@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"
 
 case ${DEVICE} in
   S922X*)
-    PKG_VERSION="6.1.58"
+    PKG_VERSION="6.1.59"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
   ;;
 esac
diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk
index 6a434067a2..5f83149e15 100644
--- a/projects/Rockchip/packages/linux/package.mk
+++ b/projects/Rockchip/packages/linux/package.mk
@@ -37,7 +37,7 @@ case ${DEVICE} in
     PKG_GIT_CLONE_BRANCH="main"
   ;;
   RK33*)
-    PKG_VERSION="6.1.58"
+    PKG_VERSION="6.1.59"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
   ;;
 esac

From 52460ecf0cd964d9a2d7a800ebefd31a0f02fad0 Mon Sep 17 00:00:00 2001
From: adamg <adamg88@users.noreply.github.com>
Date: Sat, 21 Oct 2023 18:00:27 +0100
Subject: [PATCH 6/9] system-utils: do not execute headphone_sense on S922X if
 all the variables needed are not exported

---
 .../sysutils/system-utils/sources/devices/S922X/headphone_sense | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
index 4b5db1dc1d..1f31c0493b 100644
--- a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
+++ b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense
@@ -6,6 +6,8 @@
 # Source predefined functions and variables
 . /etc/profile
 
+[ -z "${DEVICE_PLAYBACK_PATH}" -o -z "${DEVICE_PLAYBACK_PATH_HP}" -o -z "${DEVICE_PLAYBACK_PATH_SPK}" ] && exit 0
+
 ### Set correct audio output device at boot.
 HEADPHONE_STATE=$(cat /sys/kernel/debug/gpio | grep HEADPHONE)
 if [[ "${HEADPHONE_STATE}" == *"hi"* ]]; then

From 06aa91b7fb97c6442f5110f3e85f966caaffb9cc Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sun, 22 Oct 2023 13:07:50 +0000
Subject: [PATCH 7/9] Fix start pico8.

---
 .../standalone/pico-8/sources/start_pico8.sh  | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh
index a95d51d16b..cbb5c1a3a5 100644
--- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh
+++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh
@@ -7,8 +7,14 @@
 
 GAME_DIR="/storage/roms/pico-8/"
 
-# All architectures should use the dynamic binary.
-STATIC_BIN="pico8_dyn"
+case ${HW_ARCH} in
+  aarch64)
+    STATIC_BIN="pico8_64"
+  ;;
+  *)
+    STATIC_BIN="pico8"
+  ;;
+esac
 
 # check if the file being launched contains "Splore" and if so launch Pico-8 Splore otherwise run the game directly
 shopt -s nocasematch
@@ -36,8 +42,17 @@ fi
 # store sdl_controllers in root directory so its shared across devices - will look to revisit this with controller refactor work
 cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${GAME_DIR}/sdl_controllers.txt
 
-# mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets.
-chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN}
+if [ -e "${LAUNCH_DIR}/pico8_dyn" ]
+then
+  chmod 0755 ${LAUNCH_DIR}/pico8_din
+  jslisten set "-9 pico8_dyn start_pico8.sh"
+  ${LAUNCH_DIR}/pico8_dyn -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
+fi
 
-jslisten set "-9 ${STATIC_BIN}"
-${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
+if [ ! "$?" = 0 ] && [ -e "${LAUNCH_DIR}/${STATIC_BIN}" ]
+then
+  # mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets.
+  chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN}
+  jslisten set "-9 ${STATIC_BIN} start_pico8.sh"
+  ${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
+fi

From dd9ce83b1447c43f335bff6b38feb988f0619fc3 Mon Sep 17 00:00:00 2001
From: anthonycaccese <anthonycaccese@gmail.com>
Date: Sun, 22 Oct 2023 10:20:18 -0400
Subject: [PATCH 8/9] Update start_pico8.sh

from testing on RGB30 and Loki Zero I am seeing the following:
aarch64 (which is I think covers all of our arm devices) needs and looks for the pico8_64 + pico8.dat files from the raspberry pi zip
x86 works with the pico8_dyn + pico8.dat files from the linux 64 zip

So with that in mind I think the changes in this commit cover those use cases.  I've tested on my RGB30, RG351P and Loki Zero and it looks to work well across each.
---
 .../standalone/pico-8/sources/start_pico8.sh  | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh
index cbb5c1a3a5..f6f49a3e02 100644
--- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh
+++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh
@@ -12,7 +12,7 @@ case ${HW_ARCH} in
     STATIC_BIN="pico8_64"
   ;;
   *)
-    STATIC_BIN="pico8"
+    STATIC_BIN="pico8_dyn"
   ;;
 esac
 
@@ -42,17 +42,7 @@ fi
 # store sdl_controllers in root directory so its shared across devices - will look to revisit this with controller refactor work
 cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${GAME_DIR}/sdl_controllers.txt
 
-if [ -e "${LAUNCH_DIR}/pico8_dyn" ]
-then
-  chmod 0755 ${LAUNCH_DIR}/pico8_din
-  jslisten set "-9 pico8_dyn start_pico8.sh"
-  ${LAUNCH_DIR}/pico8_dyn -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
-fi
-
-if [ ! "$?" = 0 ] && [ -e "${LAUNCH_DIR}/${STATIC_BIN}" ]
-then
-  # mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets.
-  chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN}
-  jslisten set "-9 ${STATIC_BIN} start_pico8.sh"
-  ${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
-fi
+# mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets.
+chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN}
+jslisten set "-9 ${STATIC_BIN} start_pico8.sh"
+${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}"
\ No newline at end of file

From bde7603f7b6a4109b0b3dba5168e087cf3907e33 Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Mon, 23 Oct 2023 00:16:51 +0000
Subject: [PATCH 9/9] Revert bluetooth changes as they're broken.

---
 .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md    |  6 ++--
 .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md   |  6 ++--
 .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md   |  6 ++--
 .../SUPPORTED_EMULATORS_AND_CORES.md          |  6 ++--
 .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md   |  6 ++--
 .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md   |  6 ++--
 packages/network/bluez/package.mk             |  2 +-
 .../bluez-13-configure-Check-ell-path.patch   | 34 +++++++++++++++++++
 8 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch

diff --git a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
index e4f27c2468..bd991e12ea 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md
@@ -51,7 +51,6 @@ This document describes all available systems emulators and cores available for
 |Microsoft|MSX (msx)|1983|`msx`|.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>|
@@ -107,8 +106,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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>|
@@ -119,7 +119,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
index 73e7b66e39..632ee8edb9 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -101,8 +100,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -110,7 +110,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
index 6077af1fce..210e021a2f 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -103,8 +102,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**retroarch:** beetle_psx<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -113,7 +113,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
index a4fef4059c..28bf929654 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -101,8 +100,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -110,7 +110,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
index a4fef4059c..28bf929654 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -101,8 +100,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -110,7 +110,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
index a223bc70a5..df99a8e39a 100644
--- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
+++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md
@@ -50,7 +50,6 @@ This document describes all available systems emulators and cores available for
 |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|MSX 2 (msx2)|1988|`msx2`|.dsk .mx1 .mx2 .rom .zip .7z .m3u|**retroarch:** bluemsx (default)<br>**retroarch:** fmsx<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>|
@@ -103,8 +102,9 @@ This document describes all available systems emulators and cores available for
 |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)<br>|
 |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse<br>|
 |Sinclair|ZX81 (zx81)|1981|`zx81`|.tzx .p .zip .7z|**retroarch:** 81 (default)<br>|
+|Smith Engineering|Vectrex (vectrex)|1982|`vectrex`|.bin .gam .vec .zip .7z|**retroarch:** vecx (default)<br>|
 |SNK|Neo Geo (neogeo)|1990|`neogeo`|.7z .zip|**retroarch:** fbneo (default)<br>**retroarch:** mame2003_plus<br>**retroarch:** fbalpha2012<br>**retroarch:** fbalpha2019<br>**retroarch:** mame2010<br>**retroarch:** mame2015<br>**retroarch:** mame<br>|
-|SNK|Neo Geo CD (neocd)|1990|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
+|SNK|Neo Geo CD (neocd)|1994|`neocd`|.cue .iso .chd|**retroarch:** neocd (default)<br>**retroarch:** fbneo<br>|
 |SNK|Neo Geo Pocket (ngp)|1998|`ngp`|.ngc .ngp .zip .7z|**retroarch:** beetle_ngp (default)<br>**retroarch:** race<br>|
 |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:** pcsx_rearmed32 (default)<br>**retroarch:** pcsx_rearmed<br>**retroarch:** beetle_psx<br>**duckstation:** duckstation-sa<br>**retroarch:** duckstation<br>**retroarch:** swanstation<br>|
@@ -113,7 +113,7 @@ This document describes all available systems emulators and cores available for
 |Sony|PSP Minis (pspminis)|2004|`pspminis`|.iso .cso .pbp|**ppsspp:** ppsspp-sa (default)<br>**retroarch:** ppsspp<br>|
 |Sun Microsystems|J2ME (j2me)|2002|`j2me`|.jar|**retroarch:** freej2me (default)<br>|
 |Various|EasyRPG (easyrpg)|2003|`easyrpg`|.zip .easyrpg .ldb|**retroarch:** easyrpg (default)<br>|
-|Various|OpenBOR (openbor)|2008|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
+|Various|OpenBOR (openbor)|2003|`openbor`|.pak|**OpenBOR:** OpenBOR (default)<br>|
 |Various|ScummVM (scummvm)|2001|`games`|.sh .svm .scummvm|**scummvmsa:** scummvm (default)<br>**retroarch:** scummvm<br>|
 |Watara|Supervision (supervision)|1992|`supervision`|.sv .zip .7z|**retroarch:** potator (default)<br>|
 |Welback Holdings|Mega Duck (megaduck)|1993|`megaduck`|.bin .zip .7z|**retroarch:** sameduck (default)<br>|
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 2c51d88738..9ace7412b8 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bluez"
-PKG_VERSION="5.69"
+PKG_VERSION="5.68"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
diff --git a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch b/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch
new file mode 100644
index 0000000000..bd9626e225
--- /dev/null
+++ b/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch
@@ -0,0 +1,34 @@
+From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 1 Jul 2023 01:31:20 +0000
+Subject: [PATCH] configure: Check ell path
+
+Use of AC_CHECK_FILE prevents cross compilation.
+Instead use test to support cross compiling.
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+---
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eff297960..bc7edfcd3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then
+ 	AC_SUBST(ELL_LIBS)
+ fi
+ if (test "${enable_external_ell}" != "yes"); then
+-	AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes,
+-			AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes,
+-				AC_MSG_ERROR(ELL source is required or use --enable-external-ell)))
++	if (test ! -f ${srcdir}/ell/ell.h) &&
++			(test ! -f ${srcdir}/../ell/ell/ell.h); then
++				AC_MSG_ERROR(ELL source is required or use --enable-external-ell)
++	fi
+ fi
+ AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" ||
+ 				(test "${enable_btpclient}" != "yes" &&
+-- 
+2.34.1
+