diff --git a/Dockerfile b/Dockerfile index 70268977c..bf7db809d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt update \ rapidjson-dev libasound2-dev libgl1-mesa-dev build-essential libboost-all-dev cmake fonts-droid-fallback \ libvlc-dev libvlccore-dev vlc-bin texinfo premake4 golang libssl-dev curl patchelf \ xmlstarlet patchutils gawk gperf xfonts-utils default-jre python3 python-is-python3 xsltproc libjson-perl \ - lzop libncurses5-dev device-tree-compiler u-boot-tools rsync p7zip libparse-yapp-perl \ + lzop libncurses5-dev u-boot-tools rsync p7zip libparse-yapp-perl \ zip binutils-aarch64-linux-gnu p7zip-full libvpx-dev bsdmainutils bc meson p7zip-full \ qemu-user-binfmt zstd parted imagemagick \ && apt autoremove --purge -y \ diff --git a/config/emulators/idtech.conf b/config/emulators/idtech.conf new file mode 100644 index 000000000..d156a352a --- /dev/null +++ b/config/emulators/idtech.conf @@ -0,0 +1,10 @@ +SYSTEM_NAME="idtech" +SYSTEM_FULLNAME="iDtech" +SYSTEM_MANUFACTURER="id Software" +SYSTEM_RELEASE="1991" +SYSTEM_HARDWARE="game engine" +SYSTEM_PATH="/storage/roms/idtech" +SYSTEM_EXTENSION=".sh" +SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" +SYSTEM_PLATFORM="idtech" +SYSTEM_THEME="idtech" diff --git a/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md b/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md index c339add89..c25fbcc3e 100644 --- a/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md +++ b/documentation/GENERAL_PERFORMANCE_AND_BATTERY.md @@ -1,33 +1,69 @@         [![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy) # # Performance and Battery Life Optimizations +JELOS provides a variety of knobs and switches that allow the user to optimize for battery life or performance globally, and on a per system and per game basis. For emulating 6th generation and later systems, we recommend installing JELOS on internal storage if available to reduce IO bottlenecks reading and writing shader cache. ## Optimizing Performance -Optimizing for performance will have significant impact on battery life, however it will provide the best experience for more demanding emulators. Begin by disabling `Enhanced Power Saving` in the `System Settings` menu. +Optimizing for performance will have significant impact on battery life, however it will provide the best experience for more demanding emulators. ### Recommended Global Settings -|Enabled CPU Threads|Cooling Profile|Max TDP|CPU Governor|GPU Power Savings Mode1|WIFI Power Saving| -|----|----|----|----|----|----| -|All|Moderate|18w|Performance|Unavailable|Off| +#### AMD / Intel based devices + +|Enabled CPU Threads|Cooling Profile|Max TDP|Scaling Governor|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----| +|All|Moderate|18w|Balanced|Off|Off| + +#### ARM based devices + +|Enabled CPU Threads|Cooling Profile|Scaling Governor|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----| +|All|Moderate1|Balanced|Off|Off| + +> Note: It's recommended to reboot the device after disabling Enhanced Power Saving. ## Optimizing Battery Life -JELOS includes an `Enhanced Power Saving` mode which is available in the `System Settings` menu. This mode tunes your device for power saving, but does not enable options that may affect performance. The table below provides general recommendations to achieve the best possible battery life. Additional adjustments may need to be made to individual emulators or games for the best balance of performance and battery life. +JELOS includes an `Enhanced Power Saving` mode which is available in the `System Settings` menu. This option provides a variety of sub options that when enabled tune your device for optimal battery life without immediately sacrificing performance. -### Recommended Global Settings +|Feature|Function|May Affect Stability| +|----|----|----| +|CPU Power Saving|Tunes the CPU/SoC to preference battery life over performance.|No| +GPU Performance Profile1|User configurable to force the GPU into the preferred performance state|No| +Audio Power Saving|Enables the audio device to operate in a low power mode.|No| +PCIE Active State Power Management|Forces a low power state for PCI and PCIe connections.|Yes| +Enable Wake Events|Enables PCI wakeup signalling to allow devices to enter low power states.|Yes| +Runtime Power Management|Enables USB idle power management, and configures usb devices to autosuspend.|Yes| -|Enabled CPU Threads|Cooling Profile|Max TDP|CPU Governor|GPU Power Savings Mode1|WIFI Power Saving| -|----|----|----|----|----|----| -|2|Quiet|Default|Powersave|Low|On| +### Recommended Settings For Optimal Battery Life +Enable Enhanced Power Saving, and enable all options. If the device has undesired behavior, disable the options that may effect stability and reboot the device. -### Recommended Settings Per System -The table below provides recommended settings per system, however emulating newer systems will still have significant drain. +#### AMD / Intel based devices +|Enabled CPU Threads|Cooling Profile|Max TDP|Scaling Governor|GPU Performance Profile|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----|----|----| +|4|Quiet1|4.5w|Powersave|Battery Focus|On|On| -|Manufacturer|System|Enabled CPU Threads|Cooling Profile|Max TDP|CPU Governor|GPU Power Savings Mode1|WIFI Power Saving| -|----|----|----|----|----|----|----|----| -|Nintendo|GameCube, Wii|2|Quiet|Default|Schedutil|Auto|On| -|Nintendo|Wii U, Switch|6|Quiet|18w|Schedutil|Auto|On| -|Sony|PS2|4|Quiet|18w|Schedutil|Auto|On| -|Sony|PSP|2|Quiet|Default|Powersave|Auto|On| +#### ARM based devices +|Enabled CPU Threads|Cooling Profile|CPU Governor|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----| +|4|Quiet1|Powersave|Battery Focus|On|On| -> 1 Only available when "Enhanced Power Saving" is enabled. +#### AMD / Intel Recommended Settings Per System +|Manufacturer|System|Enabled CPU Threads|Cooling Profile|Max TDP|Scaling Governor|GPU Performance Profile1|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----|----|----|----|----| +|Microsoft|Xbox|6|Quiet|22w|Schedutil|Balanced|On|On| +|Nintendo|GameCube, Wii|4|Quiet|15W|Schedutil|Balanced|On|On| +|Nintendo|Wii U, Switch|6|Moderate|22w|Schedutil|Balanced|On|On| +|Sony|PS2|4|Quiet|18w|Schedutil|Balanced|On| +|Sony|PSP|2|Quiet|9w|Powersave|Battery Focus|On|On| + +#### ARM Devices +|Manufacturer|System|Enabled CPU Threads|Cooling Profile|Scaling Governor|Enhanced Power Saving|WIFI Power Saving| +|----|----|----|----|----|----|----| +|Nintendo|64|All|Moderate1|Performance|On|On| +|Nintendo|GameCube, Wii|All|Moderate1|Performance|On|On| +|Sega|Saturn, Dreamcast|All|Moderate1|Performance|On|On| +|Sony|PSP|All|Moderate1|Performance|On|On| + +Note: Emulating 6th generation and newer consoles will result in lower runtimes as they require significant power draw. + +> 1 Only available when "Enhanced Power Saving" is enabled or if the feature is supported. diff --git a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md index 7be43ea2a..609d88ae0 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md index a2e8f7cc0..f7ec71827 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md index bcbb25c15..fd64e6e24 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md index e6e5c537b..8edc2d556 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md index a93ec0fdb..a168d5bf8 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md index 71537b463..8fd5abb8f 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md index 5f8c85edc..d864c0161 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -36,6 +36,7 @@ This document describes all available systems emulators and cores available for |Commodore|VIC-20 (vic20)|1980|`vic20`|.20 .a0 .b0 .d64 .d71 .d80 .d81 .d82 .g64 .g41 .x64 .t64 .tap .prg .p00 .crt .bin .gz .d6z .d7z .d8z .g6z .g4z .x6z .cmd .m3u .vsf .nib .nbz .zip|**retroarch:** vice_xvic (default)
**vicesa:** xvic
| |Fairchild|Channel F (channelf)|1976|`channelf`|.bin .chf .zip .7z|**retroarch:** freechaf (default)
| |id Software|Doom (doom)|1993|`doom`|.doom|**gzdoom:** gzdoom-sa (default)
| +|id Software|iDtech (idtech)|1991|`idtech`|.sh|**retroarch:** idtech
| |Infocom|Z-Machine (zmachine)|1979|`zmachine`|.dat .z1 .z2 .z3 .z4 .z5 .z6 .zip|**retroarch:** mojozork (default)
| |JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| |JELOS|MPlayer (mplayer)|unknown|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| diff --git a/packages/compress/unzip/package.mk b/packages/compress/unzip/package.mk index 2112d9ec9..be4f17410 100644 --- a/packages/compress/unzip/package.mk +++ b/packages/compress/unzip/package.mk @@ -5,8 +5,8 @@ PKG_NAME="unzip" PKG_VERSION="60" PKG_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" PKG_LICENSE="OSS" -PKG_SITE="http://www.info-zip.org/pub/infozip/" -PKG_URL="http://ftp.uk.i-scream.org/sites/www.ibiblio.org/gentoo/distfiles/${PKG_NAME}${PKG_VERSION}.tar.gz" +PKG_SITE="http://www.info-zip.org/pub/infozip" +PKG_URL="http://downloads.sourceforge.net/sourceforge/infozip/${PKG_NAME}${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="UnZip is an extraction utility for archives compressed in .zip format." PKG_TOOLCHAIN="manual" diff --git a/packages/emulators/libretro/beetle-pce-lr/package.mk b/packages/emulators/libretro/beetle-pce-lr/package.mk index 3625b0cc0..4a474948b 100644 --- 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="924ea45387157ec61866574d36c21eeb8906d84e" +PKG_VERSION="541463bd937dad175aec09c2a0c8d6a52d175386" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/emulators/libretro/boom3-lr/package.mk b/packages/emulators/libretro/boom3-lr/package.mk new file mode 100644 index 000000000..d0c8aaa9a --- /dev/null +++ b/packages/emulators/libretro/boom3-lr/package.mk @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="boom3-lr" +PKG_VERSION="0bea79abf5ec8262dfe9af73cb8c54ea6e2aeb98" +PKG_LICENSE="GPLv3" +PKG_SITE="https://github.com/libretro/boom3" +PKG_URL="https://github.com/libretro/boom3/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain boom3-lr:host" +PKG_LONGDESC="Doom3 - dhewm3 port to libretro." +PKG_TOOLCHAIN="make" + +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" +elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + +PKG_MAKE_OPTS_HOST=" -C neo BASE=1" + +makeinstall_host() { +: +} + +PKG_MAKE_OPTS_TARGET=" -C neo D3XP=1" + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/lib/libretro + cp -v ${PKG_BUILD}/neo/boom3_libretro.so ${INSTALL}/usr/lib/libretro/ + cp -v ${PKG_BUILD}/neo/boom3_xp_libretro.so ${INSTALL}/usr/lib/libretro/ + + mkdir -p ${INSTALL}/usr/config/idtech + cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/config/idtech/ + chmod 0755 ${INSTALL}/usr/config/idtech/* +} diff --git a/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh b/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh new file mode 100644 index 000000000..23048d225 --- /dev/null +++ b/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +/usr/bin/retroarch -L /usr/lib/libretro/boom3_xp_libretro.so /storage/roms/idtech/doom3/d3xp/pak000.pk4 diff --git a/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh b/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh new file mode 100644 index 000000000..035919f78 --- /dev/null +++ b/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +/usr/bin/retroarch -L /usr/lib/libretro/boom3_libretro.so /storage/roms/idtech/doom3/base/pak000.pk4 diff --git a/packages/emulators/libretro/bsnes-lr/package.mk b/packages/emulators/libretro/bsnes-lr/package.mk index c80909092..3c7564391 100644 --- a/packages/emulators/libretro/bsnes-lr/package.mk +++ b/packages/emulators/libretro/bsnes-lr/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="bsnes-lr" -PKG_VERSION="72857e9a2ae35dee14e179b0eb091367f1556ae1" +PKG_VERSION="3fe4f9049f99ac71d038b3cb684ebfc8e6cef15a" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-libretro" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/emulators/libretro/ecwolf-lr/package.mk b/packages/emulators/libretro/ecwolf-lr/package.mk new file mode 100644 index 000000000..b6a5d21e8 --- /dev/null +++ b/packages/emulators/libretro/ecwolf-lr/package.mk @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="ecwolf-lr" +PKG_VERSION="18eca17c2d634b154824e0782c6cbbe0a2c9ea76" +PKG_LICENSE="GPLv2" +PKG_SITE="https://github.com/libretro/ecwolf" +PKG_URL="${PKG_SITE}.git" +PKG_DEPENDS_TARGET="toolchain SDL2 SDL2_mixer SDL2_net libjpeg-turbo bzip2" +PKG_SHORTDESC="ECWolf is a port of the Wolfenstein 3D engine based of Wolf4SDL." +PKG_TOOLCHAIN="make" + +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" +elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + +PKG_MAKE_OPTS_TARGET="-C src/libretro" + +pre_make_target() { + cd ${PKG_BUILD} +} + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/lib/libretro + cp src/libretro/ecwolf_libretro.so ${INSTALL}/usr/lib/libretro/ +} diff --git a/packages/emulators/libretro/fbneo-lr/package.mk b/packages/emulators/libretro/fbneo-lr/package.mk index 66c663dba..9d7b409d8 100644 --- a/packages/emulators/libretro/fbneo-lr/package.mk +++ b/packages/emulators/libretro/fbneo-lr/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023-present Fewtarius PKG_NAME="fbneo-lr" -PKG_VERSION="27c48e4c93dc92a308986b8e0d848001cbabab48" +PKG_VERSION="6b6ba331c6616dbf35e83d7966b6e77744ce773d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/emulators/libretro/gambatte-lr/package.mk b/packages/emulators/libretro/gambatte-lr/package.mk index 730a85380..bca1d90b5 100644 --- 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="1bc650e42aceef306c827e3296b0827e40653c7b" +PKG_VERSION="64561b7e1b21dfa42eecb94963c1c495ba332466" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk index 8f964a093..986cddb99 100644 --- a/packages/emulators/libretro/genesis-plus-gx-lr/package.mk +++ b/packages/emulators/libretro/genesis-plus-gx-lr/package.mk @@ -21,7 +21,7 @@ ################################################################################ PKG_NAME="genesis-plus-gx-lr" -PKG_VERSION="617668fceccf8e6e5e38594f8b35769ecd37904c" +PKG_VERSION="141257e1e2104c4e4a49dc771d9f3c06e00292ec" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk b/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk index c02ff30df..49d390bf1 100644 --- a/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk +++ b/packages/emulators/libretro/genesis-plus-gx-wide-lr/package.mk @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="genesis-plus-gx-wide-lr" -PKG_VERSION="cbc0f6c5e08fbbe13623ecb16073c87c96114ea1" +PKG_VERSION="f73cf1b0769127cee137a559f1c132b24c147923" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/emulators/libretro/idtech-lr/package.mk b/packages/emulators/libretro/idtech-lr/package.mk new file mode 100644 index 000000000..79ba03b79 --- /dev/null +++ b/packages/emulators/libretro/idtech-lr/package.mk @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="idtech-lr" +PKG_LICENSE="Apache-2.0" +PKG_SITE="www.jelos.org" +PKG_LONGDESC="Package for all iD Software game engines." +PKG_TOOLCHAIN="manual" + +if [[ "${OPENGL_SUPPORT}" = "yes" ]] && [[ ! "${DEVICE}" = "S922X" ]]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" + PKG_DEPENDS_TARGET+=" vitaquake3-lr" +fi + +if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" + PKG_DEPENDS_TARGET+=" ecwolf-lr prboom-lr tyrquake-lr vitaquake2-lr" +fi + +if [ "${TARGET_ARCH}" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" boom3-lr" +fi diff --git a/packages/emulators/libretro/parallel-n64-lr/package.mk b/packages/emulators/libretro/parallel-n64-lr/package.mk index 15c16aa25..a1173eaa5 100644 --- a/packages/emulators/libretro/parallel-n64-lr/package.mk +++ b/packages/emulators/libretro/parallel-n64-lr/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="parallel-n64-lr" -PKG_VERSION="aadcb195565a661f6267b23236f4f0d15449c729" +PKG_VERSION="49eadb4da85f7e3bd59b60f61e8fd5dbfb9f07d5" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/parallel-n64" diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk index d040e3fc8..6a85ee7d4 100644 --- a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk +++ b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="pcsx_rearmed-lr" -PKG_VERSION="f5ee77cadf78d389ce40f00988ee9bde1d567dc7" +PKG_VERSION="80bc142638988fa7ba87aa17af1ccfcfc21d1e99" PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/pcsx_rearmed" diff --git a/packages/emulators/libretro/ppsspp-lr/package.mk b/packages/emulators/libretro/ppsspp-lr/package.mk index c269a1b87..e17afa901 100644 --- a/packages/emulators/libretro/ppsspp-lr/package.mk +++ b/packages/emulators/libretro/ppsspp-lr/package.mk @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="ppsspp-lr" -PKG_VERSION="9625eaf29abe6ed90b901953b740e655144447b1" +PKG_VERSION="e829c97d7e78b6ec7c1a0ee031d58c32987194e6" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/hrydgard/ppsspp" PKG_URL="https://github.com/hrydgard/ppsspp.git" diff --git a/packages/emulators/libretro/prboom-lr/package.mk b/packages/emulators/libretro/prboom-lr/package.mk index fec6e19b7..38519d8f0 100644 --- a/packages/emulators/libretro/prboom-lr/package.mk +++ b/packages/emulators/libretro/prboom-lr/package.mk @@ -20,22 +20,17 @@ PKG_NAME="prboom-lr" PKG_VERSION="6ec854969fd9dec33bb2cab350f05675d1158969" -PKG_REV="1" -PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/libretro-prboom" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="libretro" PKG_SHORTDESC="libretro implementation of Doom" -PKG_LONGDESC="libretro implementation of Doom" - -PKG_IS_ADDON="no" -PKG_TOOLCHAIN="make" -PKG_AUTORECONF="no" makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro cp prboom_libretro.so ${INSTALL}/usr/lib/libretro/prboom_libretro.so + + mkdir -p ${INSTALL}/usr/config/idtech + cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/config/idtech/ + chmod 0755 ${INSTALL}/usr/config/idtech/* } diff --git a/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh b/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh new file mode 100644 index 000000000..3e2c47a1d --- /dev/null +++ b/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +/usr/bin/retroarch -L /usr/lib/libretro/prboom_libretro.so /storage/roms/idtech/doom2/Doom2.wad diff --git a/packages/emulators/libretro/prboom-lr/scripts/Doom.sh b/packages/emulators/libretro/prboom-lr/scripts/Doom.sh new file mode 100644 index 000000000..4bc22175a --- /dev/null +++ b/packages/emulators/libretro/prboom-lr/scripts/Doom.sh @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +/usr/bin/retroarch -L /usr/lib/libretro/prboom_libretro.so /storage/roms/idtech/doom/Doom.wad diff --git a/packages/emulators/libretro/puae-lr/package.mk b/packages/emulators/libretro/puae-lr/package.mk index b8d382e13..854f598da 100644 --- 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="54c975094e82660fbdac384b9d5a95952b8dc197" +PKG_VERSION="7bdd798ef14dccafe283588cbf8eb303832a1858" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/puae2021-lr/package.mk b/packages/emulators/libretro/puae2021-lr/package.mk index 8b4277bf0..398d9fd69 100644 --- 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="3ca36411f92f0a1ff6dc8c7fa5f9d4431fc1ddab" +PKG_VERSION="99ae6a9d129fcf8fdc11ac7c59d818034832f55c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/slang-shaders/package.mk b/packages/emulators/libretro/slang-shaders/package.mk index c67ec128e..2080ab059 100644 --- 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="3118737ff40754198e0cd9af86a08369e5bd8bfa" +PKG_VERSION="c1488579ee8e9421222501ca679ace333e047a2a" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/snes9x-lr/package.mk b/packages/emulators/libretro/snes9x-lr/package.mk index 314fd1e3e..c15fead28 100644 --- a/packages/emulators/libretro/snes9x-lr/package.mk +++ b/packages/emulators/libretro/snes9x-lr/package.mk @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="snes9x-lr" -PKG_VERSION="1c97117fbfd5bd5d7e9a890759f82d0dbbb3ddc0" +PKG_VERSION="9fcd99d124872cc2aafe806974eb28789dd6827e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/emulators/libretro/stella-lr/package.mk b/packages/emulators/libretro/stella-lr/package.mk index 98d8d8a65..3f8485357 100644 --- 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="c6e72beeffeeef43ea7015e8773255c7611d8931" +PKG_VERSION="afe84954a80406f4fbbce423712166b9b87d10b3" PKG_REV="1" PKG_LICENSE="GPL2" PKG_SITE="https://github.com/stella-emu/stella" diff --git a/packages/emulators/libretro/tic80-lr/package.mk b/packages/emulators/libretro/tic80-lr/package.mk index 9537df0c3..93eb2e73c 100644 --- a/packages/emulators/libretro/tic80-lr/package.mk +++ b/packages/emulators/libretro/tic80-lr/package.mk @@ -1,66 +1,23 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2020 Fewtarius -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2020-present Fewtarius (https://github.com/fewtarius) PKG_NAME="tic80-lr" -PKG_VERSION="8c5f8b75e290378a6110f54a0d8d8471942b5a1b" -PKG_ARCH="any" -PKG_LICENSE="GPLv3" +PKG_VERSION="b62be5f570c10f1fa21570b418d2bf3e4d061dfc" +PKG_LICENSE="MIT" PKG_SITE="https://github.com/nesbox/TIC-80" PKG_URL="${PKG_SITE}.git" -PKG_DEPENDS_HOST="toolchain" -PKG_DEPENDS_TARGET="toolchain tic80-lr:host" -PKG_PRIORITY="optional" -PKG_SECTION="libretro" -PKG_SHORTDESC="Tic80" -PKG_LONGDESC="TIC-80 emulator" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="TIC-80 is a fantasy computer for making, playing and sharing tiny games." GET_HANDLER_SUPPORT="git" -PKG_BUILD_FLAGS="+pic" -pre_configure_host() { - PKG_CMAKE_OPTS_HOST="-DBUILD_PLAYER=OFF \ - -DBUILD_SOKOL=OFF \ - -DBUILD_WITH_JANET=ON \ - -DBUILD_SDL=OFF \ - -DBUILD_TOUCH_INPUT=OFF \ - -DBUILD_DEMO_CARTS=OFF \ - -DBUILD_LIBRETRO=OFF \ - -DBUILD_WITH_MRUBY=OFF \ - -DCMAKE_BUILD_TYPE=Release" -} - -pre_configure_target() { - PKG_CMAKE_OPTS_TARGET="-DBUILD_PLAYER=ON \ +PKG_CMAKE_OPTS_TARGET="-DBUILD_PLAYER=ON \ -DBUILD_SOKOL=OFF \ -DBUILD_SDL=OFF \ -DBUILD_TOUCH_INPUT=ON \ -DBUILD_DEMO_CARTS=OFF \ -DBUILD_LIBRETRO=ON \ - -DBUILD_WITH_MRUBY=OFF \ - -DCMAKE_BUILD_TYPE=Release" -} - -pre_make_host() { - ### Work around a bug. - sed -i 's~export.h~../src/export.h~g' ${PKG_BUILD}/vendor/pocketpy/c_bindings/pocketpy_c.h -} + -DBUILD_WITH_MRUBY=OFF \ + -DCMAKE_BUILD_TYPE=Release" makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro diff --git a/packages/emulators/libretro/tyrquake-lr/package.mk b/packages/emulators/libretro/tyrquake-lr/package.mk index d1c4e1cb2..08e234135 100644 --- a/packages/emulators/libretro/tyrquake-lr/package.mk +++ b/packages/emulators/libretro/tyrquake-lr/package.mk @@ -45,4 +45,8 @@ pre_configure_target() { makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro cp tyrquake_libretro.so ${INSTALL}/usr/lib/libretro/ + + mkdir -p ${INSTALL}/usr/config/idtech + cp -rf ${PKG_DIR}/scripts/* ${INSTALL}/usr/config/idtech/ + chmod 0755 ${INSTALL}/usr/config/idtech/* } diff --git a/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh b/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh new file mode 100644 index 000000000..60c74363b --- /dev/null +++ b/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +/usr/bin/retroarch -L /usr/lib/libretro/tyrquake_libretro.so /storage/roms/idtech/quakepaks/id1/* diff --git a/packages/emulators/libretro/vice-lr/package.mk b/packages/emulators/libretro/vice-lr/package.mk index 44231ba65..355c575ca 100644 --- 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="480f82ff143cbb4daf57a89e5cbf4a78e84e2354" +PKG_VERSION="c0ef3653deadf40807293b9d9cb56a2a810f7d70" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/emulators/libretro/vice-lr/patches/001-revert-makefile.patch b/packages/emulators/libretro/vice-lr/patches/001-revert-makefile.patch index d64e89743..855ea8235 100644 --- a/packages/emulators/libretro/vice-lr/patches/001-revert-makefile.patch +++ b/packages/emulators/libretro/vice-lr/patches/001-revert-makefile.patch @@ -1,20 +1,15 @@ diff -rupN vice.orig/Makefile vice/Makefile ---- vice.orig/Makefile 2023-07-15 00:00:00.002733244 +0000 -+++ vice/Makefile 2023-07-15 00:01:40.460608911 +0000 -@@ -414,9 +414,11 @@ endif - COMMONFLAGS += -DCORE_NAME=\"$(EMUTYPE)\" +--- vice.orig/Makefile 2023-09-10 22:23:12.000000000 +0000 ++++ vice/Makefile 2023-09-16 12:43:09.816419382 +0000 +@@ -416,7 +416,6 @@ COMMONFLAGS += -DCORE_NAME=\"$(EMUTYPE)\ include Makefile.common -+$(info CFLAGS: $(CFLAGS) $(COMMONFLAGS)) -+$(info -------) -+ OBJECTS += $(patsubst %.cpp,%.o,$(SOURCES_CXX:.cc=.o)) $(SOURCES_C:.c=.o) - OBJECT_DEPS = $(OBJECTS:.o=.d) -PLATFLAGS := $(CFLAGS) CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) LDFLAGS += -lm $(fpic) -@@ -434,12 +436,6 @@ ifeq ($(platform), theos_ios) +@@ -437,12 +436,6 @@ ifeq ($(platform), theos_ios) ${LIBRARY_NAME}_FILES = $(SOURCES_CXX) $(SOURCES_C) include $(THEOS_MAKE_PATH)/library.mk else @@ -25,9 +20,9 @@ diff -rupN vice.orig/Makefile vice/Makefile - $(MAKE) $(TARGET) - all: $(TARGET) - $(TARGET): $(OBJECTS) - ifeq ($(platform), emscripten) -@@ -473,5 +469,5 @@ objectclean: + + -include $(OBJECTS:.o=.d)) +@@ -490,5 +483,5 @@ objectclean: targetclean: rm -f $(TARGET) diff --git a/packages/emulators/libretro/vitaquake2-lr/package.mk b/packages/emulators/libretro/vitaquake2-lr/package.mk new file mode 100644 index 000000000..488589327 --- /dev/null +++ b/packages/emulators/libretro/vitaquake2-lr/package.mk @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="vitaquake2-lr" +PKG_VERSION="6bb3ee592169694b055e7efd5fa2a4e57875bddd" +PKG_LICENSE="GPLv2" +PKG_SITE="https://github.com/libretro/vitaquake2" +PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_SHORTDESC="Libretro port of VitaQuakeII (Quake 2 engine)" + +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" +elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + +pre_make_target() { + export BUILD_SYSROOT=${SYSROOT_PREFIX} + + PKG_MAKE_OPTS_TARGET+=" platform=${DEVICE}" +} + +makeinstall_target() { + mkdir -p $INSTALL/usr/lib/libretro + cp vitaquake2_libretro.so $INSTALL/usr/lib/libretro/ +} diff --git a/packages/emulators/libretro/vitaquake2-lr/patches/001-set-platform.patch b/packages/emulators/libretro/vitaquake2-lr/patches/001-set-platform.patch new file mode 100644 index 000000000..f14c8858b --- /dev/null +++ b/packages/emulators/libretro/vitaquake2-lr/patches/001-set-platform.patch @@ -0,0 +1,19 @@ +diff -rupN vitaquake2.orig/Makefile vitaquake2/Makefile +--- vitaquake2.orig/Makefile 2023-09-15 16:57:45.991890996 +0000 ++++ vitaquake2/Makefile 2023-09-15 20:08:45.856895708 +0000 +@@ -76,6 +76,15 @@ else ifeq ($(platform), linux-portable) + SHARED := -shared -Wl,--version-script=$(CORE_DIR)/link.T + LIBM := + ++else ifeq ($(platform), @DEVICE@) ++ TARGET := $(TARGET_NAME)_libretro.so ++ fpic := -fPIC ++ SHARED := -shared -Wl,--version-script=$(CORE_DIR)/link.T -Wl,--no-undefined ++ CFLAGS += -mcpu=@TARGET_CPU@ -mtune=@TARGET_CPU@ -ffast-math -DARM ++ CFLAGS += -D_POSIX_C_SOURCE=199309L ++ GLES := 1 ++ GLES31 := 1 ++ + else ifneq (,$(findstring rockchip,$(platform))) + EXT ?= so + TARGET := $(TARGET_NAME)_libretro.$(EXT) diff --git a/packages/emulators/libretro/vitaquake3-lr/package.mk b/packages/emulators/libretro/vitaquake3-lr/package.mk new file mode 100644 index 000000000..52f56b42d --- /dev/null +++ b/packages/emulators/libretro/vitaquake3-lr/package.mk @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) + +PKG_NAME="vitaquake3-lr" +PKG_VERSION="7a633867cf0a35c71701aef6fc9dd9dfab9c33a9" +PKG_LICENSE="GPLv2" +PKG_SITE="https://github.com/libretro/vitaquake3" +PKG_URL="https://github.com/libretro/vitaquake3/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="Quake III - ioquake3 port for libretro" +PKG_TOOLCHAIN="make" + +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" +elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +fi + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/lib/libretro + cp vitaquake3_libretro.so $INSTALL/usr/lib/libretro/ +} diff --git a/packages/emulators/standalone/cemu-sa/package.mk b/packages/emulators/standalone/cemu-sa/package.mk index f78928e77..df55e387a 100644 --- a/packages/emulators/standalone/cemu-sa/package.mk +++ b/packages/emulators/standalone/cemu-sa/package.mk @@ -46,6 +46,8 @@ pre_configure_target() { -D ENABLE_SDL=ON \ -D ENABLE_CUBEB=ON \ -D ENABLE_WXWIDGETS=ON \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_FERAL_GAMEMODE=OFF \ -Wno-dev" # Wayland Support diff --git a/packages/emulators/standalone/cemu-sa/patches/cemu-100.01-workaround-for-missing-language-message.patch b/packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch similarity index 100% rename from packages/emulators/standalone/cemu-sa/patches/cemu-100.01-workaround-for-missing-language-message.patch rename to packages/emulators/standalone/cemu-sa/patches/002-workaround-for-missing-language-message.patch diff --git a/packages/emulators/standalone/cemu-sa/patches/003-disable-cmake-interprocedural-optimization.patch b/packages/emulators/standalone/cemu-sa/patches/003-disable-cmake-interprocedural-optimization.patch new file mode 100644 index 000000000..13feb989a --- /dev/null +++ b/packages/emulators/standalone/cemu-sa/patches/003-disable-cmake-interprocedural-optimization.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03cfc26f8d..1751470134 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,8 +46,8 @@ endif() + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + + # enable link time optimization for release builds +-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) +-set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON) ++#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ON) ++#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON) + + if (MSVC) + set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CemuBin) diff --git a/packages/emulators/standalone/cemu-sa/patches/004-left-control.patch b/packages/emulators/standalone/cemu-sa/patches/004-left-control.patch new file mode 100644 index 000000000..b3920b45c --- /dev/null +++ b/packages/emulators/standalone/cemu-sa/patches/004-left-control.patch @@ -0,0 +1,40 @@ +diff --git a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp +index 3a52f64..c6fca57 100644 +--- a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp ++++ b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp +@@ -995,7 +995,7 @@ void LatteRenderTarget_copyToBackbuffer(LatteTextureView* textureView, bool isPa + } + cemu_assert(shader); + g_renderer->DrawBackbufferQuad(textureView, shader, filter==LatteTextureView::MagFilter::kLinear, imageX, imageY, imageWidth, imageHeight, isPadView, clearBackground); +- g_renderer->HandleScreenshotRequest(textureView, isPadView); ++ //g_renderer->HandleScreenshotRequest(textureView, isPadView); + if (!g_renderer->ImguiBegin(!isPadView)) + return; + swkbd_render(!isPadView); +@@ -1015,13 +1015,13 @@ void LatteRenderTarget_itHLECopyColorBufferToScanBuffer(MPTR colorBufferPtr, uin + return; + } + +- const bool tabPressed = gui_isKeyDown(PlatformKeyCodes::TAB); +- const bool ctrlPressed = gui_isKeyDown(PlatformKeyCodes::LCONTROL); ++ const bool lctrlPressed = gui_isKeyDown(PlatformKeyCodes::LCONTROL); ++ const bool rctrlPressed = gui_isKeyDown(PlatformKeyCodes::RCONTROL); + +- bool showDRC = swkbd_hasKeyboardInputHook() == false && tabPressed; ++ bool showDRC = swkbd_hasKeyboardInputHook() == false && (lctrlPressed || rctrlPressed); + bool& alwaysDisplayDRC = LatteGPUState.alwaysDisplayDRC; + +- if (ctrlPressed && tabPressed) ++ if (lctrlPressed || rctrlPressed) + { + if (ctrlTabHotkeyPressed == false) + { +@@ -1033,7 +1033,7 @@ void LatteRenderTarget_itHLECopyColorBufferToScanBuffer(MPTR colorBufferPtr, uin + ctrlTabHotkeyPressed = false; + + if (alwaysDisplayDRC) +- showDRC = !tabPressed; ++ showDRC = (!lctrlPressed || !rctrlPressed); + + if (!showDRC) + { diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk index 4d190a9e0..a6fd60577 100644 --- a/packages/emulators/standalone/flycast-sa/package.mk +++ b/packages/emulators/standalone/flycast-sa/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2022-present Fewtarius PKG_NAME="flycast-sa" -PKG_VERSION="b564b0bf9142492cde6ca9f2f87363a279b75ecc" +PKG_VERSION="213bc70e2d4bf14052af94255557792b4b14a0f4" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/flyinghead/flycast" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/standalone/hatarisa/package.mk b/packages/emulators/standalone/hatarisa/package.mk index 055b83e25..3a663841f 100644 --- 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="eabb3549e66147397e15a2de6ff1bb6a9f3843a7" +PKG_VERSION="9756e36bb858c4e3b6039b07fe6f1b72263b1f70" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hatari/hatari" PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk index 3600ad842..7a33051c8 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-simplecore/package.mk @@ -42,6 +42,7 @@ make_target() { export SDL_LDLIBS="-lSDL2_net -lSDL2" export CROSS_COMPILE="${TARGET_PREFIX}" cd ${PKG_BUILD} + sed -i 's~~~g' src/main/netplay.c rm -rf build mkdir build cd build diff --git a/packages/emulators/standalone/ppsspp-sa/package.mk b/packages/emulators/standalone/ppsspp-sa/package.mk index ae3c709ea..5cd58bfbd 100644 --- a/packages/emulators/standalone/ppsspp-sa/package.mk +++ b/packages/emulators/standalone/ppsspp-sa/package.mk @@ -7,7 +7,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_SITE="https://github.com/hrydgard/ppsspp" PKG_URL="${PKG_SITE}.git" -PKG_VERSION="9625eaf29abe6ed90b901953b740e655144447b1" +PKG_VERSION="e829c97d7e78b6ec7c1a0ee031d58c32987194e6" PKG_LICENSE="GPLv2" PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip" PKG_SHORTDESC="PPSSPPDL" diff --git a/packages/emulators/standalone/retroarch/package.mk b/packages/emulators/standalone/retroarch/package.mk index d85d1c883..740b000dd 100644 --- a/packages/emulators/standalone/retroarch/package.mk +++ b/packages/emulators/standalone/retroarch/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023-present Fewtarius PKG_NAME="retroarch" -PKG_VERSION="72841d6637d1851c0a4176b8417196a68357a9fb" +PKG_VERSION="c5b2ed13826848d4ce5fcec81bb57724d680b505" PKG_SITE="https://github.com/libretro/RetroArch" PKG_URL="${PKG_SITE}.git" PKG_LICENSE="GPLv3" diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg index a74341d8e..be69de301 100644 --- a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg @@ -42,7 +42,7 @@ auto_shaders_enable = "true" autosave_interval = "10" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg index 4545589a5..f2d553696 100755 --- a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg @@ -42,7 +42,7 @@ auto_screenshot_filename = "true" auto_shaders_enable = "true" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg index c93d0c06a..dbc8dc130 100644 --- a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg @@ -42,7 +42,7 @@ auto_screenshot_filename = "true" auto_shaders_enable = "true" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg index b04b9b326..86b9b5836 100644 --- a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg @@ -42,7 +42,7 @@ auto_screenshot_filename = "true" auto_shaders_enable = "true" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg index 276c6d2de..848516b07 100755 --- a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg @@ -42,7 +42,7 @@ auto_screenshot_filename = "true" auto_shaders_enable = "true" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg index 0edb9560a..30cb4755e 100644 --- a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg @@ -42,7 +42,7 @@ auto_screenshot_filename = "true" auto_shaders_enable = "true" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" +builtin_imageviewer_enable = "false" builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" diff --git a/packages/graphics/SDL2/package.mk b/packages/graphics/SDL2/package.mk index 8e2154340..3c6573159 100644 --- a/packages/graphics/SDL2/package.mk +++ b/packages/graphics/SDL2/package.mk @@ -61,6 +61,12 @@ else -DSDL_X11=OFF" fi +case ${PROJECT} in + Rockchip) + PKG_DEPENDS_TARGET+=" librga" + ;; +esac + pre_configure_target(){ export LDFLAGS="${LDFLAGS} -ludev" PKG_CMAKE_OPTS_TARGET+="-DSDL_STATIC=OFF \ diff --git a/packages/graphics/wxwidgets/package.mk b/packages/graphics/wxwidgets/package.mk index 3885833d7..224add879 100644 --- a/packages/graphics/wxwidgets/package.mk +++ b/packages/graphics/wxwidgets/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="wxwidgets" -PKG_VERSION="a2c6620" +PKG_VERSION="a7bfae0" PKG_LICENSE="wxWindows Library Licence" PKG_SITE="https://github.com/wxWidgets/wxWidgets" PKG_URL="${PKG_SITE}.git" diff --git a/packages/hardware/quirks/devices/AYANEO AIR/bin/fancontrol b/packages/hardware/quirks/devices/AYANEO AIR/bin/fancontrol index 8bc86db04..04bb413fc 100755 --- a/packages/hardware/quirks/devices/AYANEO AIR/bin/fancontrol +++ b/packages/hardware/quirks/devices/AYANEO AIR/bin/fancontrol @@ -33,22 +33,21 @@ then fi fi - if [ ! "${COOLING_PROFILE}" = "custom" ] then if [ "${COOLING_PROFILE}" = "aggressive" ] then - SPEEDS=(255 225 195) - TEMPS=(55000 45000 0) + SPEEDS=(255 225 192) + TEMPS=(70000 65000 0) elif [ "${COOLING_PROFILE}" = "moderate" ] then SPEEDS=(255 192 128 96) - TEMPS=(65000 55000 45000 0) + TEMPS=(75000 70000 65000 0) elif [ "${COOLING_PROFILE}" = "quiet" ] then # Quiet. SPEEDS=(255 192 128 96 64 48 32) - TEMPS=(70000 60000 55000 50000 49000 47000 0) + TEMPS=(75000 70000 65000 60000 55000 50000 0) else # auto set_control 0 >/dev/null 2>&1 diff --git a/packages/hardware/quirks/devices/ayn Loki Zero/010-led_control b/packages/hardware/quirks/devices/ayn Loki Zero/010-led_control index 5a2f70e67..f49d91971 100755 --- a/packages/hardware/quirks/devices/ayn Loki Zero/010-led_control +++ b/packages/hardware/quirks/devices/ayn Loki Zero/010-led_control @@ -4,4 +4,5 @@ cat </storage/.config/profile.d/010-led_control DEVICE_LED_CONTROL="true" +DEVICE_LED_BRIGHTNESS="true" EOF diff --git a/packages/hardware/quirks/devices/ayn Loki Zero/020-audio_latency b/packages/hardware/quirks/devices/ayn Loki Zero/020-audio_latency index b802388b3..b1ede27ae 100644 --- a/packages/hardware/quirks/devices/ayn Loki Zero/020-audio_latency +++ b/packages/hardware/quirks/devices/ayn Loki Zero/020-audio_latency @@ -2,6 +2,8 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) +. /etc/profile.d/001-functions + AUDIO_LATENCY=$(get_setting audiolatency) if [ -z "${AUDIO_LATENCY}" ] then diff --git a/packages/hardware/quirks/devices/ayn Loki Zero/bin/ledcontrol b/packages/hardware/quirks/devices/ayn Loki Zero/bin/ledcontrol index 5116d3406..f5f16150f 100755 --- a/packages/hardware/quirks/devices/ayn Loki Zero/bin/ledcontrol +++ b/packages/hardware/quirks/devices/ayn Loki Zero/bin/ledcontrol @@ -23,6 +23,7 @@ RGB_GREEN="0xB1" RGB_BLUE="0xB2" RGB_MODE="0xB3" RGB_SAVE="0xAA" +RGB_IDLE="0x55" ECTOOL="/usr/sbin/ectool" DEBUG=false @@ -32,6 +33,19 @@ function debug_out() { } function ec_save() { + TIMEOUT=0 + while true + do + STATE="0x$(${ECTOOL} -r ${RGB_MODE})" + if [ "${STATE^^}" == "${RGB_SAVE}" ] || \ + [ "${STATE}" == "${RGB_IDLE}" ] || \ + [ "${TIMEOUT}" == 5 ] + then + break + fi + sleep .5 + TIMEOUT=$(( TIMEOUT + 1 )) + done ${ECTOOL} -w ${RGB_MODE} -z ${RGB_SAVE} >/dev/null 2>&1 } @@ -48,10 +62,45 @@ function off() { ec_save } +function intensity() { + printf "0x%X\n" $((${1} / ${2})) +} + +GETBRIGHTNESS=$(get_setting led.brightness) +if [ ! -z "${2}" ] +then + LEDBRIGHTNESS=${2} + debug_out "Arg[2]: ${2}" +elif [ ! -z "${GETBRIGHTNESS}" ] +then + LEDBRIGHTNESS=${GETBRIGHTNESS} + debug_out "GETBRIGHTESS: ${GETBRIGHTNESS}" +else + debug_out "NO SETTING: max" + LEDBRIGHTNESS=mid + set_setting led.brightness max +fi + +case ${LEDBRIGHTNESS} in + max) + LEDBRIGHTNESS=1 + set_setting led.brightness max + ;; + mid) + LEDBRIGHTNESS=2 + set_setting led.brightness mid + ;; + min) + LEDBRIGHTNESS=4 + set_setting led.brightness min + ;; +esac + case $1 in red) off - ec_set ${RGB_RED} 0xFF + COLOR=$(intensity 0xFF ${LEDBRIGHTNESS}) + ec_set ${RGB_RED} ${COLOR} ec_set ${RGB_GREEN} 0x00 ec_set ${RGB_BLUE} 0x00 ec_save @@ -59,33 +108,37 @@ case $1 in ;; green) off + COLOR=$(intensity 0xFF ${LEDBRIGHTNESS}) ec_set ${RGB_RED} 0x00 - ec_set ${RGB_GREEN} 0xFF + ec_set ${RGB_GREEN} ${COLOR} ec_set ${RGB_BLUE} 0x00 ec_save set_setting led.color green ;; blue) off + COLOR=$(intensity 0xFF ${LEDBRIGHTNESS}) ec_set ${RGB_RED} 0x00 ec_set ${RGB_GREEN} 0x00 - ec_set ${RGB_BLUE} 0xFF + ec_set ${RGB_BLUE} ${COLOR} ec_save set_setting led.color blue ;; teal) off + COLOR=$(intensity 0x80 ${LEDBRIGHTNESS}) ec_set ${RGB_RED} 0x00 - ec_set ${RGB_GREEN} 0x80 - ec_set ${RGB_BLUE} 0x80 + ec_set ${RGB_GREEN} ${COLOR} + ec_set ${RGB_BLUE} ${COLOR} ec_save set_setting led.color teal ;; purple) off - ec_set ${RGB_RED} 0x80 + COLOR=$(intensity 0x80 ${LEDBRIGHTNESS}) + ec_set ${RGB_RED} ${COLOR} ec_set ${RGB_GREEN} 0x00 - ec_set ${RGB_BLUE} 0x80 + ec_set ${RGB_BLUE} ${COLOR} ec_save set_setting led.color purple ;; @@ -95,6 +148,10 @@ case $1 in ;; default) del_setting led.color + ec_set ${RGB_MODE} 0x00 + ;; + brightness) + set_setting led.brightness ${2} ;; *) COLOR=$(get_setting led.color) diff --git a/packages/hardware/quirks/platforms/AMD64/010-default_tdp b/packages/hardware/quirks/platforms/AMD64/010-default_tdp index 573b89fcf..f51626a0f 100755 --- a/packages/hardware/quirks/platforms/AMD64/010-default_tdp +++ b/packages/hardware/quirks/platforms/AMD64/010-default_tdp @@ -11,4 +11,3 @@ then # Set default TDP set_setting system.overclock 15w fi -EOF diff --git a/packages/jelos/autostart/001-setup b/packages/jelos/autostart/001-setup index 53ed96804..5c78ac64d 100755 --- a/packages/jelos/autostart/001-setup +++ b/packages/jelos/autostart/001-setup @@ -2,8 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) -# Minimal OS variable loading for performance -. /etc/profile.d/001-functions +. /etc/profile if [ -d "/storage/cache/.cores" ] then diff --git a/packages/jelos/sources/post-update b/packages/jelos/sources/post-update index 91e2a476a..58fd43eac 100644 --- a/packages/jelos/sources/post-update +++ b/packages/jelos/sources/post-update @@ -103,3 +103,6 @@ fi ### 20230915 - Delete any stale alsa configs. rm -f /storage/.config/asound* + +### 20230916 - Disable Retrarch's built in image viewer so fake-08 blobs are opened correctly. Thanks to christianhaitian and jtothebell. +sed -i 's~builtin_imageviewer_enable.*$~builtin_imageviewer_enable = "false"~g' /storage/.config/retroarch/retroarch.cfg diff --git a/packages/jelos/sources/scripts/led_flash b/packages/jelos/sources/scripts/led_flash new file mode 100644 index 000000000..5bda18ceb --- /dev/null +++ b/packages/jelos/sources/scripts/led_flash @@ -0,0 +1,22 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present Fewtarius + +. /etc/profile + +COLOR=$(get_setting led.color) +BRI=$(get_setting led.brightness) + +ledcontrol off +ledcontrol brightness mid + +for i in $(seq 1 1 3) +do + sleep 1 + ledcontrol ${1} + sleep 1 + ledcontrol off +done + +ledcontrol ${COLOR} +ledcontrol brightness ${BRI} diff --git a/packages/kernel/linux-drivers/ayn-platform/package.mk b/packages/kernel/linux-drivers/ayn-platform/package.mk index 88fd021e4..4b4b21bb9 100644 --- a/packages/kernel/linux-drivers/ayn-platform/package.mk +++ b/packages/kernel/linux-drivers/ayn-platform/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023-present Fewtarius PKG_NAME="ayn-platform" -PKG_VERSION="3fdfa48" +PKG_VERSION="b4510f8ca54511d5b28b9a4f81119f45ba0d23e0" PKG_LICENSE="GPL" PKG_SITE="https://github.com/ShadowBlip/ayn-platform" PKG_URL="${PKG_SITE}.git" diff --git a/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch b/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch new file mode 100644 index 000000000..b66011a7f --- /dev/null +++ b/packages/kernel/linux/patches/AMD64/008-revert-judge-aspm-mode.patch @@ -0,0 +1,162 @@ +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c linux-6.4.16/drivers/misc/cardreader/rts5227.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rts5227.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rts5227.c 2023-09-15 23:51:13.267034740 +0000 +@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct + } + } + +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c linux-6.4.16/drivers/misc/cardreader/rts5228.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rts5228.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rts5228.c 2023-09-15 23:51:13.267034740 +0000 +@@ -435,10 +435,17 @@ static void rts5228_init_from_cfg(struct + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5228_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1, + CD_RESUME_EN_MASK, CD_RESUME_EN_MASK); +@@ -469,6 +476,17 @@ static int rts5228_extra_init_hw(struct + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c linux-6.4.16/drivers/misc/cardreader/rts5249.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rts5249.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rts5249.c 2023-09-15 23:51:13.267034740 +0000 +@@ -327,11 +327,12 @@ static int rts5249_extra_init_hw(struct + } + } + ++ + /* + * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced + * to drive low, and we forcibly request clock. + */ +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_write_register(pcr, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c linux-6.4.16/drivers/misc/cardreader/rts5260.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rts5260.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rts5260.c 2023-09-15 23:51:13.267034740 +0000 +@@ -517,10 +517,17 @@ static void rts5260_init_from_cfg(struct + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + /* Set mcu_cnt to 7 to ensure data can be sampled properly */ + rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07); +@@ -539,6 +546,17 @@ static int rts5260_extra_init_hw(struct + + rts5260_init_hw(pcr); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00); + + return 0; +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c linux-6.4.16/drivers/misc/cardreader/rts5261.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rts5261.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rts5261.c 2023-09-15 23:51:13.267034740 +0000 +@@ -498,10 +498,17 @@ static void rts5261_init_from_cfg(struct + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + u32 val; + + rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1, +@@ -547,6 +554,17 @@ static int rts5261_extra_init_hw(struct + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff -rupN linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c +--- linux-6.4.16.orig/drivers/misc/cardreader/rtsx_pcr.c 2023-09-15 23:50:58.706129852 +0000 ++++ linux-6.4.16/drivers/misc/cardreader/rtsx_pcr.c 2023-09-15 23:51:13.271034986 +0000 +@@ -1326,11 +1326,8 @@ static int rtsx_pci_init_hw(struct rtsx_ + return err; + } + +- if (pcr->aspm_mode == ASPM_MODE_REG) { ++ if (pcr->aspm_mode == ASPM_MODE_REG) + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30); +- rtsx_pci_write_register(pcr, PETXCFG, +- FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); +- } + + /* No CD interrupt if probing driver with card inserted. + * So we need to initialize pcr->card_exist here. diff --git a/packages/sysutils/ectool/patches/001-read.patch b/packages/sysutils/ectool/patches/001-read.patch new file mode 100644 index 000000000..29289c51b --- /dev/null +++ b/packages/sysutils/ectool/patches/001-read.patch @@ -0,0 +1,59 @@ +diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c +index cb6f280f4c..585ae5faf1 100644 +--- a/util/ectool/ectool.c ++++ b/util/ectool/ectool.c +@@ -52,6 +52,7 @@ void print_usage(const char *name) + " -d | --dump: print RAM\n" + " -i | --idx: print IDX RAM & RAM\n" + " -q | --query: print query byte\n" ++ " -r read from addr\n" + " -w write to addr\n" + " -z write to data\n" + "\n"); +@@ -65,6 +66,7 @@ int main(int argc, char *argv[]) + int i, opt, option_index = 0; + long write_data = -1; + long write_addr = -1; ++ long read_addr = -1; + + static struct option long_options[] = { + {"version", 0, 0, 'v'}, +@@ -81,7 +83,7 @@ int main(int argc, char *argv[]) + exit(1); + } + +- while ((opt = getopt_long(argc, argv, "vh?Vidqpw:z:", ++ while ((opt = getopt_long(argc, argv, "vh?Vidqpr:w:z:", + long_options, &option_index)) != EOF) { + switch (opt) { + case 'v': +@@ -95,6 +97,9 @@ int main(int argc, char *argv[]) + dump_idx = 1; + dump_ram = 1; + break; ++ case 'r': ++ read_addr = strtol(optarg , NULL, 16); ++ break; + case 'w': + write_addr = strtol(optarg , NULL, 16); + break; +@@ -133,6 +138,7 @@ int main(int argc, char *argv[]) + printf("You need to be root.\n"); + exit(1); + } ++ + if (write_addr >= 0 && write_data >= 0) { + write_addr &= 0xff; + write_data &= 0xff; +@@ -140,6 +146,11 @@ int main(int argc, char *argv[]) + ec_write(write_addr & 0xff, write_data & 0xff); + } + ++ if (read_addr >= 0) { ++ printf("%02x", ec_read(read_addr)); ++ exit(0); ++ } ++ + /* preserve default - dump_ram if nothing selected */ + if (!dump_ram && !dump_idx && !dump_query && (write_addr == -1)) + dump_ram = 1; diff --git a/packages/sysutils/powerstate/sources/powerstate.sh b/packages/sysutils/powerstate/sources/powerstate.sh index 862eb5ad3..9ef48328b 100755 --- a/packages/sysutils/powerstate/sources/powerstate.sh +++ b/packages/sysutils/powerstate/sources/powerstate.sh @@ -64,11 +64,17 @@ do then BATLEFT=$(battery_percent) AUDIBLEALERT=$(get_setting system.battery.warning) - if (( "${BATLEFT}" < "25" )) && - [ "${AUDIBLEALERT}" = "1" ] + if (( "${BATLEFT}" < "25" )) then - say "BATTERY AT ${BATLEFT}%" - BATCNT=0 + if [ "${DEVICE_LED_CONTROL}" = "true" ] + then + led_flash red + BATCNT=0 + elif [ "${AUDIBLEALERT}" = "1" ] + then + say "BATTERY AT ${BATLEFT}%" + BATCNT=0 + fi fi fi BATCNT=$(( ${BATCNT} + 1 )) diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk deleted file mode 100644 index fdbcd3e5b..000000000 --- a/packages/tools/dtc/package.mk +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="dtc" -PKG_VERSION="1.7.0" -PKG_LICENSE="GPL" -PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/" -PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="toolchain:host" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="The Device Tree Compiler" - -PKG_MAKE_OPTS_TARGET="dtc fdtput fdtget libfdt" -PKG_MAKE_OPTS_HOST="dtc libfdt" - -makeinstall_host() { - mkdir -p ${TOOLCHAIN}/bin - cp -P ${PKG_BUILD}/dtc ${TOOLCHAIN}/bin - mkdir -p ${TOOLCHAIN}/lib - cp -P ${PKG_BUILD}/libfdt/libfdt.so ${TOOLCHAIN}/lib -} - -makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/dtc ${INSTALL}/usr/bin - cp -P ${PKG_BUILD}/fdtput ${INSTALL}/usr/bin/ - cp -P ${PKG_BUILD}/fdtget ${INSTALL}/usr/bin/ - mkdir -p ${INSTALL}/usr/lib - cp -P ${PKG_BUILD}/libfdt/libfdt.so ${INSTALL}/usr/lib/ -} diff --git a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch b/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch deleted file mode 100644 index a95e51eba..000000000 --- a/packages/tools/dtc/patches/dtc-0001-libfdt-soname-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libfdt/Makefile.libfdt b/libfdt/Makefile.libfdt -index e546397..dd71746 100644 ---- a/libfdt/Makefile.libfdt -+++ b/libfdt/Makefile.libfdt -@@ -10,7 +10,7 @@ LIBFDT_VERSION = version.lds - LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ - fdt_addresses.c fdt_overlay.c - LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) --LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) -+LIBFDT_LIB = libfdt.$(SHAREDLIB_EXT) - - libfdt_clean: - @$(VECHO) CLEAN "(libfdt)" diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index c896067ec..5f885530c 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2020-present Fewtarius PKG_NAME="emulationstation" -PKG_VERSION="626949c" +PKG_VERSION="4a37b74" PKG_GIT_CLONE_BRANCH="main" PKG_REV="1" PKG_ARCH="any" diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index f061372fc..be3130b8c 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -23,9 +23,9 @@ LIBRETRO_CORES="81-lr a5200-lr arduous-lr atari800-lr beetle-gba-lr beetle-lynx- gw-lr handy-lr hatari-lr mame2000-lr mame2003-plus-lr mame2010-lr mame2015-lr melonds-lr meowpc98-lr \ mesen-lr mgba-lr mojozork-lr mrboom-lr mupen64plus-lr mupen64plus-nx-lr neocd_lr nestopia-lr np2kai-lr \ nxengine-lr o2em-lr opera-lr parallel-n64-lr pcsx_rearmed-lr picodrive-lr pokemini-lr potator-lr \ - prboom-lr prosystem-lr ppsspp-lr puae-lr puae2021-lr px68k-lr quasi88-lr quicknes-lr race-lr reminiscence-lr \ + prosystem-lr ppsspp-lr puae-lr puae2021-lr px68k-lr quasi88-lr quicknes-lr race-lr reminiscence-lr \ sameboy-lr sameduck-lr scummvm-lr smsplus-gx-lr snes9x-lr snes9x2002-lr snes9x2005_plus-lr snes9x2010-lr \ - stella-lr stella-2014-lr swanstation-lr tic80-lr tgbdual-lr tyrquake-lr uzem-lr vba-next-lr \ + stella-lr stella-2014-lr swanstation-lr tic80-lr tgbdual-lr uzem-lr vba-next-lr \ vbam-lr vecx-lr vice-lr yabasanshiro-lr virtualjaguar-lr xmil-lr xrick-lr" ### Emulators or cores for specific devices @@ -364,6 +364,10 @@ makeinstall_target() { add_emu_core fbn retroarch fbalpha2019 false add_es_system fbn + ### iD Software game engines + add_emu_core idtech retroarch idtech + add_es_system idtech + ### Nintendo Game and Watch add_emu_core gameandwatch retroarch gw add_es_system gameandwatch diff --git a/projects/Rockchip/packages/u-boot/package.mk b/projects/Rockchip/packages/u-boot/package.mk index d1face0c1..ff1b8279f 100644 --- a/projects/Rockchip/packages/u-boot/package.mk +++ b/projects/Rockchip/packages/u-boot/package.mk @@ -71,7 +71,7 @@ make_target() { if [[ "${PKG_SOC}" =~ "rk35" ]] then DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make mrproper - DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make ${UBOOT_CONFIG} BL31=${PKG_BL31} ${PKG_LOADER} u-boot.dtb u-boot.itb + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 make ${UBOOT_CONFIG} BL31=${PKG_BL31} ${PKG_LOADER} u-boot.dtb u-boot.itb CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm64 _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" else echo "Building for MBR (${UBOOT_DTB})..."