Merge pull request #2381 from JustEnoughLinuxOS/dev

PR for release
2023-11-15 22:00:47 -05:00 · 2023-11-15 22:00:47 -05:00 · c369679218
commit c369679218
parent 028b867f4c d56a3e4167
248 changed files with 1033 additions and 1572 deletions
--- a/distributions/JELOS/options
+++ b/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 SDL2-rotated retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls"
+    CLEAN_DEVICE_ROOT="linux u-boot SDL2 SDL2-rotated retroarch mupen64plus-sa-input-sdl flycast-sa duckstation-sa drastic-sa fileman oga_controls portmaster"
  fi

 # additional drivers to install:
--- 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="3cb169ea263c3cf9bb1461af291ab1461244b592"
+  PKG_VERSION="f374e88bac47910fca3221ff322d8d80ea23e40a"
  PKG_DEPENDS_TARGET+=" qt5"
  PKG_TOOLCHAIN="manual"
  make_target() {
--- a/packages/apps/portmaster/package.mk
+++ b/packages/apps/portmaster/package.mk
@ -5,12 +5,17 @@ PKG_NAME="portmaster"
 PKG_VERSION="8.5.2_0811"
 PKG_SITE="https://github.com/PortsMaster/PortMaster-GUI"
 PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/PortMaster.zip"
+COMPAT_URL="https://github.com/brooksytech/JelosAddOns/raw/main/compat.zip"
 PKG_LICENSE="MIT"
 PKG_ARCH="arm aarch64"
-PKG_DEPENDS_TARGET="toolchain gptokeyb gamecontrollerdb wget oga_controls libegl"
+PKG_DEPENDS_TARGET="toolchain gptokeyb gamecontrollerdb wget oga_controls control-gen"
 PKG_TOOLCHAIN="manual"
 PKG_LONGDESC="Portmaster - a simple tool that allows you to download various game ports"

+if [ "${DEVICE}" = "S922X" ]; then
+  PKG_DEPENDS_TARGET+=" libegl"
+fi
+
 makeinstall_target() {
  export STRIP=true
  mkdir -p ${INSTALL}/usr/config/PortMaster
@ -18,10 +23,14 @@ makeinstall_target() {

  mkdir -p ${INSTALL}/usr/bin
  cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin
-  chmod +x ${INSTALL}/usr/bin/start_portmaster.sh
+  chmod +x ${INSTALL}/usr/bin/*

  mkdir -p ${INSTALL}/usr/config/PortMaster/release
  curl -Lo ${INSTALL}/usr/config/PortMaster/release/PortMaster.zip ${PKG_URL}
+
+  mkdir -p ${INSTALL}/usr/lib/compat
+  curl -Lo ${PKG_BUILD}/compat.zip ${COMPAT_URL}
+  unzip -qq ${PKG_BUILD}/compat.zip -d ${INSTALL}/usr/lib/compat/
 }

 post_install() {
--- a/packages/apps/portmaster/scripts/portmaster_compatibility.sh
+++ b/packages/apps/portmaster/scripts/portmaster_compatibility.sh
@ -0,0 +1,27 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
+
+. /etc/profile
+
+PORTPLATFORM=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)
+
+if [[ "${UI_SERVICE}" =~ weston.service ]]; then
+case ${PORTPLATFORM} in
+  "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*")
+    #Fixing ports on S922X, exclude FNA games
+    for port in /storage/roms/ports/*.sh; do
+      if ! grep -q FNA "$port"; then
+  	    sed -i '/get_controls/c\get_controls && export SDL_VIDEO_GL_DRIVER=/usr/lib/egl/libGL.so.1 SDL_VIDEO_EGL_DRIVER=/usr/lib/egl/libEGL.so.1' "$port"
+        echo Fixing: "$port";
+      fi
+    done;
+  ;;
+  *)
+    #Remove gl4es libs on devices that support OpenGL
+    rm -rf /storage/roms/ports/*/lib*/libEGL*
+    rm -rf /storage/roms/ports/*/lib*/libGL*
+  ;;
+esac
+fi
--- a/packages/apps/portmaster/scripts/start_portmaster.sh
+++ b/packages/apps/portmaster/scripts/start_portmaster.sh
@ -8,7 +8,7 @@ jslisten set "PortMaster"

 #Make sure PortMaster exists in .config/PortMaster
 if [ ! -d "/storage/.config/PortMaster" ]; then
-    mkdir -p "/storage/.config/ports/PortMaster"
+    mkdir -p "/storage/.config/PortMaster"
      cp -r "/usr/config/PortMaster" "/storage/.config/"
 fi

@ -16,6 +16,7 @@ cd /storage/.config/PortMaster

 #Grab the latest control.txt
 cp /usr/config/PortMaster/control.txt control.txt
+cp /usr/config/PortMaster/mapper.txt mapper.txt

 #Use our gamecontrollerdb.txt
 rm -r gamecontrollerdb.txt
@ -32,6 +33,11 @@ if [ ! -d "/storage/roms/ports/PortMaster" ]; then
    chmod +x /storage/roms/ports/PortMaster/PortMaster.sh
 fi

+#We dont use tasksetter, delete it
+if [ ! -f /storage/roms/ports/PortMaster/tasksetter ]; then
+  rm -r /storage/roms/ports/PortMaster/tasksetter
+fi
+
 #Use PortMasters gptokeyb
 rm gptokeyb
 cp /storage/roms/ports/PortMaster/gptokeyb gptokeyb
@ -41,8 +47,25 @@ cp /storage/.config/PortMaster/control.txt /storage/roms/ports/PortMaster/contro
 cp /storage/.config/PortMaster/gamecontrollerdb.txt /storage/roms/ports/PortMaster/gamecontrollerdb.txt
 cp /usr/bin/oga_controls* /storage/roms/ports/PortMaster/

+#Hide PortMaster folder in ports
+if [ ! -f /storage/roms/ports/gamelist.xml ]; then
+echo "<gameList>
+	<folder>
+		<path>./PortMaster</path>
+		<name>PortMaster</name>
+		<hidden>true</hidden>
+	</folder>
+</gameList>" > /storage/roms/ports/gamelist.xml
+else
+  xmlstarlet ed --inplace -d  "/gameList/folder[name='PortMaster']" /storage/roms/ports/gamelist.xml
+  xmlstarlet ed --inplace -d  "/gameList/game[name='PortMaster']" /storage/roms/ports/gamelist.xml
+  xmlstarlet ed --inplace --subnode "/gameList" --type elem -n folder -v "" /storage/roms/ports/gamelist.xml
+  xmlstarlet ed --inplace --subnode "/gameList/folder[last()]" --type elem -n path -v "./PortMaster" /storage/roms/ports/gamelist.xml
+  xmlstarlet ed --inplace --subnode "/gameList/folder[last()]" --type elem -n name -v "PortMaster" /storage/roms/ports/gamelist.xml
+  xmlstarlet ed --inplace --subnode "/gameList/folder[last()]" --type elem -n hidden -v "true" /storage/roms/ports/gamelist.xml
+fi
+
 #Start PortMaster
@LIBEGL@
-
 cd /storage/roms/ports/PortMaster
 run ./PortMaster.sh 2>/dev/null
--- a/packages/apps/portmaster/sources/control.txt
+++ b/packages/apps/portmaster/sources/control.txt
@ -1,3 +1,8 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
+
 # This file can and should be sourced by ports for various parameters to 
 # minimize script customizations and allow for easier future updates
 # like adding additional supported devices.
@ -8,62 +13,87 @@
 # Source used for oga_controls available at
 # https://github.com/christianhaitian/oga_controls

+. /etc/profile
+
 directory="roms"
 controlfolder="/$directory/ports/PortMaster"
 ESUDO=""
-ESUDOKILL="-1" 
+ESUDOKILL="-1"
+SDLDBUSERFILE="/storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt"
+clibs="/usr/lib/compat/"
 raloc="/usr/bin"
 raconf="--config /storage/.config/retroarch/retroarch.cfg"
-pdevice=$(cat /sys/firmware/devicetree/base/model 2>/dev/null)
+pdevice=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)

 case ${pdevice} in
  "Anbernic RG552")
    profile="rg552"
+    lres="N"
+    sticks="2"
  ;;
  "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3")
    profile="s922x"
+    lres="N"
+    sticks="2"
  ;;
  "Powkiddy x55")
    profile="x55"
+    lres="N"
+    sticks="2"
  ;;
-  "Anbernic RG351*")
+  "Anbernic RG351M")
    profile="anbernic"
+    lres="Y"
+    sticks="2"
  ;;
-  "ODROID-GO Advance*")
+  "Anbernic RG351V")
+    profile="anbernic"
+    lres="N"
+    sticks="1"
+  ;;
+  "ODROID-GO Advance*"|"Powkiddy RGB10")
    profile="oga"
+    lres="Y"
+    sticks="1"
  ;;
  "ODROID-GO Super")
    profile="ogs"
+    lres="N"
+    sticks="2"
  ;;
  *)
    profile="rg552"
+    lres="N"
+    sticks="2"
  ;;
 esac

-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib32
-export SDL_GAMECONTROLLERCONFIG_FILE="$controlfolder/gamecontrollerdb.txt"

 get_controls() {

-    ANALOGSTICKS="2"
-    LOWRES="N"
+    ANALOGSTICKS="${sticks}"
+    LOWRES="${lres}"

-    DEVICE="${1}"
    param_device="${profile}"

+    GUID=$(control-gen | awk 'BEGIN {FS="\""} /^DEVICE/ {print $2;exit}')
+
    # Set file
    export SDL_GAMECONTROLLERCONFIG_FILE="/tmp/gamecontrollerdb.txt"

    # Spit the controller of the device our heuristics found (if it did).
-    if [[ ! -z ${DEVICE} ]]; then
-      grep "${SDLDBUSERFILE}" -e "${DEVICE}" > /tmp/gamecontrollerdb.txt
+    if [[ ! -z ${GUID} ]]; then
+      grep "${SDLDBUSERFILE}" -e "${GUID}" > /tmp/gamecontrollerdb.txt
    else
      echo "" > /tmp/gamecontrollerdb.txt
    fi

+    # Set compatability libs and run compatability script
+    export LD_LIBRARY_PATH=${clibs}
+    /usr/bin/portmaster_compatibility.sh
+
    # Now find any controller mapped on emulationstation...
-    /storage/.config/PortMaster/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
-    SDLDBUSERFILE="/storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt"
+    /storage/.config/PortMaster/mapper.txt SDL_GAMECONTROLLERCONFIG_FILE > /dev/null 2>&1

    # Some ports want SDL_GAMECONTROLLERCONFIG, so let's fill it in
    sdl_controllerconfig="$(< "${SDL_GAMECONTROLLERCONFIG_FILE}")"
--- a/packages/audio/bluez-alsa/package.mk
+++ b/packages/audio/bluez-alsa/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="bluez-alsa"
-PKG_VERSION="f7e6ee5"
+PKG_VERSION="b65a40f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Arkq/bluez-alsa"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/audio/fluidsynth/package.mk
+++ b/packages/audio/fluidsynth/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="fluidsynth"
-PKG_VERSION="2.3.3"
+PKG_VERSION="2.3.4"
 PKG_LICENSE="GPL"
 PKG_SITE="http://fluidsynth.org/"
 PKG_URL="https://github.com/FluidSynth/fluidsynth/archive/v${PKG_VERSION}.tar.gz"
--- a/packages/audio/libopenmpt/package.mk
+++ b/packages/audio/libopenmpt/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libopenmpt"
-PKG_VERSION="0.7.2"
+PKG_VERSION="0.7.3"
 PKG_LICENSE="BSD"
 PKG_SITE="https://lib.openmpt.org/libopenmpt/"
 PKG_URL="https://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"
--- a/packages/audio/libsndfile/package.mk
+++ b/packages/audio/libsndfile/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="libsndfile"
-PKG_VERSION="72f6af1"
+PKG_VERSION="e486f20"
 PKG_LICENSE="LGPL-2.1-or-later"
 PKG_SITE="https://libsndfile.github.io/libsndfile/"
 PKG_URL="https://github.com/libsndfile/libsndfile/archive/${PKG_VERSION}.tar.gz"
--- a/packages/audio/openal-soft/package.mk
+++ b/packages/audio/openal-soft/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="openal-soft"
-PKG_VERSION="de06eb7"
+PKG_VERSION="d441125"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openal.org/"
 PKG_URL="https://github.com/kcat/openal-soft/archive/${PKG_VERSION}.tar.gz"
--- a/packages/audio/pipewire/package.mk
+++ b/packages/audio/pipewire/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pipewire"
-PKG_VERSION="0.3.81"
+PKG_VERSION="0.3.84"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://pipewire.org"
 PKG_URL="https://github.com/PipeWire/pipewire/archive/${PKG_VERSION}.tar.gz"
--- a/packages/audio/pipewire/patches/001-pipewire-pulse.patch
+++ b/packages/audio/pipewire/patches/001-pipewire-pulse.patch
@ -1,7 +1,7 @@
-diff -rupN pipewire.orig/src/daemon/pipewire-pulse.conf.in pipewire/src/daemon/pipewire-pulse.conf.in
--- pipewire.orig/src/daemon/pipewire-pulse.conf.in	2023-08-07 01:36:39.320782246 +0000
-+++ pipewire/src/daemon/pipewire-pulse.conf.in	2023-08-07 22:04:21.956983916 +0000
-@@ -89,11 +89,11 @@ pulse.properties = {
+diff -rupN pipewire-0.3.84.orig/src/daemon/pipewire-pulse.conf.in pipewire-0.3.84/src/daemon/pipewire-pulse.conf.in
+--- pipewire-0.3.84.orig/src/daemon/pipewire-pulse.conf.in	2023-11-13 16:35:56.502690919 +0000
+++ pipewire-0.3.84/src/daemon/pipewire-pulse.conf.in	2023-11-13 16:36:28.096495134 +0000
+@@ -90,11 +90,11 @@ pulse.properties = {
         #"tcp:[::]:9999"                    # IPv6 on all addresses
         #"tcp:127.0.0.1:8888"               # IPv4 on a single address
         #
@ -18,9 +18,9 @@ diff -rupN pipewire.orig/src/daemon/pipewire-pulse.conf.in pipewire/src/daemon/p
     ]
     #server.dbus-name       = "org.pulseaudio.Server"
     #pulse.min.req          = 128/48000     # 2.7ms
-diff -rupN pipewire.orig/src/daemon/systemd/system/pipewire.service.in pipewire/src/daemon/systemd/system/pipewire.service.in
--- pipewire.orig/src/daemon/systemd/system/pipewire.service.in	2023-08-07 01:36:39.320782246 +0000
-+++ pipewire/src/daemon/systemd/system/pipewire.service.in	2023-08-07 22:19:22.589017591 +0000
+diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.service.in pipewire-0.3.84/src/daemon/systemd/system/pipewire.service.in
+--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.service.in	2023-11-13 16:35:56.502690919 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.service.in	2023-11-13 16:36:28.096495134 +0000
@@ -15,21 +15,24 @@ Description=PipeWire Multimedia Service
 Requires=pipewire.socket
 
@ -56,13 +56,13 @@ diff -rupN pipewire.orig/src/daemon/systemd/system/pipewire.service.in pipewire/
 -Also=pipewire.socket
 +Also=pipewire-pulse.socket
 WantedBy=default.target
-diff -rupN pipewire.orig/src/daemon/systemd/system/pipewire.socket pipewire/src/daemon/systemd/system/pipewire.socket
--- pipewire.orig/src/daemon/systemd/system/pipewire.socket	2023-08-07 01:36:39.320782246 +0000
-+++ pipewire/src/daemon/systemd/system/pipewire.socket	2023-08-07 22:38:25.418008336 +0000
-@@ -4,8 +4,8 @@ Description=PipeWire Multimedia System S
- [Socket]
+diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket
+--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket	2023-11-13 16:35:56.502690919 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket	2023-11-13 16:36:58.434228383 +0000
+@@ -5,8 +5,8 @@ Description=PipeWire Multimedia System S
 Priority=6
 ListenStream=%t/pipewire/pipewire-0
+ ListenStream=%t/pipewire/pipewire-0-manager
 -SocketUser=pipewire
 -SocketGroup=pipewire
 +SocketUser=root
@ -70,3 +70,20 @@ diff -rupN pipewire.orig/src/daemon/systemd/system/pipewire.socket pipewire/src/
 SocketMode=0660
 
 [Install]
+diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket.rej pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket.rej
+--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket.rej	1970-01-01 00:00:00.000000000 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket.rej	2023-11-13 16:36:28.096495134 +0000
+@@ -0,0 +1,13 @@
+--- src/daemon/systemd/system/pipewire.socket	2023-08-07 01:36:39.320782246 +0000
++++ src/daemon/systemd/system/pipewire.socket	2023-08-07 22:38:25.418008336 +0000
+@@ -4,8 +4,8 @@ Description=PipeWire Multimedia System S
+ [Socket]
+ Priority=6
+ ListenStream=%t/pipewire/pipewire-0
+-SocketUser=pipewire
+-SocketGroup=pipewire
++SocketUser=root
++SocketGroup=root
+ SocketMode=0660
+ 
+ [Install]
--- a/packages/audio/wireplumber/package.mk
+++ b/packages/audio/wireplumber/package.mk
@ -2,8 +2,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="wireplumber"
-PKG_VERSION="0.4.14"
-PKG_SHA256="b160424ce7c3eeeccba388726f6a448f53501d25085e5fa1bf6c690c1bcd85ea"
+PKG_VERSION="0.4.15"
 PKG_LICENSE="MIT"
 PKG_SITE="https://gitlab.freedesktop.org/pipewire/wireplumber"
 PKG_URL="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
--- a/packages/audio/wireplumber/patches/001-fix-service.patch
+++ b/packages/audio/wireplumber/patches/001-fix-service.patch
@ -1,17 +1,7 @@
-diff -rupN wireplumber.orig/src/systemd/system/wireplumber.service.in wireplumber/src/systemd/system/wireplumber.service.in
--- wireplumber.orig/src/systemd/system/wireplumber.service.in	2023-08-07 22:20:40.224986070 +0000
-+++ wireplumber/src/systemd/system/wireplumber.service.in	2023-08-07 22:37:50.340093097 +0000
-@@ -5,19 +5,16 @@ BindsTo=pipewire.service
- Conflicts=pipewire-media-session.service
- 
- [Service]
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-RestrictNamespaces=yes
-SystemCallArchitectures=native
-SystemCallFilter=@system-service
- Type=simple
+diff -rupN wireplumber-0.4.15.orig/src/systemd/system/wireplumber.service.in wireplumber-0.4.15/src/systemd/system/wireplumber.service.in
+--- wireplumber-0.4.15.orig/src/systemd/system/wireplumber.service.in	2023-11-13 16:40:22.585908363 +0000
+++ wireplumber-0.4.15/src/systemd/system/wireplumber.service.in	2023-11-13 16:42:13.896286333 +0000
+@@ -14,9 +14,12 @@ Type=simple
 AmbientCapabilities=CAP_SYS_NICE
 ExecStart=@WP_BINARY@
 Restart=on-failure
@ -25,10 +15,10 @@ diff -rupN wireplumber.orig/src/systemd/system/wireplumber.service.in wireplumbe
 
 [Install]
 WantedBy=pipewire.service
-diff -rupN wireplumber.orig/src/systemd/system/wireplumber@.service.in wireplumber/src/systemd/system/wireplumber@.service.in
--- wireplumber.orig/src/systemd/system/wireplumber@.service.in	2023-08-07 22:20:40.224986070 +0000
-+++ wireplumber/src/systemd/system/wireplumber@.service.in	2023-08-07 22:37:43.927743110 +0000
-@@ -20,7 +20,7 @@ Type=simple
+diff -rupN wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in
+--- wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in	2023-11-13 16:40:22.585908363 +0000
+++ wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in	2023-11-13 16:41:37.274187302 +0000
+@@ -19,7 +19,7 @@ Type=simple
 AmbientCapabilities=CAP_SYS_NICE
 ExecStart=@WP_BINARY@ -c %i.conf
 Restart=on-failure
@ -37,3 +27,34 @@ diff -rupN wireplumber.orig/src/systemd/system/wireplumber@.service.in wireplumb
 Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
 Environment=GIO_USE_VFS=local
 
+diff -rupN wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in.orig wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in.orig
+--- wireplumber-0.4.15.orig/src/systemd/system/wireplumber@.service.in.orig	1970-01-01 00:00:00.000000000 +0000
+++ wireplumber-0.4.15/src/systemd/system/wireplumber@.service.in.orig	2023-10-12 16:24:26.000000000 +0000
+@@ -0,0 +1,27 @@
+# Service file to run WirePlumber in split mode, i.e. run multiple
+# WirePlumber instances with different module sets.
+# The template argument is used to load the configuration file, e.g.
+# wireplumber@main.service loads main.conf,
+# wireplumber@policy.service loads policy.conf, etc.
+[Unit]
+Description=Multimedia Service Session Manager (%i)
+After=pipewire.service
+BindsTo=pipewire.service
+Conflicts=pipewire-media-session.service
+
+[Service]
+LockPersonality=yes
+MemoryDenyWriteExecute=yes
+NoNewPrivileges=yes
+SystemCallArchitectures=native
+SystemCallFilter=@system-service
+Type=simple
+AmbientCapabilities=CAP_SYS_NICE
+ExecStart=@WP_BINARY@ -c %i.conf
+Restart=on-failure
+User=pipewire
+Environment=PIPEWIRE_RUNTIME_DIR=%t/pipewire
+Environment=GIO_USE_VFS=local
+
+[Install]
+WantedBy=pipewire.service
--- a/packages/compat/box64/package.mk
+++ b/packages/compat/box64/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="box64"
-PKG_VERSION="0499c38466ca094b230ec6c825ec96ddcd987892"
+PKG_VERSION="13612d4024c50dbc79c5900e1cf1d8b5319ae1ba"
 PKG_ARCH="aarch64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ptitSeb/box64"
--- a/packages/compat/box86/package.mk
+++ b/packages/compat/box86/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="box86"
-PKG_VERSION="a0a3389651998481f2ab2adb35e07bfcc5c26820"
+PKG_VERSION="150b035a1bd492f67e852502551df168737ad069"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ptitSeb/box86"
--- a/packages/debug/strace/package.mk
+++ b/packages/debug/strace/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="strace"
-PKG_VERSION="6.5"
+PKG_VERSION="6.6"
 PKG_LICENSE="BSD"
 PKG_SITE="https://strace.io/"
 PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz"
--- a/packages/devel/SDL2_gfx/package.mk
+++ b/packages/devel/SDL2_gfx/package.mk
@ -2,8 +2,7 @@
 # Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert)

 PKG_NAME="SDL2_gfx"
-PKG_VERSION="16fa07d08e7cee5ad7dc815cfd1f4816e36cc73c"
-PKG_SHA256="6be035fb9f59e3c80503c6fd20fd59354338df56b7839e87d13d1e2a8102dec4"
+PKG_VERSION="29927b3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/jjYBdx4IL/SDL2_gfx"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
@ -11,8 +10,9 @@ PKG_DEPENDS_TARGET="toolchain SDL2"
 PKG_LONGDESC="SDL_image is an image file loading library. "
 PKG_TOOLCHAIN="configure"

-pre_configure_target() {
-export CC=${CC}
-}
 PKG_CONFIGURE_OPTS_TARGET=" --disable-mmx"

+pre_configure_target() {
+  export CC=${CC}
+}
+
--- a/packages/devel/ccache/package.mk
+++ b/packages/devel/ccache/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="ccache"
-PKG_VERSION="4.8.2"
+PKG_VERSION="4.8.3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://ccache.dev/download.html"
 PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/devel/configtools/package.mk
+++ b/packages/devel/configtools/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="configtools"
-PKG_VERSION="d4e37b5868ef910e3e52744c34408084bb13051c"
+PKG_VERSION="28ea239c53a2d5d8800c472bc2452eaa16e37af2"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.savannah.gnu.org/cgit/config.git"
 PKG_URL="http://git.savannah.gnu.org/cgit/config.git/snapshot/config-${PKG_VERSION}.tar.gz"
--- a/packages/devel/cups/package.mk
+++ b/packages/devel/cups/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="cups"
-PKG_VERSION="2.4.6"
+PKG_VERSION="2.4.7"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"
--- a/packages/devel/ecm/package.mk
+++ b/packages/devel/ecm/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="ecm"
-PKG_VERSION="v5.109.0"
+PKG_VERSION="v5.112.0"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/KDE/extra-cmake-modules"
--- a/packages/devel/elfutils/package.mk
+++ b/packages/devel/elfutils/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="elfutils"
-PKG_VERSION="0.189"
+PKG_VERSION="0.190"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceware.org/elfutils/"
 PKG_URL="https://sourceware.org/elfutils/ftp/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
--- a/packages/devel/gettext/package.mk
+++ b/packages/devel/gettext/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="gettext"
-PKG_VERSION="0.22"
+PKG_VERSION="0.22.3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gnu.org/s/gettext/"
 PKG_URL="https://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="glib"
-PKG_VERSION="2.77.1"
+PKG_VERSION="2.78.1"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://www.gtk.org/"
 PKG_URL="https://download.gnome.org/sources/glib/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@ -35,4 +35,6 @@ post_makeinstall_target() {
  rm -rf ${INSTALL}/usr/lib/glib-2.0
  rm -rf ${INSTALL}/usr/lib/installed-tests
  rm -rf ${INSTALL}/usr/share
+
+  sed -e "s#bindir=\${prefix}/bin#bindir=${TOOLCHAIN}/bin#" -i "${SYSROOT_PREFIX}/usr/lib/pkgconfig/"{gio,glib}-2.0.pc
 }
--- a/packages/devel/glibc/patches/aarch64/001-guard-off-vector-types.patch
+++ b/packages/devel/glibc/patches/aarch64/001-guard-off-vector-types.patch
@ -0,0 +1,95 @@
+[RFC PATCH] arm64/math-vec.h: guard off the vector types with CPP constants
+
+Simon Chopin simon.chopin@canonical.com
+Wed Sep 27 14:18:39 GMT 2023
+Previous message (by thread): [RFC PATCH] pthread_create: Name stacks in /proc/<pid>/maps
+Next message (by thread): [RFC PATCH] arm64/math-vec.h: guard off the vector types with CPP constants
+Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+When implementing a C parser, it's apparently common to use GCC as
+preprocessor. However, those programs don't necessarily define the SIMD
+intrinsic types exposed by GCC, resulting in failed compilations.
+
+This patch adds a way for those users to bypass entirely the vector
+types, as they usually aren't interested in libmvec anyway. They can
+just add -D__ARM_VEC_MATH_DISABLED=1 to the CPP_FLAGS they pass on to
+GCC.
+
+Fixes: BZ #25422
+
+Signed-off-by: Simon Chopin <simon.chopin@canonical.com>
+---
+ sysdeps/aarch64/fpu/bits/math-vector.h | 32 ++++++++++++++------------
+ 1 file changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h
+index 7c200599c1..c739e6bc5d 100644
+--- a/sysdeps/aarch64/fpu/bits/math-vector.h
+++ b/sysdeps/aarch64/fpu/bits/math-vector.h
+@@ -25,29 +25,30 @@
+ /* Get default empty definitions for simd declarations.  */
+ #include <bits/libm-simd-decl-stubs.h>
+ 
+-#if __GNUC_PREREQ(9, 0)
+-#  define __ADVSIMD_VEC_MATH_SUPPORTED
+#if defined __ARM_ARCH_8A && !defined __ARM_VEC_MATH_DISABLED
+#  if __GNUC_PREREQ(9, 0)
+#    define __ADVSIMD_VEC_MATH_SUPPORTED
+ typedef __Float32x4_t __f32x4_t;
+ typedef __Float64x2_t __f64x2_t;
+-#elif __glibc_clang_prereq(8, 0)
+-#  define __ADVSIMD_VEC_MATH_SUPPORTED
+#  elif __glibc_clang_prereq(8, 0)
+#    define __ADVSIMD_VEC_MATH_SUPPORTED
+ typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t;
+ typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t;
+-#endif
+#  endif
+ 
+-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)
+-#  define __SVE_VEC_MATH_SUPPORTED
+#  if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)
+#    define __SVE_VEC_MATH_SUPPORTED
+ typedef __SVFloat32_t __sv_f32_t;
+ typedef __SVFloat64_t __sv_f64_t;
+ typedef __SVBool_t __sv_bool_t;
+-#endif
+#  endif
+ 
+ /* If vector types and vector PCS are unsupported in the working
+    compiler, no choice but to omit vector math declarations.  */
+ 
+-#ifdef __ADVSIMD_VEC_MATH_SUPPORTED
+#  ifdef __ADVSIMD_VEC_MATH_SUPPORTED
+ 
+-#  define __vpcs __attribute__ ((__aarch64_vector_pcs__))
+#    define __vpcs __attribute__ ((__aarch64_vector_pcs__))
+ 
+ __vpcs __f32x4_t _ZGVnN4v_cosf (__f32x4_t);
+ __vpcs __f32x4_t _ZGVnN4v_expf (__f32x4_t);
+@@ -59,10 +60,10 @@ __vpcs __f64x2_t _ZGVnN2v_exp (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_log (__f64x2_t);
+ __vpcs __f64x2_t _ZGVnN2v_sin (__f64x2_t);
+ 
+-#  undef __ADVSIMD_VEC_MATH_SUPPORTED
+-#endif /* __ADVSIMD_VEC_MATH_SUPPORTED */
+#    undef __ADVSIMD_VEC_MATH_SUPPORTED
+#  endif /* __ADVSIMD_VEC_MATH_SUPPORTED */
+ 
+-#ifdef __SVE_VEC_MATH_SUPPORTED
+#  ifdef __SVE_VEC_MATH_SUPPORTED
+ 
+ __sv_f32_t _ZGVsMxv_cosf (__sv_f32_t, __sv_bool_t);
+ __sv_f32_t _ZGVsMxv_expf (__sv_f32_t, __sv_bool_t);
+@@ -74,5 +75,6 @@ __sv_f64_t _ZGVsMxv_exp (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_log (__sv_f64_t, __sv_bool_t);
+ __sv_f64_t _ZGVsMxv_sin (__sv_f64_t, __sv_bool_t);
+ 
+-#  undef __SVE_VEC_MATH_SUPPORTED
+-#endif /* __SVE_VEC_MATH_SUPPORTED */
+#    undef __SVE_VEC_MATH_SUPPORTED
+#  endif /* __SVE_VEC_MATH_SUPPORTED */
+#endif /* _ARM_ARCH_8A && !__ARM_VEC_MATH_DISABLED */
+
+base-commit: 64b1a44183a3094672ed304532bedb9acc707554
+-- 
+2.40.1
--- a/packages/devel/gobject-introspection/package.mk
+++ b/packages/devel/gobject-introspection/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2020-present Team CoreELEC (https://coreelec.org)

 PKG_NAME="gobject-introspection"
-PKG_VERSION="1.76.1"
+PKG_VERSION="1.78.1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
--- a/packages/devel/gperftools/package.mk
+++ b/packages/devel/gperftools/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Team CoreELEC (https://coreelec.org)

 PKG_NAME="gperftools"
-PKG_VERSION="2.11"
+PKG_VERSION="2.13"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/gperftools/gperftools"
 PKG_URL="https://github.com/gperftools/gperftools/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz"
--- a/packages/devel/heimdal/package.mk
+++ b/packages/devel/heimdal/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="heimdal"
-PKG_VERSION="f62e2f278437ff6c03d2d09bd628381c795bba78"
+PKG_VERSION="a3878d3"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="http://www.h5l.org/"
 PKG_URL="https://github.com/heimdal/heimdal/archive/${PKG_VERSION}.tar.gz"
--- a/packages/devel/hidapi/package.mk
+++ b/packages/devel/hidapi/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="hidapi"
-PKG_VERSION="d3013f0"
+PKG_VERSION="1ba21cee743b927004e641409b87e5fcc50f3736"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libusb/hidapi"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/devel/json-glib/package.mk
+++ b/packages/devel/json-glib/package.mk
@ -2,8 +2,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="json-glib"
-PKG_VERSION="1.6.6"
-PKG_SHA256="bf4d1cd6c343ce13b9258e6703a0411a3b659887b65877e85a2aa488ae18b865"
+PKG_VERSION="1.8.0"
 PKG_LICENSE="LGPL-2.1"
 PKG_SITE="https://github.com/GNOME/json-glib"
 PKG_URL="https://github.com/GNOME/json-glib/archive/${PKG_VERSION}.tar.gz"
--- a/packages/devel/libp11-kit/package.mk
+++ b/packages/devel/libp11-kit/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="libp11-kit"
-PKG_VERSION="b6411d7"
+PKG_VERSION="66d6b42"
 PKG_LICENSE="libp11-kit"
 PKG_SITE="https://github.com/p11-glue/p11-kit"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/devel/libserialport/package.mk
+++ b/packages/devel/libserialport/package.mk
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0

 PKG_NAME="libserialport"
-PKG_VERSION="6f9b03e"
+PKG_VERSION="fd20b0f"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/sigrokproject/libserialport"
 PKG_URL="${PKG_SITE}.git"
@ -14,4 +14,4 @@ make_target() {

  ./autogen.sh
  ./configure --host=${TARGET_NAME} --with-sysroot=${SYSROOT_PREFIX} --prefix=/usr
-}
+}
--- a/packages/devel/mold/package.mk
+++ b/packages/devel/mold/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="mold"
-PKG_VERSION="2.1.0"
+PKG_VERSION="2.3.2"
 PKG_LICENSE="AGPL-3.0-or-later"
 PKG_SITE="https://github.com/rui314/mold"
 PKG_URL="https://github.com/rui314/mold/archive/refs/tags/v${PKG_VERSION}.tar.gz"
--- a/packages/devel/mpfr/package.mk
+++ b/packages/devel/mpfr/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="mpfr"
-PKG_VERSION="4.2.0"
+PKG_VERSION="4.2.1"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mpfr.org/"
 PKG_URL="http://ftpmirror.gnu.org/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/devel/parallel/package.mk
+++ b/packages/devel/parallel/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="parallel"
-PKG_VERSION="20230722"
+PKG_VERSION="20231022"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://www.gnu.org/software/parallel/"
 PKG_URL="http://ftpmirror.gnu.org/parallel/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
--- a/packages/devel/qt5/package.mk
+++ b/packages/devel/qt5/package.mk
@ -3,14 +3,14 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="qt5"
-PKG_VERSION="8e65ddffeaf77b312c26d3097c26e525b7c5e220"
+PKG_VERSION="6508627d500d3f7b9a4f7b12019476e982abfa50"
 PKG_LICENSE="GPL"
 PKG_SITE="http://qt-project.org"
 PKG_URL="https://invent.kde.org/qt/qt/qt5.git"
 PKG_DEPENDS_TARGET="toolchain openssl libjpeg-turbo libpng pcre2 sqlite zlib freetype SDL2 libxkbcommon gstreamer gst-plugins-base gst-plugins-good gst-libav"
 PKG_LONGDESC="A cross-platform application and UI framework"
 GET_HANDLER_SUPPORT="git"
-PKG_GIT_CLONE_BRANCH="kde/5.15"
+PKG_GIT_CLONE_BRANCH="5.15"
 PKG_GIT_CLONE_SINGLE="yes"

 post_unpack() {
--- a/packages/devel/shared-mime-info/package.mk
+++ b/packages/devel/shared-mime-info/package.mk
@ -2,8 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="shared-mime-info"
-PKG_VERSION="2.2"
-PKG_SHA256="418c480019d9865f67f922dfb88de00e9f38bf971205d55cdffab50432919e61"
+PKG_VERSION="2.4"
 PKG_LICENSE="GPL-2.0-only"
 PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
 PKG_URL="https://gitlab.freedesktop.org/xdg/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
--- a/packages/emulators/libretro/bluemsx-lr/package.mk
+++ b/packages/emulators/libretro/bluemsx-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="bluemsx-lr"
-PKG_VERSION="ce9b5a8dd1661423226e1099e09cee1a4ae9eb2c"
+PKG_VERSION="e8a4280bcbd149d1e020adcd9469ad9d8bd67412"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/bsnes-lr/package.mk
+++ b/packages/emulators/libretro/bsnes-lr/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="bsnes-lr"
-PKG_VERSION="0685381e42f1c84b88d67f799bf05ecc69e9bc3a"
+PKG_VERSION="32885e1fbad194d4b3d526b45dfde643461fe2e3"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/bsnes-libretro"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
--- 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="a6ac7fdd94c9e8c8a7be8d9958174425a473ba06"
+PKG_VERSION="9b1f577b0fb7879457ff0d91434eca4a04f3ab18"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/fbneo-lr/package.mk
+++ b/packages/emulators/libretro/fbneo-lr/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="fbneo-lr"
-PKG_VERSION="091431b455303e5e6cea4ad10152034b89ba2f61"
+PKG_VERSION="367cea62fadaa2d227e8d8d3b391b20e7d4e8fd4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/emulators/libretro/fceumm-lr/package.mk
+++ b/packages/emulators/libretro/fceumm-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="fceumm-lr"
-PKG_VERSION="7fad08e5522e5396a1196055fc106be9b5d5de77"
+PKG_VERSION="76bde1c45707db6c5947c35b9c3e46dea4eb6258"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/gambatte-lr/package.mk
+++ b/packages/emulators/libretro/gambatte-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="gambatte-lr"
-PKG_VERSION="40d0d7ac4e11b5c2d1feac2ce96e4d824c248985"
+PKG_VERSION="ee52f204d0a9aea5b0e81b2fde95c71fdd0cb3ce"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- 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="3dc6af4b93b54ff524e7e93cc1407ad26c1f0340"
+PKG_VERSION="31add24676ba2f2401ff68e4d10cea05b8666ac0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- 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="156b3873fbf45a582283f376dd1e410c532b7c88"
+PKG_VERSION="c05ce28cbaa113041634add4ee8cb43c0e8aa9b7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"
--- a/packages/emulators/libretro/picodrive-lr/package.mk
+++ b/packages/emulators/libretro/picodrive-lr/package.mk
@ -1,5 +1,5 @@
 PKG_NAME="picodrive-lr"
-PKG_VERSION="570319349588288f64c676123244acdb0be33881"
+PKG_VERSION="6101a0052d9a49bc9f5a5f97f1369a41726f25d6"
 PKG_LICENSE="MAME"
 PKG_SITE="https://github.com/libretro/picodrive"
 PKG_URL="${PKG_SITE}.git"
--- 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="157fabf91b959305af7bde3b124df3a15524fed4"
+PKG_VERSION="bfd11153dbe3fcd0a72aeaea4789518f9cd6631b"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
--- a/packages/emulators/libretro/puae-lr/package.mk
+++ b/packages/emulators/libretro/puae-lr/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="puae-lr"
-PKG_VERSION="e13578877d1764bde7d6fb5b404c0965fa209540"
+PKG_VERSION="9332f19b8c7386c69508cc51aca21c747629690d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/puae2021-lr/package.mk
+++ b/packages/emulators/libretro/puae2021-lr/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="puae2021-lr"
-PKG_VERSION="24363c837afed0e62c476de9246b67c5e7b0ee09"
+PKG_VERSION="82ec6148d219904365d8ea7bff718803a4bfa415"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- 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="d836ec97edb3aca21ab1d2aea6a4dbf00420cbf9"
+PKG_VERSION="3e493563abfa34704b563bddd42f746f4697838b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/slang-shaders/package.mk
+++ b/packages/emulators/libretro/slang-shaders/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="slang-shaders"
-PKG_VERSION="3c281372a31e7cc72fdbea699dc09047439386ce"
+PKG_VERSION="c99e2ca5ea2fb179ba40a794d06e11615869986a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/stella-lr/package.mk
+++ b/packages/emulators/libretro/stella-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="stella-lr"
-PKG_VERSION="341c6d860cdb028f29caf8bb30e9acd3d8521ac1"
+PKG_VERSION="3544270f586d1984f6d272b8edd43b08934b25a6"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
--- a/packages/emulators/libretro/swanstation-lr/package.mk
+++ b/packages/emulators/libretro/swanstation-lr/package.mk
@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)

 PKG_NAME="swanstation-lr"
-PKG_VERSION="afb6bc73c7ce522190b19ec3e3c8a14eb264bdeb"
+PKG_VERSION="6a8c32bb17df77e512a434f622ece1957f391ad8"
 PKG_ARCH=""
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/swanstation"
--- a/packages/emulators/libretro/tic80-lr/package.mk
+++ b/packages/emulators/libretro/tic80-lr/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="tic80-lr"
-PKG_VERSION="0937023babce9dd55eba5ada4b46c2f98b740324"
+PKG_VERSION="5061bb221fb8cd2e116efbe14295d7e3af198118"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/emulators/libretro/vice-lr/package.mk
+++ b/packages/emulators/libretro/vice-lr/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="vice-lr"
-PKG_VERSION="f3542eb9ce3ad7284e2bb69e68bbc10596774b40"
+PKG_VERSION="29759d81dbe1086215a205d644a60c92905c4fb3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh
+++ b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh
@ -18,7 +18,7 @@ fi

 #Create PS2 savestates folder
 if [ ! -d "/storage/roms/savestates/ps2" ]; then
-    mkdir -p "/storage/roms/savestastes/ps2"
+    mkdir -p "/storage/roms/savestates/ps2"
 fi

 #Set the cores to use
--- a/packages/emulators/standalone/citra-sa/patches/001-revert-renderer-vulkan-fixup.patch
+++ b/packages/emulators/standalone/citra-sa/patches/001-revert-renderer-vulkan-fixup.patch
@ -0,0 +1,339 @@
+diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
+index ca2289b79..83dd77594 100644
+--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
+@@ -686,9 +686,9 @@ void GRenderWindow::CaptureScreenshot(u32 res_scale, const QString& screenshot_p
+     screenshot_image = QImage(QSize(layout.width, layout.height), QImage::Format_RGB32);
+     system.Renderer().RequestScreenshot(
+         screenshot_image.bits(),
+-        [this, screenshot_path](bool invert_y) {
+        [this, screenshot_path] {
+             const std::string std_screenshot_path = screenshot_path.toStdString();
+-            if (screenshot_image.mirrored(false, invert_y).save(screenshot_path)) {
+            if (screenshot_image.mirrored(false, true).save(screenshot_path)) {
+                 LOG_INFO(Frontend, "Screenshot saved to \"{}\"", std_screenshot_path);
+             } else {
+                 LOG_ERROR(Frontend, "Failed to save screenshot to \"{}\"", std_screenshot_path);
+diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
+index 112d95436..79986592b 100644
+--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
+@@ -59,7 +59,7 @@ bool RendererBase::IsScreenshotPending() const {
+     return settings.screenshot_requested;
+ }
+ 
+-void RendererBase::RequestScreenshot(void* data, std::function<void(bool)> callback,
+void RendererBase::RequestScreenshot(void* data, std::function<void()> callback,
+                                      const Layout::FramebufferLayout& layout) {
+     if (settings.screenshot_requested) {
+         LOG_ERROR(Render, "A screenshot is already requested or in progress, ignoring the request");
+diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
+index 55cb90d0b..d6958ec1e 100644
+--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
+@@ -28,7 +28,7 @@ struct RendererSettings {
+     // Screenshot
+     std::atomic_bool screenshot_requested{false};
+     void* screenshot_bits{};
+-    std::function<void(bool)> screenshot_complete_callback;
+    std::function<void()> screenshot_complete_callback;
+     Layout::FramebufferLayout screenshot_framebuffer_layout;
+     // Renderer
+     std::atomic_bool bg_color_update_requested{false};
+@@ -103,7 +103,7 @@ public:
+     [[nodiscard]] bool IsScreenshotPending() const;
+ 
+     /// Request a screenshot of the next frame
+-    void RequestScreenshot(void* data, std::function<void(bool)> callback,
+    void RequestScreenshot(void* data, std::function<void()> callback,
+                            const Layout::FramebufferLayout& layout);
+ 
+ protected:
+diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
+index c58f07a2c..f94109378 100644
+--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
+@@ -151,7 +151,7 @@ void RendererOpenGL::RenderScreenshot() {
+         state.Apply();
+         glDeleteRenderbuffers(1, &renderbuffer);
+ 
+-        settings.screenshot_complete_callback(true);
+        settings.screenshot_complete_callback();
+     }
+ }
+ 
+diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+index 5986b3b7e..7c82b8bcc 100644
+--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+@@ -6,7 +6,6 @@
+ #include "common/logging/log.h"
+ #include "common/microprofile.h"
+ #include "common/settings.h"
+-#include "common/texture.h"
+ #include "core/core.h"
+ #include "core/frontend/emu_window.h"
+ #include "core/hw/gpu.h"
+@@ -19,7 +18,6 @@
+ #include "video_core/host_shaders/vulkan_present_frag_spv.h"
+ #include "video_core/host_shaders/vulkan_present_interlaced_frag_spv.h"
+ #include "video_core/host_shaders/vulkan_present_vert_spv.h"
+-#include "vulkan/vulkan_format_traits.hpp"
+ 
+ #include <vk_mem_alloc.h>
+ 
+@@ -869,9 +867,20 @@ void RendererVulkan::RenderScreenshot() {
+     const u32 width = layout.width;
+     const u32 height = layout.height;
+ 
+-    const vk::BufferCreateInfo staging_buffer_info = {
+-        .size = width * height * 4,
+-        .usage = vk::BufferUsageFlagBits::eTransferDst,
+    const vk::ImageCreateInfo staging_image_info = {
+        .imageType = vk::ImageType::e2D,
+        .format = vk::Format::eB8G8R8A8Unorm,
+        .extent{
+            .width = width,
+            .height = height,
+            .depth = 1,
+        },
+        .mipLevels = 1,
+        .arrayLayers = 1,
+        .samples = vk::SampleCountFlagBits::e1,
+        .tiling = vk::ImageTiling::eLinear,
+        .usage = vk::ImageUsageFlagBits::eTransferDst,
+        .initialLayout = vk::ImageLayout::eUndefined,
+     };
+ 
+     const VmaAllocationCreateInfo alloc_create_info = {
+@@ -884,18 +893,18 @@ void RendererVulkan::RenderScreenshot() {
+         .pUserData = nullptr,
+     };
+ 
+-    VkBuffer unsafe_buffer{};
+    VkImage unsafe_image{};
+     VmaAllocation allocation{};
+     VmaAllocationInfo alloc_info;
+-    VkBufferCreateInfo unsafe_buffer_info = static_cast<VkBufferCreateInfo>(staging_buffer_info);
+    VkImageCreateInfo unsafe_image_info = static_cast<VkImageCreateInfo>(staging_image_info);
+ 
+-    VkResult result = vmaCreateBuffer(instance.GetAllocator(), &unsafe_buffer_info,
+-                                      &alloc_create_info, &unsafe_buffer, &allocation, &alloc_info);
+    VkResult result = vmaCreateImage(instance.GetAllocator(), &unsafe_image_info,
+                                     &alloc_create_info, &unsafe_image, &allocation, &alloc_info);
+     if (result != VK_SUCCESS) [[unlikely]] {
+         LOG_CRITICAL(Render_Vulkan, "Failed allocating texture with error {}", result);
+         UNREACHABLE();
+     }
+-    vk::Buffer staging_buffer{unsafe_buffer};
+    vk::Image staging_image{unsafe_image};
+ 
+     Frame frame{};
+     main_window.RecreateFrame(&frame, width, height);
+@@ -903,37 +912,73 @@ void RendererVulkan::RenderScreenshot() {
+     DrawScreens(&frame, layout, false);
+ 
+     scheduler.Record(
+-        [width, height, source_image = frame.image, staging_buffer](vk::CommandBuffer cmdbuf) {
+-            const vk::ImageMemoryBarrier read_barrier = {
+-                .srcAccessMask = vk::AccessFlagBits::eMemoryWrite,
+-                .dstAccessMask = vk::AccessFlagBits::eTransferRead,
+-                .oldLayout = vk::ImageLayout::eTransferSrcOptimal,
+-                .newLayout = vk::ImageLayout::eTransferSrcOptimal,
+-                .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+-                .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+-                .image = source_image,
+-                .subresourceRange{
+-                    .aspectMask = vk::ImageAspectFlagBits::eColor,
+-                    .baseMipLevel = 0,
+-                    .levelCount = VK_REMAINING_MIP_LEVELS,
+-                    .baseArrayLayer = 0,
+-                    .layerCount = VK_REMAINING_ARRAY_LAYERS,
+        [width, height, source_image = frame.image, staging_image](vk::CommandBuffer cmdbuf) {
+            const std::array read_barriers = {
+                vk::ImageMemoryBarrier{
+                    .srcAccessMask = vk::AccessFlagBits::eMemoryWrite,
+                    .dstAccessMask = vk::AccessFlagBits::eTransferRead,
+                    .oldLayout = vk::ImageLayout::eTransferSrcOptimal,
+                    .newLayout = vk::ImageLayout::eTransferSrcOptimal,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = source_image,
+                    .subresourceRange{
+                        .aspectMask = vk::ImageAspectFlagBits::eColor,
+                        .baseMipLevel = 0,
+                        .levelCount = VK_REMAINING_MIP_LEVELS,
+                        .baseArrayLayer = 0,
+                        .layerCount = VK_REMAINING_ARRAY_LAYERS,
+                    },
+                },
+                vk::ImageMemoryBarrier{
+                    .srcAccessMask = vk::AccessFlagBits::eNone,
+                    .dstAccessMask = vk::AccessFlagBits::eTransferWrite,
+                    .oldLayout = vk::ImageLayout::eUndefined,
+                    .newLayout = vk::ImageLayout::eTransferDstOptimal,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = staging_image,
+                    .subresourceRange{
+                        .aspectMask = vk::ImageAspectFlagBits::eColor,
+                        .baseMipLevel = 0,
+                        .levelCount = VK_REMAINING_MIP_LEVELS,
+                        .baseArrayLayer = 0,
+                        .layerCount = VK_REMAINING_ARRAY_LAYERS,
+                    },
+                 },
+             };
+-            const vk::ImageMemoryBarrier write_barrier = {
+-                .srcAccessMask = vk::AccessFlagBits::eTransferRead,
+-                .dstAccessMask = vk::AccessFlagBits::eMemoryWrite,
+-                .oldLayout = vk::ImageLayout::eTransferSrcOptimal,
+-                .newLayout = vk::ImageLayout::eTransferSrcOptimal,
+-                .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+-                .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+-                .image = source_image,
+-                .subresourceRange{
+-                    .aspectMask = vk::ImageAspectFlagBits::eColor,
+-                    .baseMipLevel = 0,
+-                    .levelCount = VK_REMAINING_MIP_LEVELS,
+-                    .baseArrayLayer = 0,
+-                    .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            const std::array write_barriers = {
+                vk::ImageMemoryBarrier{
+                    .srcAccessMask = vk::AccessFlagBits::eTransferRead,
+                    .dstAccessMask = vk::AccessFlagBits::eMemoryWrite,
+                    .oldLayout = vk::ImageLayout::eTransferSrcOptimal,
+                    .newLayout = vk::ImageLayout::eTransferSrcOptimal,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = source_image,
+                    .subresourceRange{
+                        .aspectMask = vk::ImageAspectFlagBits::eColor,
+                        .baseMipLevel = 0,
+                        .levelCount = VK_REMAINING_MIP_LEVELS,
+                        .baseArrayLayer = 0,
+                        .layerCount = VK_REMAINING_ARRAY_LAYERS,
+                    },
+                },
+                vk::ImageMemoryBarrier{
+                    .srcAccessMask = vk::AccessFlagBits::eTransferWrite,
+                    .dstAccessMask = vk::AccessFlagBits::eMemoryRead,
+                    .oldLayout = vk::ImageLayout::eTransferDstOptimal,
+                    .newLayout = vk::ImageLayout::eGeneral,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = staging_image,
+                    .subresourceRange{
+                        .aspectMask = vk::ImageAspectFlagBits::eColor,
+                        .baseMipLevel = 0,
+                        .levelCount = VK_REMAINING_MIP_LEVELS,
+                        .baseArrayLayer = 0,
+                        .layerCount = VK_REMAINING_ARRAY_LAYERS,
+                    },
+                 },
+             };
+             static constexpr vk::MemoryBarrier memory_write_barrier = {
+@@ -941,29 +986,41 @@ void RendererVulkan::RenderScreenshot() {
+                 .dstAccessMask = vk::AccessFlagBits::eMemoryRead | vk::AccessFlagBits::eMemoryWrite,
+             };
+ 
+-            const vk::BufferImageCopy image_copy = {
+-                .bufferOffset = 0,
+-                .bufferRowLength = 0,
+-                .bufferImageHeight = 0,
+-                .imageSubresource =
+-                    {
+-                        .aspectMask = vk::ImageAspectFlagBits::eColor,
+-                        .mipLevel = 0,
+-                        .baseArrayLayer = 0,
+-                        .layerCount = 1,
+-                    },
+-                .imageOffset = {0, 0, 0},
+-                .imageExtent = {width, height, 1},
+            const std::array src_offsets = {
+                vk::Offset3D{0, 0, 0},
+                vk::Offset3D{static_cast<s32>(width), static_cast<s32>(height), 1},
+            };
+
+            const std::array dst_offsets = {
+                vk::Offset3D{0, static_cast<s32>(height), 0},
+                vk::Offset3D{static_cast<s32>(width), 0, 1},
+            };
+
+            const vk::ImageBlit blit_area = {
+                .srcSubresource{
+                    .aspectMask = vk::ImageAspectFlagBits::eColor,
+                    .mipLevel = 0,
+                    .baseArrayLayer = 0,
+                    .layerCount = 1,
+                },
+                .srcOffsets = src_offsets,
+                .dstSubresource{
+                    .aspectMask = vk::ImageAspectFlagBits::eColor,
+                    .mipLevel = 0,
+                    .baseArrayLayer = 0,
+                    .layerCount = 1,
+                },
+                .dstOffsets = dst_offsets,
+             };
+ 
+             cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands,
+                                    vk::PipelineStageFlagBits::eTransfer,
+-                                   vk::DependencyFlagBits::eByRegion, {}, {}, read_barrier);
+-            cmdbuf.copyImageToBuffer(source_image, vk::ImageLayout::eTransferSrcOptimal,
+-                                     staging_buffer, image_copy);
+                                   vk::DependencyFlagBits::eByRegion, {}, {}, read_barriers);
+            cmdbuf.blitImage(source_image, vk::ImageLayout::eTransferSrcOptimal, staging_image,
+                             vk::ImageLayout::eTransferDstOptimal, blit_area, vk::Filter::eNearest);
+             cmdbuf.pipelineBarrier(
+                 vk::PipelineStageFlagBits::eTransfer, vk::PipelineStageFlagBits::eAllCommands,
+-                vk::DependencyFlagBits::eByRegion, memory_write_barrier, {}, write_barrier);
+                vk::DependencyFlagBits::eByRegion, memory_write_barrier, {}, write_barriers);
+         });
+ 
+     // Ensure the copy is fully completed before saving the screenshot
+@@ -971,16 +1028,27 @@ void RendererVulkan::RenderScreenshot() {
+ 
+     const vk::Device device = instance.GetDevice();
+ 
+    // Get layout of the image (including row pitch)
+    const vk::ImageSubresource subresource = {
+        .aspectMask = vk::ImageAspectFlagBits::eColor,
+        .mipLevel = 0,
+        .arrayLayer = 0,
+    };
+
+    const vk::SubresourceLayout subresource_layout =
+        device.getImageSubresourceLayout(staging_image, subresource);
+
+     // Copy backing image data to the QImage screenshot buffer
+-    std::memcpy(settings.screenshot_bits, alloc_info.pMappedData, staging_buffer_info.size);
+    const u8* data = reinterpret_cast<const u8*>(alloc_info.pMappedData);
+    std::memcpy(settings.screenshot_bits, data + subresource_layout.offset,
+                subresource_layout.size);
+ 
+     // Destroy allocated resources
+-    vmaDestroyBuffer(instance.GetAllocator(), unsafe_buffer, allocation);
+     vmaDestroyImage(instance.GetAllocator(), frame.image, frame.allocation);
+     device.destroyFramebuffer(frame.framebuffer);
+     device.destroyImageView(frame.image_view);
+ 
+-    settings.screenshot_complete_callback(false);
+    settings.screenshot_complete_callback();
+ }
+ 
+ } // namespace Vulkan
+diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp
+index ee83e0378..260839c8f 100644
+--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp
+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp
+@@ -150,7 +150,8 @@ void Swapchain::FindPresentFormat() {
+         return;
+     }
+ 
+-    UNREACHABLE_MSG("Unable to find required swapchain format!");
+    LOG_CRITICAL(Render_Vulkan, "Unable to find required swapchain format!");
+    UNREACHABLE();
+ }
+ 
+ void Swapchain::SetPresentMode() {
--- a/packages/emulators/standalone/drastic-sa/package.mk
+++ b/packages/emulators/standalone/drastic-sa/package.mk
@ -10,25 +10,33 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Install Drastic Launcher script, will dowload bin on first run"
 PKG_TOOLCHAIN="make"

+if [ "${DEVICE}" = "S922X" ]; then
+  PKG_DEPENDS_TARGET+=" libegl"
+fi
+
 make_target() {
  :
 }

 makeinstall_target() {
  mkdir -p ${INSTALL}/usr/bin
-
-  case ${DEVICE} in
-    S922X*)
-      cp -rf ${PKG_DIR}/scripts/S922X/start_drastic.sh ${INSTALL}/usr/bin
-    ;;
-    *)
-      cp -rf ${PKG_DIR}/scripts/start_drastic.sh ${INSTALL}/usr/bin
-    ;;
-  esac
-
+  cp -rf ${PKG_DIR}/scripts/start_drastic.sh ${INSTALL}/usr/bin
  chmod +x ${INSTALL}/usr/bin/start_drastic.sh

  mkdir -p ${INSTALL}/usr/config/drastic/config
  cp -rf ${PKG_BUILD}/drastic_aarch64/* ${INSTALL}/usr/config/drastic/
  cp -rf ${PKG_DIR}/config/${DEVICE}/* ${INSTALL}/usr/config/drastic/config/
 }
+
+post_install() {
+    case ${DEVICE} in
+      S922X)
+        LIBEGL="export SDL_VIDEO_GL_DRIVER=\/usr\/lib\/egl\/libGL.so.1 SDL_VIDEO_EGL_DRIVER=\/usr\/lib\/egl\/libEGL.so.1"
+      ;;
+      *)
+        LIBEGL=""
+      ;;
+    esac
+    sed -e "s/@LIBEGL@/${LIBEGL}/g" \
+        -i ${INSTALL}/usr/bin/start_drastic.sh
+}
--- a/packages/emulators/standalone/drastic-sa/scripts/S922X/start_drastic.sh
+++ b/packages/emulators/standalone/drastic-sa/scripts/S922X/start_drastic.sh
@ -1,50 +0,0 @@
-#!/bin/bash
-
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
-
-. /etc/profile
-
-jslisten set "-9 drastic"
-
-#Copy drastic files to .config
-if [ ! -d "/storage/.config/drastic" ]; then
-  mkdir -p /storage/.config/drastic/
-  cp -r /usr/config/drastic/* /storage/.config/drastic/
-fi
-
-#Make drastic savestate folder
-if [ ! -d "/storage/roms/savestates/nds" ]; then
-  mkdir -p /storage/roms/savestates/nds
-fi
-
-#Link savestates to roms/savestates/nds
-rm -rf /storage/.config/drastic/savestates
-ln -sf /storage/roms/savestates/nds /storage/.config/drastic/savestates
-
-#Link saves to roms/nds/saves
-rm -rf /storage/.config/drastic/backup
-ln -sf /storage/roms/nds /storage/.config/drastic/backup
-
-# Set the cores to use
-CORES=$(get_setting "cores" "${PLATFORM}" "${ROMNAME##*/}")
-if [ "${CORES}" = "little" ]
-then
-  EMUPERF="${SLOW_CORES}"
-elif [ "${CORES}" = "big" ]
-then
-  EMUPERF="${FAST_CORES}"
-else
-  ### All..
-  unset EMUPERF
-fi
-
-cd /storage/.config/drastic/
-
-export SDL_VIDEO_GL_DRIVER=./libs/libGL.so.1
-export SDL_VIDEO_EGL_DRIVER=./libs/libEGL.so.1
-export LIBGL_ES=2
-export LIBGL_GL=21
-export LIBGL_FB=2
-
-${EMUPERF} ./drastic "$1"
--- a/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh
+++ b/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh
@ -40,5 +40,5 @@ rm -rf /storage/.config/drastic/backup
 ln -sf /storage/roms/nds /storage/.config/drastic/backup

 cd /storage/.config/drastic/
-
+@LIBEGL@
 ./drastic "$1"
--- a/packages/emulators/standalone/flycast-sa/package.mk
+++ b/packages/emulators/standalone/flycast-sa/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="flycast-sa"
-PKG_VERSION="3e047a6e0364273fe08f1f7025640fcced0be176"
+PKG_VERSION="dda04e63fa7af435e75e39f265aaf53bd7da9191"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/emulators/standalone/hatarisa/package.mk
+++ b/packages/emulators/standalone/hatarisa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)

 PKG_NAME="hatarisa"
-PKG_VERSION="69ce09390824a29c9708ae41290d6df28a5f766e"
+PKG_VERSION="955a8cb762d0e3081bf116c8f43f5a79d8dad79f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"
--- a/packages/emulators/standalone/hypseus-singe/package.mk
+++ b/packages/emulators/standalone/hypseus-singe/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="hypseus-singe"
-PKG_VERSION="fb981e2c2f963d32d5dbf88083539ef6762bbc85"
+PKG_VERSION="685bb179a2d24c5d2a300ea6b09460ba04c986dc"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL3"
--- a/packages/emulators/standalone/mednafen/config/common/mednafen.template
+++ b/packages/emulators/standalone/mednafen/config/common/mednafen.template
--- a/packages/emulators/standalone/mednafen/package.mk
+++ b/packages/emulators/standalone/mednafen/package.mk
@ -6,9 +6,13 @@ PKG_VERSION="1.31.0-UNSTABLE"
 PKG_LICENSE="mixed"
 PKG_SITE="https://mednafen.github.io/"
 PKG_URL="${PKG_SITE}/releases/files/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain SDL2 libegl"
+PKG_DEPENDS_TARGET="toolchain SDL2"
 PKG_TOOLCHAIN="configure"

+if [ "${DEVICE}" = "S922X*" ]; then
+  PKG_DEPENDS_TARGET+=" libegl"
+fi
+
 pre_configure_target() {

 # unsupported modules
--- a/packages/emulators/standalone/mednafen/scripts/start_mednafen.sh
+++ b/packages/emulators/standalone/mednafen/scripts/start_mednafen.sh
@ -5,7 +5,7 @@
 . /etc/profile

 export MEDNAFEN_HOME=/storage/.config/mednafen
-export MEDNAFEN_CONFIG=/usr/config/mednafen/mednafen.cfg
+export MEDNAFEN_CONFIG=/usr/config/mednafen/mednafen.template

 if [ ! -d "$MEDNAFEN_HOME" ]
 then
--- 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="157fabf91b959305af7bde3b124df3a15524fed4"
+PKG_VERSION="bfd11153dbe3fcd0a72aeaea4789518f9cd6631b"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="retroarch"
-PKG_VERSION="636a6e9d55e6f83613d470bdaee9a1e21945c330"
+PKG_VERSION="f091b5a9e9475255e5efaded5f95c9750fdfe15e"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
--- a/packages/emulators/standalone/yuzu-sa/package.mk
+++ b/packages/emulators/standalone/yuzu-sa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="yuzu-sa"
-PKG_VERSION="6eb3a583cbbb55ebe6dd2409f5f53aef02cff561"
+PKG_VERSION="767c4b5a992bfeeae9194bc9f5a3dc63996645df"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
--- a/packages/emulators/tools/gamecontrollerdb/package.mk
+++ b/packages/emulators/tools/gamecontrollerdb/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="gamecontrollerdb"
-PKG_VERSION="eb831f75abb5c796fb2f2843c3e055d2b8cba29b"
+PKG_VERSION="f24c628dc03e7c6675c1cf28459d41c2e53be542"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_DEPENDS_TARGET="toolchain SDL2"
--- 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="39c44632e3be156246f2bd34cff08ac9f842126e"
+PKG_VERSION="df019d548b0a890ac224862ce83129c02c4d7c32"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libretro/retroarch-assets"
 PKG_URL="https://github.com/libretro/retroarch-assets/archive/${PKG_VERSION}.tar.gz"
--- a/packages/graphics/SDL2/package.mk
+++ b/packages/graphics/SDL2/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="SDL2"
-PKG_VERSION="2.28.4"
+PKG_VERSION="2.28.5"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libsdl.org/"
 PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"
--- a/packages/graphics/gl4es/package.mk
+++ b/packages/graphics/gl4es/package.mk
@ -20,7 +20,7 @@ case ${DEVICE} in
  *)
    PKG_SITE="https://github.com/ptitSeb/gl4es"
    PKG_URL="${PKG_SITE}.git"
-    PKG_VERSION="bfcdd3a"
+    PKG_VERSION="e39434a"
  ;;
 esac

--- a/packages/graphics/imagemagick/package.mk
+++ b/packages/graphics/imagemagick/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="imagemagick"
-PKG_VERSION="a0a5f3d"
+PKG_VERSION="58d86e4"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
 PKG_SITE="https://github.com/ImageMagick/ImageMagick"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/graphics/jasper/package.mk
+++ b/packages/graphics/jasper/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="jasper"
-PKG_VERSION="4.0.0"
+PKG_VERSION="4.1.0"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"
 PKG_URL="https://github.com/jasper-software/jasper/archive/refs/tags/version-${PKG_VERSION}.tar.gz"
--- a/packages/graphics/kmscube/package.mk
+++ b/packages/graphics/kmscube/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="kmscube"
-PKG_VERSION="ea6c5d1eeefbfb0a1c27ab74a6e4621f1d9adf4c"
+PKG_VERSION="96d63eb59e34c647cda1cbb489265f8c536ae055"
 PKG_LICENSE="GPL"
 PKG_SITE="https://cgit.freedesktop.org/mesa/kmscube"
 PKG_URL="https://cgit.freedesktop.org/mesa/kmscube/snapshot/${PKG_VERSION}.tar.xz"
@ -12,7 +12,7 @@ PKG_TOOLCHAIN="autotools"

 if [ "${OPENGLES_SUPPORT}" = "yes" ]; then
  PKG_DEPENDS_TARGET+=" ${OPENGLES}"
-elif [ "$OPENGL_SUPPORT" = "yes" ]; then
+elif [ "${OPENGL_SUPPORT}" = "yes" ]; then
  echo "kmscube only supports OpenGLESv2"
  exit 0
 fi
--- a/packages/graphics/libdrm/package.mk
+++ b/packages/graphics/libdrm/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libdrm"
-PKG_VERSION="2.4.115"
+PKG_VERSION="2.4.117"
 PKG_LICENSE="GPL"
 PKG_SITE="http://dri.freedesktop.org"
 PKG_URL="http://dri.freedesktop.org/libdrm/libdrm-${PKG_VERSION}.tar.xz"
--- a/packages/graphics/libjpeg-turbo/package.mk
+++ b/packages/graphics/libjpeg-turbo/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="libjpeg-turbo"
-PKG_VERSION="3.0.0"
+PKG_VERSION="3.0.1"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libjpeg-turbo.org/"
 PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${PKG_VERSION}.tar.gz"
--- a/packages/graphics/librsvg/package.mk
+++ b/packages/graphics/librsvg/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Frank Hartung (supervisedthinking (@) gmail.com)

 PKG_NAME="librsvg"
-PKG_VERSION="2.46.7"
+PKG_VERSION="2.57.0"
 PKG_LICENSE="LGPL-2.1"
 PKG_SITE="https://gitlab.gnome.org/GNOME/librsvg"
 PKG_URL="https://download.gnome.org/sources/librsvg/${PKG_VERSION:0:4}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/graphics/tiff/package.mk
+++ b/packages/graphics/tiff/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="tiff"
-PKG_VERSION="4.5.1"
+PKG_VERSION="4.6.0"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.remotesensing.org/libtiff/"
 PKG_URL="http://download.osgeo.org/libtiff/${PKG_NAME}-${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/glslang/package.mk
+++ b/packages/graphics/vulkan/glslang/package.mk
@ -6,7 +6,7 @@ PKG_NAME="glslang"
 # The SPIRV-Tools & SPIRV-Headers pkg_version/s need to match the compatible (known_good) glslang pkg_version.
 # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json
 # When updating glslang pkg_version please update to the known_good spirv-tools & spirv-headers pkg_version/s.
-PKG_VERSION="12.3.1"
+PKG_VERSION="13.1.1"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/glslang"
 PKG_URL="https://github.com/KhronosGroup/glslang/archive/${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/spirv-headers/package.mk
+++ b/packages/graphics/vulkan/spirv-headers/package.mk
@ -6,8 +6,7 @@ PKG_NAME="spirv-headers"
 # The SPIRV-Headers pkg_version needs to match the compatible (known_good) glslang pkg_version.
 # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json
 # When updating glslang pkg_version please update to the known_good spirv-headers pkg_version.
-PKG_VERSION="f1ba373ef03752ee9f6f2b898bea1213f93e1ef2"
-PKG_SHA256="a73040eb4fca2b480b1ca6e542444a94ecf429837e0b6deb3e2f873e654a4174"
+PKG_VERSION="e867c06631767a2d96424cbec530f9ee5e78180f"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/SPIRV-headers"
 PKG_URL="https://github.com/KhronosGroup/SPIRV-headers/archive/${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/spirv-tools/package.mk
+++ b/packages/graphics/vulkan/spirv-tools/package.mk
@ -6,8 +6,7 @@ PKG_NAME="spirv-tools"
 # The SPIRV-Tools pkg_version needs to match the compatible (known_good) glslang pkg_version.
 # https://raw.githubusercontent.com/KhronosGroup/glslang/${PKG_VERSION}/known_good.json
 # When updating glslang pkg_version please update to the known_good spirv-tools pkg_version.
-PKG_VERSION="4b6bd5a665ba0529747af3a0bc808732b7e78f48"
-PKG_SHA256="890d9e33b8bb79a8799a2887b442e55c93db0a4db94252339c915a1d90857505"
+PKG_VERSION="360d469b9eac54d6c6e20f609f9ec35e3a5380ad"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/SPIRV-Tools"
 PKG_URL="https://github.com/KhronosGroup/SPIRV-Tools/archive/${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/vulkan-headers/package.mk
+++ b/packages/graphics/vulkan/vulkan-headers/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="vulkan-headers"
-PKG_VERSION="1.3.261"
+PKG_VERSION="1.3.270"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Headers"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/vulkan-loader/package.mk
+++ b/packages/graphics/vulkan/vulkan-loader/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="vulkan-loader"
-PKG_VERSION="1.3.261"
+PKG_VERSION="1.3.270"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Loader"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/vulkan-tools/package.mk
+++ b/packages/graphics/vulkan/vulkan-tools/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="vulkan-tools"
-PKG_VERSION="1.3.261"
+PKG_VERSION="1.3.270"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/KhronosGroup/Vulkan-Tools"
 PKG_URL="https://github.com/KhronosGroup/Vulkan-tools/archive/v${PKG_VERSION}.tar.gz"
--- a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.01-cmakelists-opts.patch
@ -1,26 +0,0 @@
-From c9c7423f2d0ecfc7ab354d2a3d9ea9c2e4998416 Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Thu, 18 Nov 2021 15:02:55 +0100
-Subject: [PATCH] CMakeLists: add CMake options for cube & vulkaninfo
-
---
- CMakeLists.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 422b7d2cc..d123c9dc5 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,6 +41,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- option(BUILD_CUBE "Build cube" ON)
- option(BUILD_VULKANINFO "Build vulkaninfo" ON)
- option(BUILD_ICD "Build icd" ON)
-+option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON)
-+option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON)
-+option(BUILD_WSI_WAYLAND_SUPPORT "Build Wayland WSI support" ON)
-+option(BUILD_WSI_DIRECTFB_SUPPORT "Build DirectFB WSI support" OFF)
-+set(CUBE_WSI_SELECTION "XCB" CACHE STRING "Select WSI target for vkcube (XCB, XLIB, WAYLAND, DIRECTFB, DISPLAY)")
-+
- # Installing the Mock ICD to system directories is probably not desired since this ICD is not a very complete implementation.
- # Require the user to ask that it be installed if they really want it.
- option(INSTALL_ICD "Install icd" OFF)
--- a/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
+++ b/packages/graphics/vulkan/vulkan-tools/patches/vulkan-tools-995.04-fix-glslangValidator-logik.patch
@ -1,68 +0,0 @@
-From a1894dc9f650ab94fb7e348e1b06ee75a1e9728b Mon Sep 17 00:00:00 2001
-From: SupervisedThinking <supervisedthinking@gmail.com>
-Date: Sat, 20 Nov 2021 18:39:04 +0100
-Subject: [PATCH] CMakeLists: updated glslangValidator logik
-
---
- cube/CMakeLists.txt | 43 +++++++++++++++++++++++++++----------------
- 1 file changed, 27 insertions(+), 16 deletions(-)
-
-diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
-index d59eb4366..a684fc4f0 100644
--- a/cube/CMakeLists.txt
-+++ b/cube/CMakeLists.txt
-@@ -26,27 +26,38 @@ endif()
- if(GLSLANG_INSTALL_DIR)
-     message(STATUS "Using GLSLANG_INSTALL_DIR to look for glslangValidator")
-     find_program(GLSLANG_VALIDATOR names glslangValidator HINTS "${GLSLANG_INSTALL_DIR}/bin")
-+
- else()
-     find_package(Python3 REQUIRED QUIET)
-     set(GLSLANG_VALIDATOR_NAME "glslangValidator")
-    message(STATUS "Using cmake find_program to look for glslangValidator")
-    if(WIN32)
-        execute_process(
-            COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
-        set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
-    elseif(APPLE)
-        execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
-    elseif(UNIX AND NOT APPLE) # i.e. Linux
-        execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
-    endif()
-    if (WIN32)
-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
-    elseif(APPLE)
-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
-+    message(CHECK_START "Looking for glslangValidator")
-+    find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
-+    if(GLSLANG_VALIDATOR)
-+        message(CHECK_PASS ${GLSLANG_VALIDATOR})
-     else()
-        set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
-+        if(WIN32)
-+            execute_process(
-+                COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-windows-x64-Release.zip)
-+            set(GLSLANG_VALIDATOR_NAME "glslangValidator.exe")
-+        elseif(APPLE)
-+            execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-osx-Release.zip)
-+        elseif(UNIX AND NOT APPLE) # i.e. Linux
-+            execute_process(COMMAND ${Python3_EXECUTABLE} ${SCRIPTS_DIR}/fetch_glslangvalidator.py glslang-master-linux-Release.zip)
-+        endif()
-+        if (WIN32)
-+            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/windows/bin")
-+        elseif(APPLE)
-+            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/darwin/bin")
-+        else()
-+            set(PLATFORM_DIR "${PROJECT_SOURCE_DIR}/glslang/linux/bin")
-+        endif()
-+        find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
-+        if(GLSLANG_VALIDATOR)
-+            message(CHECK_PASS ${GLSLANG_VALIDATOR})
-+        else()
-+            message(FATAL_ERROR "no glslangValidator binary found")
-+        endif()
-     endif()
-    find_program(GLSLANG_VALIDATOR NAMES ${GLSLANG_VALIDATOR_NAME} HINTS ${PLATFORM_DIR})
- endif()
- 
- if(UNIX AND NOT APPLE) # i.e. Linux
--- a/packages/graphics/wxwidgets/package.mk
+++ b/packages/graphics/wxwidgets/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="wxwidgets"
-PKG_VERSION="a7bfae0"
+PKG_VERSION="b958f602fa1cdd77ee3d6a77537d4d3850d8230a"
 PKG_LICENSE="wxWindows Library Licence"
 PKG_SITE="https://github.com/wxWidgets/wxWidgets"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -0,0 +1,7 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+cat <<EOF >/storage/.config/profile.d/090-panel_quirks
+PANEL_FULL_OFF="false"
+EOF
--- a/packages/hardware/quirks/platforms/S922X/060-game_settings
+++ b/packages/hardware/quirks/platforms/S922X/060-game_settings
@ -5,7 +5,7 @@
 . /etc/profile.d/001-functions

 ### Set the default performance scaling mode for a few systems.
-for SYSTEM in dreamcast n64 psp saturn
+for SYSTEM in 3ds dreamcast gamecube n64 ps2 psp saturn
 do
  SETTING=$(get_setting ${SYSTEM})
  if [ -z ${SETTING} ]
--- a/packages/hardware/quirks/profile.d/999-export
+++ b/packages/hardware/quirks/profile.d/999-export
@ -43,4 +43,5 @@ export  SLOW_CORES \
 	DEVICE_WIFI \
 	HDMI_DETECT_PATTERN \
 	HDMI_STATE \
+	PANEL_FULL_OFF \
 	UI_SERVICE
--- a/packages/jelos/sources/post-update
+++ b/packages/jelos/sources/post-update
@ -70,6 +70,9 @@ sed -i '/^.*<int name="MaxVRAM".*$/d' ${ES_SETTINGS}
 ### 20231031 - Switch back to alsathread for RetroArch
 sed -i 's~"pulse"~"alsathread"~g' /storage/.config/retroarch/retroarch.cfg

+### 20231114 - Update hosts.conf
+grep "127.0.0.1" /storage/.config/hosts.conf >/dev/null 2>&1 || cp /usr/config/hosts.conf /storage/.config/
+
 ### Items below this line should not be removed.
 tocon "Update complete, rebooting..."
 reboot
--- a/packages/jelos/sources/scripts/jelos-info
+++ b/packages/jelos/sources/scripts/jelos-info
@ -108,7 +108,7 @@ then
  TEMPE=$(printf "%.0f" $(awk '{ total += $1; count++ } END { print total/count }' ${DEVICE_TEMP_SENSOR} 2>/dev/null) 2>/dev/null | sed -e s+"[0-9][0-9][0-9]$"++)
  if [ -n "${TEMPE}" ]
  then
-    echo "CPU TEMPERATURE: ${TEMPE}.."
+    echo "CPU TEMPERATURE: ${TEMPE}°"
  fi
 fi

--- a/packages/kernel/linux-drivers/RTL8188EU/package.mk
+++ b/packages/kernel/linux-drivers/RTL8188EU/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8188EU"
-PKG_VERSION="96ecc776167a15cc7df4efc4f721ba5784c55c85"
+PKG_VERSION="f5d1c8df2e2d8b217ea0113bf2cf3e37df8cb716"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lwfinger/rtl8188eu"
 PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/${PKG_VERSION}.tar.gz"
--- a/packages/kernel/linux-drivers/RTL8188FU/package.mk
+++ b/packages/kernel/linux-drivers/RTL8188FU/package.mk
@ -1,5 +1,5 @@
 PKG_NAME="RTL8188FU"
-PKG_VERSION="751882b3d8925b72ed796f40e38c0232ccc24785"
+PKG_VERSION="68ced40d862d13663294496bac2e9a91ffa0e5c7"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kelebek333/rtl8188fu"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/kernel/linux-drivers/RTL8192EU/package.mk
+++ b/packages/kernel/linux-drivers/RTL8192EU/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8192EU"
-PKG_VERSION="528ae31705764d78cc117abd604d9b799bd52543"
+PKG_VERSION="f2fc8af7ab58d2123eed1aa4428e713cdfc27976"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver"
 PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/${PKG_VERSION}.tar.gz"
--- a/packages/kernel/linux-drivers/RTL8812AU/package.mk
+++ b/packages/kernel/linux-drivers/RTL8812AU/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)

 PKG_NAME="RTL8812AU"
-PKG_VERSION="a320c573061786696f3f43554feb28b736887b10"
+PKG_VERSION="e6a0d1704ccd31145800ff5eb09ec2435a02f995"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/morrownr/8812au-20210629"
 PKG_URL="${PKG_SITE}.git"
--- a/Show more
+++ b/Show more