Merge pull request #47 from brooksytech/dev

sync with dev
2023-06-28 06:03:07 -07:00 · 2023-06-28 06:03:07 -07:00 · 31bf882a43
commit 31bf882a43
parent a3cf32355c 75c8b90e53
54 changed files with 159 additions and 78 deletions
--- a/config/emulators/imageviewer.conf
+++ b/config/emulators/imageviewer.conf
@ -1,6 +1,6 @@
 SYSTEM_NAME="imageviewer"
 SYSTEM_FULLNAME="Screenshots"
-SYSTEM_MANUFACTURER="Various"
+SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="2021"
 SYSTEM_HARDWARE="system"
 SYSTEM_PATH="/storage/roms/screenshots"
--- a/config/emulators/mplayer.conf
+++ b/config/emulators/mplayer.conf
@ -1,6 +1,6 @@
 SYSTEM_NAME="mplayer"
 SYSTEM_FULLNAME="MPlayer"
-SYSTEM_MANUFACTURER="Various"
+SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="unknown"
 SYSTEM_HARDWARE="system"
 SYSTEM_PATH="/storage/roms/mplayer"
--- a/config/emulators/ports.conf
+++ b/config/emulators/ports.conf
@ -1,6 +1,6 @@
 SYSTEM_NAME="ports"
 SYSTEM_FULLNAME="Ports"
-SYSTEM_MANUFACTURER="Various"
+SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="2021"
 SYSTEM_HARDWARE="PC"
 SYSTEM_PATH="/storage/roms/ports"
--- a/config/emulators/tools.conf
+++ b/config/emulators/tools.conf
@ -1,6 +1,6 @@
 SYSTEM_NAME="tools"
 SYSTEM_FULLNAME="Tools"
-SYSTEM_MANUFACTURER="Various"
+SYSTEM_MANUFACTURER="JELOS"
 SYSTEM_RELEASE="2021"
 SYSTEM_HARDWARE="system"
 SYSTEM_PATH="/storage/.config/modules"
--- a/config/functions
+++ b/config/functions
@ -1765,7 +1765,7 @@ exec_thread_safe() {
 }

 clean_es_cache() {
-  ESTMP="${ROOT}/.es_cache"
+  ESTMP="${ROOT}/.es_cache/${DEVICE}"
  if [ -d "${ESTMP}" ]
  then
    rm -rf "${ESTMP}"
--- a/packages/apps/portmaster/package.mk
+++ b/packages/apps/portmaster/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="portmaster"
-PKG_VERSION="7a4cddfdfc2fbbe631b53c8e4c418186fadc939f"
+PKG_VERSION="10ff8947930db2a4bfdc633da4f6afbd061a27cb"
 PKG_SITE="https://github.com/christianhaitian/PortMaster"
 PKG_LICENSE="MIT"
 PKG_ARCH="arm aarch64"
--- a/packages/compat/box64/package.mk
+++ b/packages/compat/box64/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023-present Fewtarius

 PKG_NAME="box64"
-PKG_VERSION="9698844cc3894f29e101fe9282141d4a5e27267f"
+PKG_VERSION="dc0ab611c46502f115dc68c5d924f4834511216a"
 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-present Fewtarius

 PKG_NAME="box86"
-PKG_VERSION="5cdc1b9fa2238938e49176fcd937a1294c55a03d"
+PKG_VERSION="b7283b8d9df3218fe7d82b213ebffca77326a133"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/ptitSeb/box86"
--- a/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
+++ b/packages/emulators/libretro/beetle-pce-fast-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="beetle-pce-fast-lr"
-PKG_VERSION="c7d3c17ce7aafc71ff58914d2dd0a5be30df11d1"
+PKG_VERSION="7ff6d867dbde199185f462070c1c1b5b84affe79"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/beetle-pce-lr/package.mk
+++ b/packages/emulators/libretro/beetle-pce-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="beetle-pce-lr"
-PKG_VERSION="ea636e724d2217339e32d23a4b8eabed9e3503a6"
+PKG_VERSION="69d356663a3092a315ffac10eff1d47e9a967de0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
+++ b/packages/emulators/libretro/beetle-supergrafx-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="beetle-supergrafx-lr"
-PKG_VERSION="50b80ade59371c2e610ae244bc81d0bf51674a16"
+PKG_VERSION="e33d73cc6f3e0721e10e3bd7a3031213c8b03977"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/fuse-lr/package.mk
+++ b/packages/emulators/libretro/fuse-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="fuse-lr"
-PKG_VERSION="3f9344ddf88dfd251d95cffdea615692479e8cc6"
+PKG_VERSION="847dbbd6f787823ac9a5dfacdd68ab181063374e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
--- 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="90701d6e5d68d31ead49f92f222c144c44a2645c"
+PKG_VERSION="e6bcb9f43c13f44fbf4a30153e3885b3dd174443"
 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="b024aa0de43556b5bd7e30230a177f2d7fc8cc28"
+PKG_VERSION="9f8f5bc44e402e75ce895b8d5259a67d04fed448"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/emulators/libretro/glsl-shaders/package.mk
+++ b/packages/emulators/libretro/glsl-shaders/package.mk
@ -21,7 +21,7 @@
 ################################################################################

 PKG_NAME="glsl-shaders"
-PKG_VERSION="6c6e074730f3e5f16edad7e91bee2e9bd84953d1"
+PKG_VERSION="88d1c3f59c62bf2926e3f594acf0b06eec253347"
 PKG_REV="1"
 PKG_ARCH="aarch64"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/libretro-database/package.mk
+++ b/packages/emulators/libretro/libretro-database/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="libretro-database"
-PKG_VERSION="a80e58a1e99298a295c4e94add869ea54b3f8ec0"
+PKG_VERSION="eba16724ac38b71e858f37746a071a6c3361d0e0"
 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="14335f50aa0f7b545202569fadb88adff9b7eabe"
+PKG_VERSION="acd638cb4383e9ccc54096ffd214a0032b9bb0a6"
 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="dd7db517ee86329ff2e7d5b8a0b7b16dc5c0ef36"
+PKG_VERSION="ec367854106a360c37eec71bf39ef01b22c57496"
 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="d5eeba505c97142fa93f82a16db2f0b27f511e3c"
+PKG_VERSION="d47cdb3d3ea4485207d2842c26ec126646bd25f4"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
--- a/packages/emulators/standalone/mupen64plus-sa/package.mk
+++ b/packages/emulators/standalone/mupen64plus-sa/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2023-present Fewtarius

 PKG_NAME="mupen64plus-sa"
-PKG_VERSION="7a4cddfdfc2fbbe631b53c8e4c418186fadc939f"
+PKG_VERSION="10ff8947930db2a4bfdc633da4f6afbd061a27cb"
 PKG_LICENSE="GPL"
 PKG_SITE="https://mupen64plus.org/"
 PKG_URL=""
--- a/packages/emulators/standalone/pico-8/package.mk
+++ b/packages/emulators/standalone/pico-8/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="pico-8"
-PKG_VERSION="3614c2772e923898d8bf2225d108584ac2e5cfca"
+PKG_VERSION="10ff8947930db2a4bfdc633da4f6afbd061a27cb"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE=""
--- 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="c0444fcd79533d9611f9ee43c8db7bd7bdaf1609"
+PKG_VERSION="56e088b937bc59fa4f9f37d265c6549a84324edf"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
--- a/packages/emulators/standalone/scummvmsa/package.mk
+++ b/packages/emulators/standalone/scummvmsa/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="scummvmsa"
-PKG_VERSION="aeb56e562344bacc52ecf9afe785350347c80265"
+PKG_VERSION="96008586c6c89b4af482ad4ed4129b18a64596c7"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"
--- a/packages/hardware/quirks/devices/ATARI
+++ b/packages/hardware/quirks/devices/ATARI
@ -4,7 +4,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -4,7 +4,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -12,7 +12,7 @@ fi
 cat <<EOF >/storage/.config/profile.d/002-fancontrol
 ### Fan control is not working yet.
 DEVICE_HAS_FAN=false
-DEVICE_PWM_FAN="$(find /sys/devices/platform/oxp-platform/hwmon -name pwm1)"
-DEVICE_TEMP_SENSOR="$(find /sys/devices/pci0000:00/ -name temp1_input | tr "\n" " ")"
+DEVICE_PWM_FAN="$(find /sys/devices/platform/oxp-platform -name pwm1)"
+DEVICE_TEMP_SENSOR="$(find /sys/devices/pci*/* -path "*/nvme" -prune -o -name temp1_input -print)"
 EOF

--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -5,7 +5,6 @@
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_LED_CONTROL=true
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER="ABS_RZ"
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -11,7 +11,7 @@ fi

 cat <<EOF >/storage/.config/profile.d/002-fancontrol
 DEVICE_HAS_FAN=true
-DEVICE_PWM_FAN="/sys/devices/platform/oxp-platform/hwmon/hwmon4/pwm1"
-DEVICE_TEMP_SENSOR="/sys/class/hwmon/hwmon1/temp1_input /sys/class/hwmon/hwmon3/temp1_input"
+DEVICE_PWM_FAN="$(find /sys/devices/platform/oxp-platform -name pwm1)"
+DEVICE_TEMP_SENSOR="$(find /sys/devices/pci*/* -path "*/nvme" -prune -o -name temp1_input -print)"
 EOF

--- a/packages/hardware/quirks/devices/Anbernic
+++ b/packages/hardware/quirks/devices/Anbernic
@ -6,7 +6,6 @@ cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 # Device Features
 DEVICE_HAS_FAN=false
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_POWER_LED=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
--- a/packages/hardware/quirks/devices/Anbernic
+++ b/packages/hardware/quirks/devices/Anbernic
@ -8,7 +8,6 @@ DEVICE_HAS_FAN=false
 DEVICE_FAKE_JACKSENSE=false
 DEVICE_VOLUMECTL=true
 DEVICE_POWER_LED=false
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 #DEVICE_HEADPHONE_DEV=""
--- a/packages/hardware/quirks/devices/Anbernic
+++ b/packages/hardware/quirks/devices/Anbernic
@ -10,7 +10,6 @@ DEVICE_HAS_FAN=false
 DEVICE_FAKE_JACKSENSE=false
 DEVICE_VOLUMECTL=true
 DEVICE_POWER_LED=false
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 #DEVICE_HEADPHONE_DEV=""
--- a/packages/hardware/quirks/devices/GPD
+++ b/packages/hardware/quirks/devices/GPD
@ -4,7 +4,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -6,7 +6,6 @@ cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 # Device Features
 DEVICE_HAS_FAN=false
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_POWER_LED=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
@ -14,7 +13,7 @@ DEVICE_BRIGHTNESS="128"
 UI_SERVICE="weston.service"

 # GPIOS
-DEVICE_TEMP_SENSOR=("/sys/class/hwmon/hwmon0/temp1_input")
+DEVICE_TEMP_SENSOR="$(find /sys/devices/pci*/* -path "*/nvme" -prune -o -name temp1_input -print)"

 # FREQ Governors
 CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0" "/sys/devices/system/cpu/cpufreq/policy2")
--- a/packages/hardware/quirks/devices/LENOVO
+++ b/packages/hardware/quirks/devices/LENOVO
@ -4,7 +4,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
--- a/packages/hardware/quirks/devices/ODROID-GO
+++ b/packages/hardware/quirks/devices/ODROID-GO
@ -6,7 +6,6 @@ cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 # Device Features
 DEVICE_HAS_FAN=false
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_POWER_LED=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
--- a/packages/hardware/quirks/devices/ODROID-GO
+++ b/packages/hardware/quirks/devices/ODROID-GO
@ -6,7 +6,6 @@ cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 # Device Features
 DEVICE_HAS_FAN=false
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_POWER_LED=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
--- a/packages/hardware/quirks/devices/ODROID-GO
+++ b/packages/hardware/quirks/devices/ODROID-GO
@ -6,7 +6,6 @@ cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 # Device Features
 DEVICE_HAS_FAN=false
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_POWER_LED=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
--- a/packages/hardware/quirks/devices/Orange
+++ b/packages/hardware/quirks/devices/Orange
@ -5,7 +5,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="PCM"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 UI_SERVICE="weston.service"
--- a/packages/hardware/quirks/devices/Powkiddy
+++ b/packages/hardware/quirks/devices/Powkiddy
@ -8,7 +8,6 @@ DEVICE_HAS_FAN=false
 DEVICE_FAKE_JACKSENSE=false
 DEVICE_VOLUMECTL=true
 DEVICE_POWER_LED=false
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 #DEVICE_HEADPHONE_DEV=""
--- a/packages/hardware/quirks/devices/Powkiddy
+++ b/packages/hardware/quirks/devices/Powkiddy
@ -8,7 +8,6 @@ DEVICE_HAS_FAN=false
 DEVICE_FAKE_JACKSENSE=true
 DEVICE_VOLUMECTL=true
 DEVICE_POWER_LED=false
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 #DEVICE_HEADPHONE_DEV=""
--- a/packages/hardware/quirks/devices/Valve
+++ b/packages/hardware/quirks/devices/Valve
@ -4,7 +4,6 @@

 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
 DEVICE_VOLUMECTL=true
-DEVICE_AUDIO_MIXER="Master"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_FUNC_KEYA_MODIFIER=="ABS_RZ"
--- a/packages/jelos/autostart/002-kernel
+++ b/packages/jelos/autostart/002-kernel
@ -8,6 +8,6 @@ tocon "Applying kernel parameters..."
 sysctl vm.swappiness=1
 sysctl kernel.nmi_watchdog=0
 sysctl vm.laptop_mode=5
-sysctl vm.dirty_writeback_centisecs=6000
+sysctl vm.dirty_writeback_centisecs=1500

 toggle-ipv6
--- a/packages/jelos/config/system/configs/system.cfg
+++ b/packages/jelos/config/system/configs/system.cfg
@ -40,8 +40,8 @@ daphne.ratio=4/3
 desktop.enabled=0
 display.brightness=50
 display.contrast=50
-display.saturation=50
 display.hue=50
+display.saturation=50
 dreamcast.integerscale=0
 dreamcast.ratio=4/3
 easyrpg.integerscale=0
@ -124,6 +124,7 @@ nesh.integerscale=0
 nesh.ratio=4/3
 nes.integerscale=0
 nes.ratio=4/3
+network.enabled=0
 ngpc.intergerscale=1
 ngp.integerscale=0
 odyssey2.integerscale=0
@ -168,11 +169,17 @@ supervision.integerscale=0
 syncthing.enabled=0
 system.autohotkeys=1
 system.automount=1
+system.battery.warning=1
 system.cpugovernor=schedutil
 system.hostname=@DEVICENAME@
 system.language=en_US
 system.overclock=off
+system.power.audio=1
+system.power.cpu=1
+system.power.pcie=1
+system.power.rtpm=0
 system.powersave=0
+system.power.wifi=0
 system.timezone=America/New_York
 tg16cd.integerscale=0
 tg16cd.ratio=4/3
@ -191,8 +198,6 @@ videopac.integerscale=0
 videopac.ratio=4/3
 virtualboy.integerscale=0
 weston.startup=/usr/bin/start_es.sh
-network.enabled=0
-wifi.powersave=0
 wonderswancolor.integerscale=0
 wonderswan.integerscale=0
 wts.enabled=1
--- a/packages/jelos/profile.d/02-distribution
+++ b/packages/jelos/profile.d/02-distribution
@ -66,6 +66,10 @@ set_audio() {
  /usr/bin/rr_audio.sh ${AUDIO}
 }

+battery_percent() {
+  awk 'BEGIN {FS="="} /POWER_SUPPLY_CAPACITY=/ {print $2}' /sys/class/power_supply/[Bb][Aa][Tt]*/uevent 2>/dev/null
+}
+
 get_es_setting() {
  echo $(sed -n "s|\s*<${1} name=\"${2}\" value=\"\(.*\)\" />|\1|p" ${ES_CONF})
 }
--- a/packages/jelos/sources/post-update
+++ b/packages/jelos/sources/post-update
@ -121,3 +121,46 @@ for JSL in jslisten_hotkeys jslisten_profile
 do
  cp -f /usr/config/${JSL} /storage/.config
 done
+
+### Add properties for enhanced power savings control.
+AUDIOPOWERSAVE=$(get_setting system.power.audio)
+if [ -z "${AUDIOPOWERSAVE}" ]
+then
+  set_setting system.power.audio 1
+fi
+
+CPUPOWERSAVE=$(get_setting system.power.cpu)
+if [ -z "${CPUPOWERSAVE}" ]
+then
+  set_setting system.power.cpu 1
+fi
+
+PCIEPOWERSAVE=$(get_setting system.power.pcie)
+if [ -z "${PCIEPOWERSAVE}" ]
+then
+  set_setting system.power.pcie 1
+fi
+
+RTPM=$(get_setting system.power.rtpm)
+if [ -z "${RTPM}" ]
+then
+  set_setting system.power.rtpm 0
+fi
+
+WAKEEVENTS=$(get_setting system.power.wakeevents)
+if [ -z "${WAKEEVENTS}" ]
+then
+  set_setting system.power.wakeevents 1
+fi
+
+WIFIPOWERSAVE=$(get_setting system.power.wifi)
+if [ -z "${WIFIPOWERSAVE}" ]
+then
+  set_setting system.power.wifi 0
+fi
+
+AUDIBLEALERT=$(get_setting system.battery.warning)
+if [ -z "${AUDIBLEALERT}" ]
+then
+  set_setting system.battery.warning 1
+fi
--- a/packages/jelos/sources/scripts/say
+++ b/packages/jelos/sources/scripts/say
@ -4,10 +4,6 @@

 . /etc/profile

-battery_percent() {
-  cat /sys/class/power_supply/{BAT,bat}*/uevent 2>/dev/null | grep -E "^POWER_SUPPLY_CAPACITY=" | sed -e s+'^POWER_SUPPLY_CAPACITY='++ | sort -rn | head -1
-}
-
 AUDIOTEST=$(ps -ef | grep [p]ulseaudio)
 if [ ! $? = 0 ]
 then
--- a/packages/jelos/sources/scripts/start_mplayer.sh
+++ b/packages/jelos/sources/scripts/start_mplayer.sh
@ -1,5 +1,7 @@
 #!/bin/bash

-jslisten set "mpv"jslisten set "mpv"
+. /etc/profile
+
+jslisten set "mpv"
 /usr/bin/mpv --input-ipc-server=/tmp/mpvsocket "${1}"
 exit 0
--- a/packages/jelos/sources/scripts/wifictl
+++ b/packages/jelos/sources/scripts/wifictl
@ -43,7 +43,7 @@ get_wifi_service() {
 }

 set_powersave() {
-  ENABLED=$(get_setting wifi.powersave)
+  ENABLED=$(get_setting system.power.wifi)
  if [ "${ENABLED}" = "1" ]
  then
    log $0 "Enabling WIFI power saving."
--- a/packages/kernel/linux-firmware/kernel-firmware/package.mk
+++ b/packages/kernel/linux-firmware/kernel-firmware/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="kernel-firmware"
-PKG_VERSION="20230515"
+PKG_VERSION="20230625"
 PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
 PKG_URL="https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${PKG_VERSION}.tar.xz"
--- a/packages/sysutils/powerstate/profile.d/03-powerfunctions
+++ b/packages/sysutils/powerstate/profile.d/03-powerfunctions
@ -31,6 +31,11 @@ gpu_performance_level() {
 }

 pcie_aspm_policy() {
+  PCIEPOWERSAVE=$(get_setting system.power.pcie)
+  if [ ! "${PCIEPOWERSAVE}" = "1" ]
+  then
+    return 0
+  fi
  if [ -e "/sys/module/pcie_aspm/parameters/policy" ]
  then
    echo ${1} >/sys/module/pcie_aspm/parameters/policy 2>/dev/null
@ -38,6 +43,11 @@ pcie_aspm_policy() {
 }

 cpu_perftune() {
+  CPUPOWERSAVE=$(get_setting system.power.cpu)
+  if [ ! "${CPUPOWERSAVE}" = "1" ]
+  then
+    return 0
+  fi
  CPU="$(awk '/vendor_id/ {print $3;exit}' /proc/cpuinfo)"
  if [ "${CPU}" = "AuthenticAMD" ]
  then
@ -62,6 +72,11 @@ cpu_perftune() {
 }

 audio_powersave() {
+  AUDIOPOWERSAVE=$(get_setting system.power.audio)
+  if [ ! "${AUDIOPOWERSAVE}" = "1" ]
+  then
+    return 0
+  fi
  for MODULE in snd_hda_intel snd_ac97_codec
  do
    if [ -e "/sys/module/${MODULE}/parameters/power_save" ]
@ -71,24 +86,26 @@ audio_powersave() {
  done
 }

-device_powersave() {
-  case ${1} in
-    1)
-      PSMODE=auto
-    ;;
-    *)
-      PSMODE=on
-    ;;
-  esac
-  find /sys/devices -name control -print0 | \
+runtime_power_management() {
+  RTPM=$(get_setting system.power.rtpm)
+  if [ ! "${RTPM}" = "1" ]
+  then
+    return 0
+  fi
+  find /sys/devices -type f -name control -print0 2>/dev/null | \
  while read -r -d '' DEVICE
  do
-    echo ${PSMODE} >"${DEVICE}" 2>/dev/null
+    echo ${1} >"${DEVICE}" 2>/dev/null
  done
 }

-device_powerlevel() {
-  for device in $(find /sys/devices/pci* -name level)
+wake_events() {
+  WAKEEVENTS=$(get_setting system.power.wakeevents)
+  if [ ! "${WAKEEVENTS}" = "1" ]
+  then
+    return 0
+  fi
+  for device in $(find /sys/devices/pci* -type f -name wakeup 2>/dev/null)
  do
    echo ${1} >${device} 2>/dev/null
  done
--- a/packages/sysutils/powerstate/sources/powerstate.sh
+++ b/packages/sysutils/powerstate/sources/powerstate.sh
@ -10,6 +10,7 @@

 . /etc/profile

+BATCNT=0
 while true
 do
  if [ "$(get_setting system.powersave)" = 1 ]
@ -35,8 +36,10 @@ do
          cpu_perftune battery
          gpu_performance_level ${GPUPROFILE}
          pcie_aspm_policy powersave
-          device_powersave 1
-          device_powerlevel auto
+          wake_events enabled
+          runtime_power_management auto
+          /usr/bin/wifictl setpowersave
+
        ;;
        *)
          log $0 "Switching to performance mode."
@ -45,12 +48,27 @@ do
          cpu_perftune performance
          gpu_performance_level auto
          pcie_aspm_policy default
-          device_powersave 0
-          device_powerlevel on
+          wake_events disabled
+          runtime_power_management on
+          /usr/bin/wifictl setpowersave
        ;;
      esac
    fi
    CURRENT_MODE="${STATUS}"
  fi
+  ### Until we have an overlay. :rofl:
+  if (( "${BATCNT}" >= "90" )) &&
+     [[ "${STATUS}" =~ Disch ]]
+  then
+    BATLEFT=$(battery_percent)
+    AUDIBLEALERT=$(get_setting system.battery.warning)
+    if (( "${BATLEFT}" < "25" )) &&
+       [ "${AUDIBLEALERT}" = "1" ]
+    then
+      say "BATTERY AT ${BATLEFT}%"
+      BATCNT=0
+    fi
+  fi
+  BATCNT=$(( ${BATCNT} + 1 ))
  sleep 2
 done
--- a/packages/sysutils/sleep/sources/sleep.sh
+++ b/packages/sysutils/sleep/sources/sleep.sh
@ -12,7 +12,6 @@ else
 fi
 QUIRK_DEVICE="$(echo ${QUIRK_DEVICE} | sed -e "s#[/]#-#g")"

-
 headphones() {
  if [ "${DEVICE_FAKE_JACKSENSE}" == "true" ]
  then
@ -107,8 +106,9 @@ case $1 in
    headphones stop
    volumectl stop
    bluetooth stop
+    runtime_power_management on
+    wake_events disabled
    powerstate stop
-    device_powersave stop 
    modules stop 
    quirks pre
    touch /run/.last_sleep_time
--- a/packages/sysutils/system-utils/sources/scripts/volume_sense
+++ b/packages/sysutils/system-utils/sources/scripts/volume_sense
@ -131,9 +131,21 @@ mkcontroller 2>/dev/null ||:
            DOWN="down"
            REPEAT_MOD=${BRIGHTNESS_REPEAT_MOD}
          elif [[ "${FUNCB_PRESSED}" == "yes" ]]; then
-	    COMMAND="/usr/bin/say"
-            UP="-b"
-            DOWN="-b"
+            if [[ "${line}" == ${VOL_UP} ]]; then
+	      COMMAND="/usr/bin/say"
+              UP="-b"
+            else
+              COMMAND="/usr/bin/wifictl"
+              WIFISTATE=$(get_setting wifi.enabled)
+	      if [ "${WIFISTATE}" = 0 ]
+              then
+                DOWN="reconnect"
+		/usr/bin/say "WIFI On"
+	      else
+	        DOWN="disable"
+		/usr/bin/say "WIFI Off"
+              fi
+            fi
          else
            # Default to 'volume' if Fn a or b is not pressed
            COMMAND="/usr/bin/system_utils vol"
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@ -846,7 +846,7 @@ makeinstall_target() {
  add_es_system doom

  ### Media Player
-  add_emu_core mpv mpv true
+  add_emu_core mplayer mplayer mplayer true
  add_es_system mplayer

  ### Moonlight