diff --git a/Makefile b/Makefile index d1c215952..0389a0571 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ RK3588: PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro RK3566: - PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro - PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro + DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro + DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro RK3566-X55: DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=arm ./scripts/build_distro diff --git a/distributions/JELOS/options b/distributions/JELOS/options index 675f9a7d4..7ed560e97 100644 --- a/distributions/JELOS/options +++ b/distributions/JELOS/options @@ -40,9 +40,12 @@ # build and install PulseAudio support (yes / no) PULSEAUDIO_SUPPORT="yes" +# Fetch seconds since epoch for packages with no external sources. + AUTO_VERSION=$(date +%s) + # Define package sets to clean based on the type of build being executed. # This should be updated to be more dynamic in the future. - CLEAN_OS_BASE="initramfs modules quirks autostart splash jelos" + CLEAN_OS_BASE="initramfs system-utils modules quirks autostart splash jelos" CLEAN_NETWORK="RTL8821CS-firmware" CLEAN_EMU_32BIT="lib32 box86 flycast-lr pcsx_rearmed-lr" diff --git a/packages/audio/alsa-lib/package.mk b/packages/audio/alsa-lib/package.mk index 809e5b77e..b4400a8c5 100644 --- a/packages/audio/alsa-lib/package.mk +++ b/packages/audio/alsa-lib/package.mk @@ -28,7 +28,7 @@ else PKG_ALSA_DEBUG=--without-debug fi -PKG_CONFIGURE_OPTS_TARGET="${PKG_ALSA_DEBUG} \ +PKG_CONFIGURE_OPTS_TARGET+="${PKG_ALSA_DEBUG} \ --disable-dependency-tracking \ --with-plugindir=/usr/lib/alsa \ --disable-python" diff --git a/packages/compat/lib32/package.mk b/packages/compat/lib32/package.mk index 61240d1f0..e67cce72a 100644 --- a/packages/compat/lib32/package.mk +++ b/packages/compat/lib32/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC) PKG_NAME="lib32" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="aarch64 x86_64" PKG_LICENSE="GPLv2" PKG_DEPENDS_TARGET="toolchain retroarch SDL2 libsndfile libmodplug" diff --git a/packages/emulators/libretro/parallel-n64-lr/package.mk b/packages/emulators/libretro/parallel-n64-lr/package.mk index b66fb4e10..d9486a078 100644 --- a/packages/emulators/libretro/parallel-n64-lr/package.mk +++ b/packages/emulators/libretro/parallel-n64-lr/package.mk @@ -22,7 +22,7 @@ if [ "${OPENGLES_SUPPORT}" = yes ]; then fi case ${DEVICE} in - RK35*|S922X) + RK35*|S922X*) PKG_MAKE_OPTS_TARGET=" platform=${DEVICE}" ;; esac diff --git a/packages/emulators/libretro/tyrquake-lr/config/common/games/_Scan Quake Games.sh b/packages/emulators/libretro/tyrquake-lr/config/common/games/_Scan Quake Games.sh deleted file mode 100644 index 400289b10..000000000 --- a/packages/emulators/libretro/tyrquake-lr/config/common/games/_Scan Quake Games.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright (C) 2022-present travis134 - -. /etc/profile - -QUAKEPATH="/storage/roms/quake" - -clear -echo "Scanning for games..." -pak_files=$(find "${QUAKEPATH}" -mindepth 1 -type f -iname pak0.pak) -echo "Adding games..." -while read -r pak_file; do - abs_path=$(dirname "${pak_file}") - path=${abs_path#"$QUAKEPATH/"} - filename="${path##*/}" - if [[ "${path,,}" == *"id1"* ]]; then - filename="Quake" - elif [[ "${path,,}" == *"hipnotic"* ]]; then - filename="Quake Mission Pack 1 - Scourge of Armagon" - elif [[ "${path,,}h" == *"rogue"* ]]; then - filename="Quake Mission Pack 2 - Dissolution of Eternity" - elif [[ "${path,,}" == *"dopa"* ]]; then - filename="Quake - Dimension of the Past" - fi - file="${QUAKEPATH}/${filename}.quake" - cat >"${file}" <<-EOM - PAK=${pak_file} - -- end -- - EOM -done <<<"${pak_files}" -clear diff --git a/packages/emulators/libretro/tyrquake-lr/package.mk b/packages/emulators/libretro/tyrquake-lr/package.mk index 9fe9377bb..54f1bd1dc 100644 --- a/packages/emulators/libretro/tyrquake-lr/package.mk +++ b/packages/emulators/libretro/tyrquake-lr/package.mk @@ -44,11 +44,5 @@ pre_configure_target() { makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro - mkdir -p ${INSTALL}/usr/config/game/tyrquake - mkdir -p ${INSTALL}/usr/lib/autostart/common cp tyrquake_libretro.so ${INSTALL}/usr/lib/libretro/ - cp -rf ${PKG_DIR}/config/common/* ${INSTALL}/usr/config/game/tyrquake - chmod 0755 ${INSTALL}/usr/config/game/tyrquake/games/*sh - cp ${PKG_DIR}/sources/autostart/common/* ${INSTALL}/usr/lib/autostart/common - chmod 0755 ${INSTALL}/usr/lib/autostart/common/* } diff --git a/packages/emulators/libretro/tyrquake-lr/sources/autostart/common/011-tyrquake b/packages/emulators/libretro/tyrquake-lr/sources/autostart/common/011-tyrquake deleted file mode 100644 index b80c65896..000000000 --- a/packages/emulators/libretro/tyrquake-lr/sources/autostart/common/011-tyrquake +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# Copyright (C) 2022-present travis134 - -if [ ! -e "/storage/roms/quake/_Scan Quake Games.sh" ]; then - cp "/usr/config/game/tyrquake/games/_Scan Quake Games.sh" "/storage/roms/quake/_Scan Quake Games.sh" - chmod +x "/storage/roms/quake/_Scan Quake Games.sh" -fi diff --git a/packages/emulators/libretro/yabasanshiro-lr/package.mk b/packages/emulators/libretro/yabasanshiro-lr/package.mk index f9f397749..5731ebc95 100644 --- a/packages/emulators/libretro/yabasanshiro-lr/package.mk +++ b/packages/emulators/libretro/yabasanshiro-lr/package.mk @@ -46,7 +46,7 @@ fi pre_configure_target() { case ${DEVICE} in - RK35*|S922X) + RK35*|S922X*) PKG_MAKE_OPTS_TARGET+=" -C yabause/src/libretro platform=rockpro64 HAVE_NEON=0 FORCE_GLES=1" ;; *) diff --git a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini b/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini index 515ebb007..fa2e55bc5 100644 --- a/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini +++ b/packages/emulators/standalone/aethersx2-sa/config/S922X/aethersx2/inis/PCSX2.ini @@ -194,7 +194,7 @@ OutputModule = cubeb Latency = 100 SynchMode = 0 SpeakerConfiguration = 0 -BackendName = +BackendName = [DEV9/Eth] EthEnable = false @@ -224,16 +224,16 @@ HddSizeSectors = 83886080 [EmuCore/Gamefixes] -VuAddSubHack = false -FpuMulHack = false +VuAddSubHack = true +FpuMulHack = true FpuNegDivHack = false XgKickHack = false -EETimingHack = false +EETimingHack = true SoftwareRendererFMVHack = false SkipMPEGHack = false OPHFlagHack = false -DMABusyHack = false -VIFFIFOHack = false +DMABusyHack = true +VIFFIFOHack = true VIF1StallHack = false GIFFIFOHack = false GoemonTlbHack = false diff --git a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh index 3037ad3a1..90edf9602 100755 --- a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh +++ b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh @@ -40,6 +40,7 @@ fi #Emulation Station Features GAME=$(echo "${1}"| sed "s#^/.*/##") ASPECT=$(get_setting aspect_ratio ps2 "${GAME}") + FILTER=$(get_setting bilinear_filtering ps2 "${GAME}") FPS=$(get_setting show_fps ps2 "${GAME}") RATE=$(get_setting ee_cycle_rate ps2 "${GAME}") SKIP=$(get_setting ee_cycle_skip ps2 "${GAME}") @@ -61,6 +62,24 @@ fi sed -i '/^AspectRatio =/c\AspectRatio = Stretch' /storage/.config/aethersx2/inis/PCSX2.ini fi + #Bilinear Filtering + if [ "$FILTER" = "0" ] + then + sed -i '/^filter =/c\filter = 0' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$FILTER" = "1" ] + then + sed -i '/^filter =/c\filter = 1' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$FILTER" = "2" ] + then + sed -i '/^filter =/c\filter = 2' /storage/.config/aethersx2/inis/PCSX2.ini + fi + if [ "$FILTER" = "3" ] + then + sed -i '/^filter =/c\filter = 3' /storage/.config/aethersx2/inis/PCSX2.ini + fi + #Graphics Backend if [ "$GRENDERER" = "0" ] then diff --git a/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini b/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini index e220b8308..b5ea3bfa9 100644 --- a/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini +++ b/packages/emulators/standalone/dolphin-sa/config/S922X/Dolphin.ini @@ -77,7 +77,7 @@ Fastmem = True CPUThread = True DSPHLE = True SkipIdle = True -SyncOnSkipIdle = True +SyncOnSkipIdle = False SyncGPU = False SyncGpuMaxDistance = 200000 SyncGpuMinDistance = -200000 @@ -120,9 +120,9 @@ RunCompareServer = False RunCompareClient = False EmulationSpeed = 1.00000000 FrameSkip = 0x00000003 -Overclock = 4.00000000 +Overclock = 1.0 OverclockEnable = False -GFXBackend = Vulkan +GFXBackend = Vulkan GPUDeterminismMode = auto PerfMapDir = [Movie] @@ -138,6 +138,7 @@ DumpUCode = False Backend = ALSA Volume = 100 CaptureLog = False +DSPThread = True [Input] BackgroundInput = False [FifoPlayer] diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh index b5e2bd753..d3fc49a01 100755 --- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh +++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh @@ -41,6 +41,7 @@ fi GAME=$(echo "${1}"| sed "s#^/.*/##") AA=$(get_setting anti_aliasing gamecube "${GAME}") ASPECT=$(get_setting aspect_ratio gamecube "${GAME}") + CLOCK=$(get_setting clock_speed gamecube "${GAME}") RENDERER=$(get_setting graphics_backend gamecube "${GAME}") IRES=$(get_setting internal_resolution gamecube "${GAME}") FPS=$(get_setting show_fps gamecube "${GAME}") @@ -102,6 +103,34 @@ fi sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini fi + #Clock Speed + sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini + if [ "$CLOCK" = "0" ] + then + sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "1" ] + then + sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "2" ] + then + sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "3" ] + then + sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "4" ] + then + sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + #Video Backend if [ "$RENDERER" = "opengl" ] then diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh index 038ee2776..fb5a948d1 100755 --- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh +++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh @@ -44,6 +44,7 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves GAME=$(echo "${1}"| sed "s#^/.*/##") AA=$(get_setting anti_aliasing wii "${GAME}") ASPECT=$(get_setting aspect_ratio wii "${GAME}") + CLOCK=$(get_setting clock_speed wii "${GAME}") RENDERER=$(get_setting graphics_backend wii "${GAME}") IRES=$(get_setting internal_resolution wii "${GAME}") FPS=$(get_setting show_fps wii "${GAME}") @@ -105,6 +106,34 @@ ln -sf /storage/roms/savestates/wii /storage/.config/dolphin-emu/StateSaves sed -i '/AspectRatio/c\AspectRatio = 3' /storage/.config/dolphin-emu/GFX.ini fi + #Clock Speed + sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini + if [ "$CLOCK" = "0" ] + then + sed -i '/^Overclock =/c\Overclock = 0.5' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "1" ] + then + sed -i '/^Overclock =/c\Overclock = 0.75' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "2" ] + then + sed -i '/^Overclock =/c\Overclock = 1.0' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = False' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "3" ] + then + sed -i '/^Overclock =/c\Overclock = 1.25' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + if [ "$CLOCK" = "4" ] + then + sed -i '/^Overclock =/c\Overclock = 1.5' /storage/.config/dolphin-emu/Dolphin.ini + sed -i '/^OverclockEnable =/c\OverclockEnable = True' /storage/.config/dolphin-emu/Dolphin.ini + fi + #Video Backend if [ "$RENDERER" = "opengl" ] then diff --git a/packages/emulators/standalone/drastic-sa/package.mk b/packages/emulators/standalone/drastic-sa/package.mk index baa77abd6..17e6c2c94 100644 --- a/packages/emulators/standalone/drastic-sa/package.mk +++ b/packages/emulators/standalone/drastic-sa/package.mk @@ -18,8 +18,8 @@ makeinstall_target() { mkdir -p ${INSTALL}/usr/bin case ${DEVICE} in - S922X) - cp -rf ${PKG_DIR}/scripts/${DEVICE}/* ${INSTALL}/usr/bin + S922X*) + cp -rf ${PKG_DIR}/scripts/S922X/* ${INSTALL}/usr/bin ;; *) cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit index 28139df8b..d0bc840f9 100755 --- a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-hardwareinit @@ -4,10 +4,6 @@ . /etc/profile -### Set GPU Govorner to powersave during boot - -echo powersave > /sys/devices/platform/soc/ffe40000.gpu/devfreq/ffe40000.gpu/governor - ### Disable blue blinking led echo none > /sys/class/leds/blue\:/trigger diff --git a/packages/hardware/quirks/package.mk b/packages/hardware/quirks/package.mk index a950c141b..39018f221 100644 --- a/packages/hardware/quirks/package.mk +++ b/packages/hardware/quirks/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="quirks" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="apache2" PKG_SITE="" diff --git a/packages/jelos/autostart/008-network b/packages/jelos/autostart/008-network index 8d32439cb..d95699739 100755 --- a/packages/jelos/autostart/008-network +++ b/packages/jelos/autostart/008-network @@ -10,12 +10,6 @@ HOSTNAME=$(get_setting system.hostname) hostname ${HOSTNAME} avahi-set-host-name ${HOSTNAME} -NETCHECK=$(systemctl status connman >/dev/null 2>&1) -if [ "$?" = "0" ] -then - systemctl stop connman -fi - if [ "$(get_setting network.enabled)" == "0" ] || [ "$1" == "disable" ] then nohup wifictl disable & diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk index b232c36cb..9e9721da4 100644 --- a/packages/jelos/package.mk +++ b/packages/jelos/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="jelos" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="apache2" PKG_SITE="" diff --git a/packages/jelos/profile.d/99-freqfunctions b/packages/jelos/profile.d/99-freqfunctions index e72e4d673..278b1080a 100644 --- a/packages/jelos/profile.d/99-freqfunctions +++ b/packages/jelos/profile.d/99-freqfunctions @@ -88,14 +88,14 @@ performance() { ondemand() { set_cpu_gov ondemand set_amdgpu_perf auto - set_gpu_gov ondemand + set_gpu_gov simple_ondemand set_dmc_gov ondemand } schedutil() { set_cpu_gov schedutil set_amdgpu_perf auto - set_gpu_gov ondemand + set_gpu_gov simple_ondemand set_dmc_gov ondemand } diff --git a/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk b/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk index 6ed57deb8..83173f5e1 100644 --- a/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk +++ b/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="RTL8821CS-firmware" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_LICENSE="Apache-2.0" PKG_SITE="www.jelos.org" PKG_LONGDESC="Realtek RTL8821CS Linux firmware" diff --git a/packages/misc/modules/package.mk b/packages/misc/modules/package.mk index e343083bb..1ff2c7c3f 100644 --- a/packages/misc/modules/package.mk +++ b/packages/misc/modules/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="modules" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="custom" PKG_SITE="" diff --git a/packages/multimedia/gstreamer/gst-plugins-base/package.mk b/packages/multimedia/gstreamer/gst-plugins-base/package.mk index 0f3842f1e..b8df1f967 100644 --- a/packages/multimedia/gstreamer/gst-plugins-base/package.mk +++ b/packages/multimedia/gstreamer/gst-plugins-base/package.mk @@ -21,7 +21,7 @@ pre_configure_target() { # Fix missing dispmanx case ${DEVICE} in - RK35*|S922X) + RK35*|S922X*) PKG_MESON_OPTS_TARGET+=" -Dgl-graphene=disabled" ;; esac diff --git a/packages/sysutils/autostart/package.mk b/packages/sysutils/autostart/package.mk index 6e1a47ab5..ce690555f 100644 --- a/packages/sysutils/autostart/package.mk +++ b/packages/sysutils/autostart/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="autostart" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="apache2" PKG_SITE="" diff --git a/packages/sysutils/powerstate/package.mk b/packages/sysutils/powerstate/package.mk index 41431a80a..b71ad023b 100644 --- a/packages/sysutils/powerstate/package.mk +++ b/packages/sysutils/powerstate/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="powerstate" -PKG_VERSION="" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_DEPENDS_TARGET="systemd" diff --git a/packages/sysutils/sleep/package.mk b/packages/sysutils/sleep/package.mk index 93c6aa06c..5958fe3c8 100644 --- a/packages/sysutils/sleep/package.mk +++ b/packages/sysutils/sleep/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="sleep" -PKG_VERSION="" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_DEPENDS_TARGET="systemd" diff --git a/packages/sysutils/system-utils/package.mk b/packages/sysutils/system-utils/package.mk index 1cef829ff..29ddddd5c 100644 --- a/packages/sysutils/system-utils/package.mk +++ b/packages/sysutils/system-utils/package.mk @@ -1,7 +1,7 @@ # Copyright (C) 2021-present Fewtarius PKG_NAME="system-utils" -PKG_VERSION="" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="mix" PKG_DEPENDS_TARGET="toolchain sleep" diff --git a/packages/sysutils/systemd/scripts/userconfig-setup b/packages/sysutils/systemd/scripts/userconfig-setup index e2a22a409..4f8cd2464 100755 --- a/packages/sysutils/systemd/scripts/userconfig-setup +++ b/packages/sysutils/systemd/scripts/userconfig-setup @@ -15,20 +15,20 @@ then if [ -e "/usr/bin/emulationstation" ] then tocon "Installing themes..." - mkdir -p /storage/.config/emulationstation/themes >>/var/log/configure.log - ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme >>/var/log/configure.log 2>&1 - ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec >>/var/log/configure.log 2>&1 - ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal >>/var/log/configure.log 2>&1 + mkdir -p /storage/.config/emulationstation/themes >/dev/null + ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme >/dev/null 2>&1 + ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec >/dev/null 2>&1 + ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal >/dev/null 2>&1 ### Link the game controller database so it is managed with OS updates. tocon "Configuring controller database..." - rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >>/var/log/configure.log 2>&1 - ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >>/var/log/configure.log 2>&1 + rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >/dev/null 2>&1 + ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt >/dev/null 2>&1 ### Remove and link es configs so they are managed with OS updates. for es_cfg in es_features.cfg es_systems.cfg do - ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} >>/var/log/configure.log 2>&1 + ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} >/dev/null 2>&1 done ### Configure the ES splash to the distribution splash @@ -72,25 +72,25 @@ then rm -f /tmp/.logo.png fi - mkdir -p /storage/.config/modprobe.d >>/var/log/configure.log 2>&1 - touch /storage/.configured >>/var/log/configure.log 2>&1 + mkdir -p /storage/.config/modprobe.d >/dev/null 2>&1 + touch /storage/.configured >/dev/null 2>&1 fi if [ ! -e "/storage/.cache/ld.so.cache" ] then tocon "Initializing library cache..." ### Create library cache - ldconfig -X >>/var/log/configure.log 2>&1 + ldconfig -X >/dev/null 2>&1 fi if [ ! -d "/storage/.config/locale" ] then tocon "Initializing language support..." - rsync -a --delete /usr/config/locale/* /storage/.config/locale/ >>/var/log/configure.log 2>&1 - if [ ! -L "/storage/.config/emulationstation/locale" ] + rsync -a --delete /usr/config/locale/* /storage/.config/locale/ >/dev/null 2>&1 + if [ ! -L "/storage/.config/emulationstation/locale" ] && [ -e "/usr/bin/emulationstation" ] then - rm -rf /storage/.config/emulationstation/locale >>/var/log/configure.log 2>&1 ||: + rm -rf /storage/.config/emulationstation/locale >/dev/null 2>&1 ||: ln -sf /usr/share/locale /storage/.config/emulationstation/locale fi fi diff --git a/packages/sysutils/util-linux/sysctl.d/swappiness.conf b/packages/sysutils/util-linux/sysctl.d/swappiness.conf deleted file mode 100644 index b700b4d79..000000000 --- a/packages/sysutils/util-linux/sysctl.d/swappiness.conf +++ /dev/null @@ -1 +0,0 @@ -vm.swappiness=10 \ No newline at end of file diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg index 54fa65eea..a416fa0d3 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -62,6 +62,13 @@ + + + + + + + @@ -103,6 +110,13 @@ + + + + + + + @@ -310,6 +324,12 @@ + + + + + + diff --git a/packages/ui/splash/package.mk b/packages/ui/splash/package.mk index 9ecc8e3fa..a5d01a2a7 100644 --- a/packages/ui/splash/package.mk +++ b/packages/ui/splash/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="splash" -PKG_VERSION="$(date +%Y%m%d)" +PKG_VERSION="${AUTO_VERSION}" PKG_ARCH="any" PKG_LICENSE="apache2" PKG_SITE="" diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 480271134..e111218db 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -49,7 +49,7 @@ case "${DEVICE}" in PKG_EMUS+=" dolphin-sa drastic-sa yabasanshiro-sa" PKG_RETROARCH+=" retropie-shaders" ;; - S922X) + S922X*) [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 flycast-lr pcsx_rearmed-lr" PKG_EMUS+=" aethersx2-sa dolphin-sa drastic-sa duckstation-sa mupen64plus-sa yabasanshiro-sa box64" LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr flycast-lr dolphin-lr yabasanshiro-sa" diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index bfa4ae053..ea289ec57 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="initramfs" -PKG_VERSION="" +PKG_VERSION="${AUTO_VERSION}" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" @@ -11,28 +11,28 @@ PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init splash:init util PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing initramfs" -if [ "$ISCSI_SUPPORT" = yes ]; then +if [ "${ISCSI_SUPPORT}" = yes ]; then PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} open-iscsi:init" fi -if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then +if [ "${INITRAMFS_PARTED_SUPPORT}" = yes ]; then PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} parted:init" fi post_install() { - ( cd $BUILD/initramfs + ( cd ${BUILD}/initramfs if [ "${TARGET_ARCH}" = "x86_64" ]; then - ln -sfn /usr/lib $BUILD/initramfs/lib64 - mkdir -p $BUILD/initramfs/usr - ln -sfn /usr/lib $BUILD/initramfs/usr/lib64 + ln -sfn /usr/lib ${BUILD}/initramfs/lib64 + mkdir -p ${BUILD}/initramfs/usr + ln -sfn /usr/lib ${BUILD}/initramfs/usr/lib64 fi - ln -sfn /usr/lib $BUILD/initramfs/lib - ln -sfn /usr/bin $BUILD/initramfs/bin - ln -sfn /usr/sbin $BUILD/initramfs/sbin + ln -sfn /usr/lib ${BUILD}/initramfs/lib + ln -sfn /usr/bin ${BUILD}/initramfs/bin + ln -sfn /usr/sbin ${BUILD}/initramfs/sbin - mkdir -p $BUILD/image/ + mkdir -p ${BUILD}/image/ fakeroot -- sh -c \ - "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $BUILD/image/initramfs.cpio" + "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > ${BUILD}/image/initramfs.cpio" ) } diff --git a/packages/wayland/weston/package.mk b/packages/wayland/weston/package.mk index ff20a61fd..c03e0899d 100644 --- a/packages/wayland/weston/package.mk +++ b/packages/wayland/weston/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="10.0.3" PKG_LICENSE="MIT" PKG_SITE="https://wayland.freedesktop.org/" PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm" +PKG_DEPENDS_TARGET="toolchain wayland wayland-protocols libdrm libxkbcommon libinput cairo pango libjpeg-turbo dbus seatd glu ${OPENGL} libX11 xorg-server libXcursor xkbcomp setxkbmap cairo xterm splash" PKG_LONGDESC="Reference implementation of a Wayland compositor" PKG_MESON_OPTS_TARGET="-Dbackend-drm=true \ diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk index 40e29dfd3..d5274353e 100644 --- a/projects/Amlogic/packages/linux/package.mk +++ b/projects/Amlogic/packages/linux/package.mk @@ -18,7 +18,7 @@ PKG_STAMP="${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD}" PKG_PATCH_DIRS+="${DEVICE}" case ${DEVICE} in - S922X) + S922X*) PKG_VERSION="6.1.26" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; diff --git a/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch b/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch index 85e906008..1679cf2fb 100644 --- a/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch +++ b/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch @@ -14,47 +14,23 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/Makefile linux/arch/arm64/boot dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi --- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-03-22 12:34:07.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-20 18:02:52.949549828 +0000 -@@ -63,31 +63,31 @@ ++++ linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi 2023-04-28 02:33:08.360181317 +0000 +@@ -61,14 +61,6 @@ + gpu_opp_table: opp-table-gpu { + compatible = "operating-points-v2"; - opp-124999998 { - opp-hz = /bits/ 64 <124999998>; +- opp-124999998 { +- opp-hz = /bits/ 64 <124999998>; - opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - opp-249999996 { - opp-hz = /bits/ 64 <249999996>; +- }; +- opp-249999996 { +- opp-hz = /bits/ 64 <249999996>; - opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; +- }; opp-285714281 { opp-hz = /bits/ 64 <285714281>; -- opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - opp-399999994 { - opp-hz = /bits/ 64 <399999994>; -- opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - opp-499999992 { - opp-hz = /bits/ 64 <499999992>; -- opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - opp-666666656 { - opp-hz = /bits/ 64 <666666656>; -- opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - opp-799999987 { - opp-hz = /bits/ 64 <799999987>; -- opp-microvolt = <800000>; -+ opp-microvolt = <1150000>; - }; - }; - -@@ -1694,7 +1694,7 @@ + opp-microvolt = <800000>; +@@ -1694,7 +1686,7 @@ #address-cells = <1>; #size-cells = <0>; @@ -63,7 +39,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar compatible = "ethernet-phy-id0180.3301", "ethernet-phy-ieee802.3-c22"; interrupts = ; -@@ -1885,6 +1885,15 @@ +@@ -1885,6 +1877,15 @@ }; }; @@ -79,7 +55,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar uart_ao_a_pins: uart-a-ao { mux { groups = "uart_ao_a_tx", -@@ -2395,14 +2404,19 @@ +@@ -2395,14 +2396,20 @@ }; mali: gpu@ffe40000 { @@ -91,6 +67,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar + <0 0xFF800000 0 0x01000>, + <0 0xFF63c000 0 0x01000>, + <0 0xFFD01000 0 0x01000>; ++ interrupt-parent = <&gic>; - interrupts = , + interrupts = , @@ -106,7 +83,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi linux/ar #cooling-cells = <2>; diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts --- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-20 19:22:00.692778406 +0000 ++++ linux/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts 2023-04-27 13:36:34.610877356 +0000 @@ -0,0 +1,932 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* @@ -1112,13 +1089,14 @@ diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts linu +}; diff -rupN linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi --- linux.orig/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-22 12:34:07.000000000 +0000 -+++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-03-31 19:19:37.633541167 +0000 -@@ -137,5 +137,5 @@ ++++ linux/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi 2023-04-28 16:33:01.398687793 +0000 +@@ -137,5 +137,6 @@ }; &mali { - dma-coherent; -+ system-coherency=<0>; ++ system-coherency = <0>; ++ power_policy = "always_on"; }; diff -rupN linux.orig/drivers/Kconfig linux/drivers/Kconfig --- linux.orig/drivers/Kconfig 2023-03-22 12:34:07.000000000 +0000 diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk index 9b00a0922..9942008cc 100644 --- a/projects/Amlogic/packages/u-boot/package.mk +++ b/projects/Amlogic/packages/u-boot/package.mk @@ -18,6 +18,10 @@ case ${DEVICE} in PKG_VERSION="9235942906216dc529c1e96f67dd2364a94d0738" PKG_GIT_CLONE_BRANCH="odroidgoU-v2015.01" ;; + *) + PKG_URL="https://github.com/u-boot/u-boot.git" + PKG_VERSION="10f8eec3e0f948005b208869a9ec26b1bf896f86" + ;; esac PKG_IS_KERNEL_PKG="yes" diff --git a/projects/Amlogic/packages/u-boot/patches/001-fix-build.patch b/projects/Amlogic/packages/u-boot/patches/S922X/001-fix-build.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/001-fix-build.patch rename to projects/Amlogic/packages/u-boot/patches/S922X/001-fix-build.patch diff --git a/projects/Amlogic/packages/u-boot/patches/002-build-fixes.patch b/projects/Amlogic/packages/u-boot/patches/S922X/002-build-fixes.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/002-build-fixes.patch rename to projects/Amlogic/packages/u-boot/patches/S922X/002-build-fixes.patch diff --git a/projects/Amlogic/packages/u-boot/patches/003-disable-bl301.patch b/projects/Amlogic/packages/u-boot/patches/S922X/003-disable-bl301.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/003-disable-bl301.patch rename to projects/Amlogic/packages/u-boot/patches/S922X/003-disable-bl301.patch