Merge pull request #2468 from JustEnoughLinuxOS/dev

PR for release
JustEnoughLinuxOS · Dec 1, 2023 · fa8ec7d · fa8ec7d
2 parents 4be1a05 + 078bfeb
commit fa8ec7d
Show file tree

Hide file tree

Showing 73 changed files with 1,069 additions and 4,316 deletions.
diff --git a/config/blocklist b/config/blocklist
@@ -9,6 +9,5 @@ ryujinx-sa #broken on JELOS after build 1.1740.
 melonds-sa #Broken OpenGL renderer upstream
 mupen64plus-sa-ui-console #Causes segfaults
 nanoboyadvance-sa #SDL version removed after this commit
-freechaf-lr #build issue, revisit.
-pcsx_rearmed-lr #pins version as new releases have artifacting issues.
 kronos-sa #using the release version of kronos had better results.
+retroarch #pinning to release versions for stability.
diff --git a/packages/apps/portmaster/scripts/start_portmaster.sh b/packages/apps/portmaster/scripts/start_portmaster.sh
@@ -34,7 +34,7 @@ if [ ! -d "/storage/roms/ports/PortMaster" ]; then
 fi
 
 #We dont use tasksetter, delete it
-if [ ! -f /storage/roms/ports/PortMaster/tasksetter ]; then
+if [ -f /storage/roms/ports/PortMaster/tasksetter ]; then
   rm -r /storage/roms/ports/PortMaster/tasksetter
 fi
 
@@ -65,6 +65,9 @@ else
   xmlstarlet ed --inplace --subnode "/gameList/folder[last()]" --type elem -n hidden -v "true" /storage/roms/ports/gamelist.xml
 fi
 
+#Make sure permissions are correct in the PortMaster folder
+chmod 755 /storage/roms/ports/PortMaster/* -R
+
 #Start PortMaster
 @LIBEGL@
 cd /storage/roms/ports/PortMaster

diff --git a/packages/audio/pipewire/package.mk b/packages/audio/pipewire/package.mk
@@ -17,6 +17,7 @@ if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then
                           -Dbluez5-backend-ofono=disabled \
                           -Dbluez5-backend-hsphfpd=disabled \
                           -Dbluez5-codec-aptx=enabled \
+                          -Dbluez5-codec-lc3plus=disabled \
                           -Dbluez5-codec-ldac=enabled \
                           -Dbluez5-codec-aac=enabled"
 else
@@ -83,6 +84,8 @@ pre_configure_target() {
 }
 
 post_install() {
+  add_user pipewire x 982 980 "pipewire-daemon" "/var/run/pipewire" "/bin/sh"
+  add_group pipewire 980
   mkdir -p ${INSTALL}/etc/alsa/conf.d
   ln -sf /usr/share/alsa/alsa.conf.d/50-pipewire.conf ${INSTALL}/etc/alsa/conf.d/50-pipewire.conf
   ln -sf /usr/share/alsa/alsa.conf.d/99-pipewire-default.conf ${INSTALL}/etc/alsa/conf.d/99-pipewire-default.conf

diff --git a/packages/emulators/libretro/freechaf-lr/package.mk b/packages/emulators/libretro/freechaf-lr/package.mk
@@ -1,5 +1,5 @@
 PKG_NAME="freechaf-lr"
-PKG_VERSION="4d1d5cb83b93728a63f03454e472a23055d9bbfc"
+PKG_VERSION="782739dd6988b0148f9c26ddc6ff414e76e54d7b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="pcsx_rearmed-lr"
-PKG_VERSION="e34ef5a"
+PKG_VERSION="ff3890db8ef473ee5eae6a7120ee39d761a86620"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/pcsx_rearmed"

diff --git a/packages/emulators/standalone/primehack/package.mk b/packages/emulators/standalone/primehack/package.mk
@@ -7,6 +7,7 @@ PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb zstd
 PKG_SITE="https://github.com/shiiion/dolphin"
 PKG_URL="${PKG_SITE}.git"
 PKG_VERSION="48dbd3a4a7249948d3e7e21b20842d493c3b00cb"
+PKG_GIT_CLONE_BRANCH="master"
 PKG_LONGDESC="PrimeHack – A Dolphin Emulator fork for Metroid Prime Trilogy."
 PKG_PATCH_DIRS+=" wayland"
 

diff --git 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="f091b5a9e9475255e5efaded5f95c9750fdfe15e"
+PKG_VERSION="6c2cc456284fcfa6fa5f94664950926c020d2f7b" # v1.16.0.3
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"

diff --git a/packages/emulators/standalone/rpcs3-sa/package.mk b/packages/emulators/standalone/rpcs3-sa/package.mk
@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="rpcs3-sa"
-PKG_VERSION="ed75bab7b284a9cb62b7308097108e4caef9a0b3"
+PKG_VERSION="7081b89e976ad7f931c926022bd93ddd9778347c"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL-2.0-or-later"
 PKG_SITE="https://rpcs3.net"
@@ -16,7 +16,9 @@ PKG_GIT_CLONE_BRANCH="master"
 PKG_GIT_CLONE_SINGLE="yes"
 
 pre_configure_host() {
-  PKG_CMAKE_SCRIPT="${PKG_BUILD}/3rdparty/llvm/llvm/llvm/CMakeLists.txt"
+  # path changes in future commits.
+  # PKG_CMAKE_SCRIPT="${PKG_BUILD}/3rdparty/llvm/llvm/llvm/CMakeLists.txt"
+  PKG_CMAKE_SCRIPT="${PKG_BUILD}/llvm/CMakeLists.txt"
   PKG_CMAKE_OPTS_HOST="-DLLVM_TARGETS_TO_BUILD="X86" \
                        -DLLVM_BUILD_RUNTIME=OFF \
                        -DLLVM_BUILD_TOOLS=OFF \

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
@@ -22,7 +22,7 @@ case ${DEVICE} in
 	PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
   ;;
   *)
-	PKG_VERSION="23.2.1"
+	PKG_VERSION="23.3.0"
 	PKG_SITE="http://www.mesa3d.org/"
 	PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"
   ;;

diff --git a/packages/graphics/mesa/patches/AMD64/000-fix-i686.patch b/packages/graphics/mesa/patches/AMD64/000-fix-i686.patch
diff --git a/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config b/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config
@@ -13,5 +13,5 @@ DEVICE_VOLUME="100"
 DEVICE_BATTERY_LED_STATUS="true"
 DEVICE_PWR_LED_GPIO="77"
 DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone0/temp"
-
+DEVICE_MMC_EJECT="false"
 EOF
diff --git a/packages/hardware/quirks/devices/Anbernic RG552/010-governors b/packages/hardware/quirks/devices/Anbernic RG552/010-governors
@@ -7,3 +7,8 @@ CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0" "/sys/devices/system/cpu/cpu
 GPU_FREQ="/sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu"
 DMC_FREQ="/sys/devices/platform/memory-controller/devfreq/memory-controller/"
 EOF
+
+### Lock in lowest freq we want to use
+echo 1008000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+echo 1008000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq
+echo 600000000 > /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/min_freq
diff --git a/packages/hardware/quirks/devices/Anbernic RG552/sleep.d/post/002-freq b/packages/hardware/quirks/devices/Anbernic RG552/sleep.d/post/002-freq
@@ -0,0 +1,32 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Restore previous governors before going to sleep
+
+. /etc/profile
+
+### Set max/min freq to lowest available value
+echo 1008000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+echo 1008000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq
+echo 600000000 > /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/min_freq
+
+echo 1608000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
+echo 2088000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_max_freq
+echo 900000000 > /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/max_freq
+
+### Grab the old governors.
+OLD_CPU_FREQ=$(get_setting "sleep.cpugovernor")
+if [ ! -n "${OLD_CPU_FREQ}" ]; then
+  OLD_CPU_FREQ="schedutil"
+fi
+
+OLD_GPU_FREQ=$(get_setting "sleep.gpugovernor")
+if [ ! -n "${OLD_GPU_FREQ}" ]; then
+  OLD_GPU_FREQ="simple_ondemand"
+fi
+
+# Restore old governors.
+set_cpu_gov "${OLD_CPU_FREQ}"
+set_dmc_gov "${OLD_CPU_FREQ}"
+set_gpu_gov "${OLD_GPU_FREQ}"
diff --git a/packages/hardware/quirks/devices/Anbernic RG552/sleep.d/pre/002-freq b/packages/hardware/quirks/devices/Anbernic RG552/sleep.d/pre/002-freq
@@ -0,0 +1,28 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+# Store current freq governors and set governors to powersave.
+
+. /etc/profile
+
+### Get the current cpu and gpu governor, save for when the device wakes from sleep.
+CUR_CPU_FREQ="$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_governor)"
+CUR_GPU_FREQ="$(cat /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/governor)"
+
+set_setting sleep.cpugovernor "${CUR_CPU_FREQ}"
+set_setting sleep.gpugovernor "${CUR_GPU_FREQ}"
+
+### Set all governors to powersave
+set_cpu_gov powersave
+set_dmc_gov powersave
+set_gpu_gov powersave
+
+### Set max/min freq to lowest available value
+echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+echo 600000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_min_freq
+echo 200000000 > /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/min_freq
+
+echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
+echo 600000 > /sys/devices/system/cpu/cpufreq/policy4/scaling_max_freq
+echo 200000000 > /sys/devices/platform/ff9a0000.gpu/devfreq/ff9a0000.gpu/max_freq
diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config
@@ -10,4 +10,5 @@ DEVICE_SW_HP_SWITCH="true"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_BRIGHTNESS="128"
+DEVICE_MMC_EJECT="false"
 EOF
diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config
@@ -14,5 +14,5 @@ DEVICE_VOLUME="100"
 DEVICE_BATTERY_LED_STATUS="true"
 DEVICE_PWR_LED_GPIO="77"
 DEVICE_TEMP_SENSOR="/sys/devices/virtual/thermal/thermal_zone0/temp"
-
+DEVICE_MMC_EJECT="false"
 EOF
diff --git a/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config
@@ -9,4 +9,5 @@ DEVICE_POWER_LED="false"
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
 DEVICE_BRIGHTNESS="128"
+DEVICE_MMC_EJECT="false"
 EOF
diff --git a/packages/hardware/quirks/platforms/RK3326/sleep.d/post/002-freq b/packages/hardware/quirks/platforms/RK3326/sleep.d/post/002-freq
@@ -0,0 +1,23 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+### Restore previous governors before going to sleep
+
+. /etc/profile
+
+### Grab the old governors.
+OLD_CPU_FREQ=$(get_setting "sleep.cpugovernor")
+if [ ! -n "${OLD_CPU_FREQ}" ]; then
+  OLD_CPU_FREQ="schedutil"
+fi
+
+OLD_GPU_FREQ=$(get_setting "sleep.gpugovernor")
+if [ ! -n "${OLD_GPU_FREQ}" ]; then
+  OLD_GPU_FREQ="simple_ondemand"
+fi
+
+# Restore old governors.
+set_cpu_gov "${OLD_CPU_FREQ}"
+set_dmc_gov "${OLD_CPU_FREQ}"
+set_gpu_gov "${OLD_GPU_FREQ}"
diff --git a/packages/hardware/quirks/platforms/RK3326/sleep.d/pre/002-freq b/packages/hardware/quirks/platforms/RK3326/sleep.d/pre/002-freq
@@ -0,0 +1,19 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+# Store current freq governors and set governors to powersave.
+
+. /etc/profile
+
+### Get the current cpu and gpu governor, save for when the device wakes from sleep.
+CUR_CPU_FREQ="$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_governor)"
+CUR_GPU_FREQ="$(cat /sys/devices/platform/ff400000.gpu/devfreq/ff400000.gpu/governor)"
+
+set_setting sleep.cpugovernor "${CUR_CPU_FREQ}"
+set_setting sleep.gpugovernor "${CUR_GPU_FREQ}"
+
+### Set all governors to powersave
+set_cpu_gov powersave
+set_dmc_gov powersave
+set_gpu_gov powersave
diff --git a/packages/hardware/quirks/profile.d/999-export b/packages/hardware/quirks/profile.d/999-export
@@ -26,6 +26,7 @@ export  SLOW_CORES \
 	DEVICE_KEY_VOLUMEUP \
         DEVICE_LED_BRIGHTNESS \
 	DEVICE_LED_CONTROL \
+	DEVICE_MMC_EJECT \
         DEVICE_PIPEWIRE_PROFILE \
 	DEVICE_PWR_LED_CONTROL \
 	DEVICE_PWR_LED_GPIO \

diff --git a/packages/jelos/autostart/001-setup b/packages/jelos/autostart/001-setup
@@ -25,42 +25,9 @@ fi
 ### to last known good state if corrupt.
 /usr/bin/chksysconfig verify
 
+### Clean up settings
+sort_settings
+
 ### We do not want to mount the cloud drive on startup
 ### so we'll reset the mount option to 0.
 set_setting clouddrive.mounted 0
-
-### Enable the desired number of threads.
-tocon "Restoring cpu threads..."
-NUMTHREADS=$(get_setting "system.threads")
-if [ -n "${NUMTHREADS}" ]
-then
-        onlinethreads ${NUMTHREADS} 0
-else
-        onlinethreads all 1
-fi
-
-### If we don't have a default governor set, set it
-### to schedutil.
-if [ -z "$(get_setting system.cpugovernor)" ]
-then
-  set_setting system.cpugovernor schedutil
-fi
-
-### Set the default GPU performance mode
-GPUPERF=$(get_setting system.gpuperf)
-if [ -n "${GPUPERF}" ]
-then
-  gpu_performance_level ${GPUPERF}
-fi
-
-### Configure suspend mode.
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -n "${MYSLEEPMODE}" ]
-then
-  /usr/bin/suspendmode ${MYSLEEPMODE}
-else
-  /usr/bin/suspendmode mem
-fi
-
-### Clean up settings
-sort_settings
diff --git a/packages/jelos/autostart/008-perfmode b/packages/jelos/autostart/008-perfmode
@@ -0,0 +1,33 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+# Minimal OS variable loading for performance
+. /etc/profile.d/001-functions
+. /etc/profile.d/099-freqfunctions
+
+tocon "Setting performance mode..."
+
+### Enable the desired number of threads.
+tocon "Restoring cpu threads..."
+NUMTHREADS=$(get_setting "system.threads")
+if [ -n "${NUMTHREADS}" ]
+then
+        onlinethreads ${NUMTHREADS} 0
+else
+        onlinethreads all 1
+fi
+
+### If we don't have a default governor set, set it
+### to schedutil but don't enable it.
+if [ -z "$(get_setting system.cpugovernor)" ]
+then
+  set_setting system.cpugovernor schedutil
+fi
+
+### Set the default GPU performance mode
+GPUPERF=$(get_setting system.gpuperf)
+if [ -n "${GPUPERF}" ]
+then
+  gpu_performance_level ${GPUPERF}
+fi
diff --git a/packages/jelos/autostart/009-sleepmode b/packages/jelos/autostart/009-sleepmode
@@ -0,0 +1,17 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
+
+# Minimal OS variable loading for performance
+. /etc/profile.d/001-functions
+
+tocon "Configure suspend mode..."
+
+### Configure suspend mode.
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -n "${MYSLEEPMODE}" ]
+then
+  /usr/bin/suspendmode ${MYSLEEPMODE}
+else
+  /usr/bin/suspendmode mem
+fi