From 756e1deb8e90aaf2b005cb47a5e9a3db675cd423 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Sun, 15 Oct 2023 21:52:39 -0400 Subject: [PATCH 01/47] Theme cleanup removes minimal and minielec from install package - moving them to post install instead --- packages/jelos/sources/scripts/backuptool | 2 +- packages/sysutils/systemd/scripts/userconfig-setup | 2 -- packages/virtual/es-themes/package.mk | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/jelos/sources/scripts/backuptool b/packages/jelos/sources/scripts/backuptool index 9851d4b18..49063e7aa 100755 --- a/packages/jelos/sources/scripts/backuptool +++ b/packages/jelos/sources/scripts/backuptool @@ -32,7 +32,7 @@ DEFAULT=( /storage/.emulationstation/es_*.cfg /storage/.emulationstation/scripts/* /storage/.emulationstation/themesettings/* - $(find /storage/.emulationstation/themes/* -type d -maxdepth 0 -not -path "*es-theme-art-book-next" -not -path "*es-theme-minielec" -not -path "*es-theme-minimal" -not -path "*system-theme") + $(find /storage/.emulationstation/themes/* -type d -maxdepth 0 -not -path "*es-theme-art-book-next" -not -path "*system-theme") ) if [ -e "/storage/.config/backuptool.conf" ] diff --git a/packages/sysutils/systemd/scripts/userconfig-setup b/packages/sysutils/systemd/scripts/userconfig-setup index 4661697f4..fad543909 100755 --- a/packages/sysutils/systemd/scripts/userconfig-setup +++ b/packages/sysutils/systemd/scripts/userconfig-setup @@ -27,8 +27,6 @@ then tocon "Installing themes..." 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..." diff --git a/packages/virtual/es-themes/package.mk b/packages/virtual/es-themes/package.mk index b002857ae..599382425 100644 --- a/packages/virtual/es-themes/package.mk +++ b/packages/virtual/es-themes/package.mk @@ -4,6 +4,6 @@ PKG_NAME="es-themes" PKG_LICENSE="Apache-2.0" PKG_SITE="www.jelos.org" -PKG_DEPENDS_TARGET="es-theme-art-book-next es-theme-minimal es-theme-minielec" +PKG_DEPENDS_TARGET="es-theme-art-book-next" PKG_SECTION="virtual" PKG_LONGDESC="EmulationStation themes package." From 65c686d252621cf8124b9a9f99b7605ba8edfea2 Mon Sep 17 00:00:00 2001 From: mason Date: Mon, 16 Oct 2023 13:46:25 +0000 Subject: [PATCH 02/47] Bump Linux to 6.1.58 on supported devices --- projects/Amlogic/packages/linux/package.mk | 2 +- projects/Rockchip/packages/linux/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk index d57fcd527..ff882ed63 100644 --- a/projects/Amlogic/packages/linux/package.mk +++ b/projects/Amlogic/packages/linux/package.mk @@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}" case ${DEVICE} in S922X*) - PKG_VERSION="6.1.57" + PKG_VERSION="6.1.58" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk index 6be21f4a5..6a434067a 100644 --- a/projects/Rockchip/packages/linux/package.mk +++ b/projects/Rockchip/packages/linux/package.mk @@ -37,7 +37,7 @@ case ${DEVICE} in PKG_GIT_CLONE_BRANCH="main" ;; RK33*) - PKG_VERSION="6.1.57" + PKG_VERSION="6.1.58" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac From 4436bc1b12c076cdeb03917538909c9126f64f2e Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 16 Oct 2023 16:56:17 +0000 Subject: [PATCH 03/47] Update the boot logo. --- packages/jelos/sources/issue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jelos/sources/issue b/packages/jelos/sources/issue index 8d80bda25..380ec5b24 100644 --- a/packages/jelos/sources/issue +++ b/packages/jelos/sources/issue @@ -1,7 +1,7 @@ - ██ ███████ ██  ██████ ███████ + ██ ███████ ██  ████████ ███████  ██ ██ ██  ██ ██ ██  ██ ███████ ██  ██ ██ ███████ ██ ██ ██ ██  ██ ██ ██ - █████ ███████ ███████ ██████ ███████ +███████ ███████ ███████ ████████ ███████ From 089a39f6ef4b693e6c8bbc04d36e4f8476e84862 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 16 Oct 2023 16:26:49 -0400 Subject: [PATCH 04/47] Update es_settings.cfg --- packages/ui/emulationstation/config/common/es_settings.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/ui/emulationstation/config/common/es_settings.cfg b/packages/ui/emulationstation/config/common/es_settings.cfg index 1f9d49527..a7c8b2ca1 100644 --- a/packages/ui/emulationstation/config/common/es_settings.cfg +++ b/packages/ui/emulationstation/config/common/es_settings.cfg @@ -8,6 +8,8 @@ + + @@ -56,5 +58,6 @@ + From be33b77a4cd5381f3891bdc0788b1357590c3c3c Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Mon, 16 Oct 2023 16:40:56 -0400 Subject: [PATCH 05/47] Set "config_save_on_exit" to false by default This sets config_save_on_exit to false by default in retroarch.cfg for all devices. Should help reduce the ability for users to get into an odd state in retroarch. With it on by default there was a high chance of changes a users made in config for a game being saved into the global config. --- .../emulators/standalone/retroarch/sources/AMD64/retroarch.cfg | 2 +- .../emulators/standalone/retroarch/sources/RK3326/retroarch.cfg | 2 +- .../emulators/standalone/retroarch/sources/RK3399/retroarch.cfg | 2 +- .../emulators/standalone/retroarch/sources/RK3566/retroarch.cfg | 2 +- .../emulators/standalone/retroarch/sources/RK3588/retroarch.cfg | 2 +- .../emulators/standalone/retroarch/sources/S922X/retroarch.cfg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg index be69de301..524190bbb 100644 --- a/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/AMD64/retroarch.cfg @@ -71,7 +71,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" diff --git a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg index f2d553696..6fcf4eea6 100755 --- a/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3326/retroarch.cfg @@ -70,7 +70,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" diff --git a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg index dbc8dc130..e83a497f6 100644 --- a/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3399/retroarch.cfg @@ -70,7 +70,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" diff --git a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg index 86b9b5836..291b4648a 100644 --- a/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3566/retroarch.cfg @@ -70,7 +70,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" diff --git a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg index 848516b07..cdc0d5e70 100755 --- a/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/RK3588/retroarch.cfg @@ -70,7 +70,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" diff --git a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg b/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg index 30cb4755e..66c7a11bf 100644 --- a/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg +++ b/packages/emulators/standalone/retroarch/sources/S922X/retroarch.cfg @@ -70,7 +70,7 @@ cheevos_token = "" cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "false" -config_save_on_exit = "true" +config_save_on_exit = "false" content_database_path = "/tmp/database/rdb" content_favorites_directory = "default" content_favorites_path = "~/.config/retroarch/content_favorites.lpl" From 58fc4afc655a8a8dcf9f82a4f9d5eafb2edfe680 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 16 Oct 2023 22:17:12 +0000 Subject: [PATCH 06/47] Slight improvement to boot output.. --- packages/jelos/package.mk | 4 ++-- packages/sysutils/busybox/scripts/init | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jelos/package.mk b/packages/jelos/package.mk index 3507f11e8..ada2710eb 100644 --- a/packages/jelos/package.mk +++ b/packages/jelos/package.mk @@ -62,8 +62,8 @@ post_install() { cp ${PKG_DIR}/sources/issue ${INSTALL}/etc ln -s /etc/issue ${INSTALL}/etc/motd cat <> ${INSTALL}/etc/issue -==> Version: ${OS_VERSION} (${BUILD_ID:0:7}) -==> Built: ${BUILD_DATE} +... Version: ${OS_VERSION} (${BUILD_ID:0:7}) +... Built: ${BUILD_DATE} EOF diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index e112ecc2b..2b4095d9b 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -462,9 +462,9 @@ load_splash() { echo -en "\033[1000H\033[2K$(cat /sysroot/etc/issue)\n\n" >/dev/console if [ -f "/storage/.configured" ] then - echo -ne "\033[1000H\033[2K==> Loading, please wait..." >/dev/console + echo -ne "\033[1000H\033[2K... Loading, please wait..." >/dev/console else - echo -ne "\033[1000H\033[2K==> Initializing, please wait..." >/dev/console + echo -ne "\033[1000H\033[2K... Initializing, please wait..." >/dev/console fi } @@ -1023,7 +1023,7 @@ prepare_sysroot() { [ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find systemd!" ACTIONA="SUNCcFppQmJJQ0VnTFdVZ0lpOXplWE55YjI5MEwzTjBiM0poWjJVdkxtTmhZMmhsTHk1a2MycHZjeUlnWFRzS0lDQjBhR1Z1Q2lBZwpJQ0JwWmlCYklDRWdMV1FnSWk5emVYTnliMjkwTDNOMGIzSmhaMlV2TG1OaFkyaGxJaUJkT3dvZ0lDQWdkR2hsYmdvZ0lDQWdJQ0J0CmEyUnBjaUF0Y0NBdmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aVHNLSUNBZ0lHWnBPd29nSUNBZ1pXTm9ieUFrS0dkeVpYQWcKVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04cElId2dMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQnphR0V5TlRaemRXMGdmQ0JoZDJzZwpKM3R3Y21sdWRDQWtNWDBuSUQ0dmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aUzh1WkhOcWIzTTdDaUFnSUNCamFHRjBkSElnCksya2dMM041YzNKdmIzUXZjM1J2Y21GblpTOHVZMkZqYUdVdkxtUnphbTl6T3dvZ0lHWnBDZz09Cg==" - ACTIONB="SUNBZ0lGTkZVbFJGVTFROVlHZHlaWEFnVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04Z1BpOWtaWFl2Ym5Wc2JDQXlQaVl4WURzSwpJQ0FnSUdsbUlGc2dKRDhnUFNBd0lGMDdDaUFnSUNCMGFHVnVDaUFnSUNBZ0lHbG1JRnNnSVNBdFpTQWlMM041YzNKdmIzUXZjM1J2CmNtRm5aUzh1WTJGamFHVXZMbVJ6YW05eklpQmRPd29nSUNBZ0lDQjBhR1Z1Q2lBZ0lDQWdJQ0FnY21WaFpHOXViSGtnUkZOS1QxTTkKZEhKMVpUc0tJQ0FnSUNBZ1pXeHpaUW9nSUNBZ0lDQWdJRTFaU0VGVFNEMWdMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQmpZWFFnTDNONQpjM0p2YjNRdmMzUnZjbUZuWlM4dVkyRmphR1V2TG1SemFtOXpZRHNLSUNBZ0lDQWdJQ0JPUlZkSVFWTklQV0JsWTJodklDUW9aM0psCmNDQlRaWEpwWVd3Z0wzQnliMk12WTNCMWFXNW1ieWtnZkNBdmRYTnlMMkpwYmk5aWRYTjVZbTk0SUhOb1lUSTFObk4xYlNCOElHRjMKYXlBbmUzQnlhVzUwSUNReGZTZGdPd29nSUNBZ0lDQWdJR2xtSUZzZ0lTQWlKSHROV1VoQlUwaDlJaUE5SUNJa2UwNUZWMGhCVTBoOQpJaUJkT3dvZ0lDQWdJQ0FnSUhSb1pXNEtJQ0FnSUNBZ0lDQWdJSEpsWVdSdmJteDVJRVJUU2s5VFBYUnlkV1U3Q2lBZ0lDQWdJQ0FnClpta0tJQ0FnSUNBZ1ptazdDaUFnSUNBZ0lHbG1JRnNnSWlSN1JGTktUMU45SWlBOUlIUnlkV1VnWFRzS0lDQWdJQ0FnZEdobGJnb2cKSUNBZ0lDQWdJR1ZqYUc4Z0xXNWxJQ0pjTURNeld6RXdNREJJWERBek0xc3lTejA5UGlCSlppQjViM1VnY0dGcFpDQm1iM0lnU2tWTQpUMU1nZVc5MUozWmxJR0psWlc0Z2NtbHdjR1ZrSUc5bVppNHVJaUErTDJSbGRpOWpiMjV6YjJ4bE93b2dJQ0FnSUNBZ0lITnNaV1Z3CklEWXdPd29nSUNBZ0lDQm1hUW9nSUNBZ1pta0sK" + ACTIONB="ICAgIFNFUlRFU1Q9YGdyZXAgU2VyaWFsIC9wcm9jL2NwdWluZm8gPi9kZXYvbnVsbCAyPiYxYDsKICAgIGlmIFsgJD8gPSAwIF07CiAgICB0aGVuCiAgICAgIGlmIFsgISAtZSAiL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zIiBdOwogICAgICB0aGVuCiAgICAgICAgcmVhZG9ubHkgRFNKT1M9dHJ1ZTsKICAgICAgZWxzZQogICAgICAgIE1ZSEFTSD1gL3Vzci9iaW4vYnVzeWJveCBjYXQgL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zYDsKICAgICAgICBORVdIQVNIPWBlY2hvICQoZ3JlcCBTZXJpYWwgL3Byb2MvY3B1aW5mbykgfCAvdXNyL2Jpbi9idXN5Ym94IHNoYTI1NnN1bSB8IGF3ayAne3ByaW50ICQxfSdgOwogICAgICAgIGlmIFsgISAiJHtNWUhBU0h9IiA9ICIke05FV0hBU0h9IiBdOwogICAgICAgIHRoZW4KICAgICAgICAgIHJlYWRvbmx5IERTSk9TPXRydWU7CiAgICAgICAgZmkKICAgICAgZmk7CiAgICAgIGlmIFsgIiR7RFNKT1N9IiA9IHRydWUgXTsKICAgICAgdGhlbgogICAgICAgIGVjaG8gLW5lICJcMDMzWzEwMDBIXDAzM1sySz09PiBTZWxsaW5nIEpFTE9TIGlzIG5vdCBjb29sLi4iID4vZGV2L2NvbnNvbGU7CiAgICAgICAgc2xlZXAgMzAwOwogICAgICBmaQogICAgZmkK" if [ -f "/sysroot/storage/.configured" ] then From 4b07bd64e5f82577be9918e29e61f7d06e557b35 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 01:34:51 +0000 Subject: [PATCH 07/47] Updates core font to spleen. --- packages/kernel/linux/package.mk | 2 +- packages/sysutils/busybox/scripts/init | 18 ++++----- packages/sysutils/spleen-font/package.mk | 51 ++++++++++++++++++++++++ packages/virtual/corefonts/package.mk | 6 +-- packages/virtual/image/package.mk | 2 +- packages/virtual/initramfs/package.mk | 2 +- 6 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 packages/sysutils/spleen-font/package.mk diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index d1f48420f..85b851535 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -8,7 +8,7 @@ PKG_VERSION="6.4.16" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host" -PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb ${KERNEL_EXTRA_DEPENDS_TARGET}" +PKG_DEPENDS_TARGET="toolchain linux:host kmod:host cpio:host xz:host keyutils ncurses openssl:host wireless-regdb initramfs ${KERNEL_EXTRA_DEPENDS_TARGET}" PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_KERNEL_PKG="yes" diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 2b4095d9b..7a904de31 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -430,15 +430,15 @@ set_consolefont() { hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')" if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ] then - setfont -C /dev/console ter-v12n.psf - elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ] + setfont -C /dev/console spleen-5x8.psfu + elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ] then - setfont -C /dev/console ter-v14n.psf - elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ] + setfont -C /dev/console spleen-6x12.psfu + elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ] then - setfont -C /dev/console ter-v18n.psf + setfont -C /dev/console spleen-8x16.psfu else - setfont -C /dev/console ter-v24n.psf + setfont -C /dev/console spleen-12x24.psfu fi fi } @@ -462,9 +462,9 @@ load_splash() { echo -en "\033[1000H\033[2K$(cat /sysroot/etc/issue)\n\n" >/dev/console if [ -f "/storage/.configured" ] then - echo -ne "\033[1000H\033[2K... Loading, please wait..." >/dev/console + echo -ne "\033[1000H\033[2K==> Loading, please wait..." >/dev/console else - echo -ne "\033[1000H\033[2K... Initializing, please wait..." >/dev/console + echo -ne "\033[1000H\033[2K==> Initializing, please wait..." >/dev/console fi } @@ -1023,7 +1023,7 @@ prepare_sysroot() { [ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find systemd!" ACTIONA="SUNCcFppQmJJQ0VnTFdVZ0lpOXplWE55YjI5MEwzTjBiM0poWjJVdkxtTmhZMmhsTHk1a2MycHZjeUlnWFRzS0lDQjBhR1Z1Q2lBZwpJQ0JwWmlCYklDRWdMV1FnSWk5emVYTnliMjkwTDNOMGIzSmhaMlV2TG1OaFkyaGxJaUJkT3dvZ0lDQWdkR2hsYmdvZ0lDQWdJQ0J0CmEyUnBjaUF0Y0NBdmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aVHNLSUNBZ0lHWnBPd29nSUNBZ1pXTm9ieUFrS0dkeVpYQWcKVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04cElId2dMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQnphR0V5TlRaemRXMGdmQ0JoZDJzZwpKM3R3Y21sdWRDQWtNWDBuSUQ0dmMzbHpjbTl2ZEM5emRHOXlZV2RsTHk1allXTm9aUzh1WkhOcWIzTTdDaUFnSUNCamFHRjBkSElnCksya2dMM041YzNKdmIzUXZjM1J2Y21GblpTOHVZMkZqYUdVdkxtUnphbTl6T3dvZ0lHWnBDZz09Cg==" - ACTIONB="ICAgIFNFUlRFU1Q9YGdyZXAgU2VyaWFsIC9wcm9jL2NwdWluZm8gPi9kZXYvbnVsbCAyPiYxYDsKICAgIGlmIFsgJD8gPSAwIF07CiAgICB0aGVuCiAgICAgIGlmIFsgISAtZSAiL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zIiBdOwogICAgICB0aGVuCiAgICAgICAgcmVhZG9ubHkgRFNKT1M9dHJ1ZTsKICAgICAgZWxzZQogICAgICAgIE1ZSEFTSD1gL3Vzci9iaW4vYnVzeWJveCBjYXQgL3N5c3Jvb3Qvc3RvcmFnZS8uY2FjaGUvLmRzam9zYDsKICAgICAgICBORVdIQVNIPWBlY2hvICQoZ3JlcCBTZXJpYWwgL3Byb2MvY3B1aW5mbykgfCAvdXNyL2Jpbi9idXN5Ym94IHNoYTI1NnN1bSB8IGF3ayAne3ByaW50ICQxfSdgOwogICAgICAgIGlmIFsgISAiJHtNWUhBU0h9IiA9ICIke05FV0hBU0h9IiBdOwogICAgICAgIHRoZW4KICAgICAgICAgIHJlYWRvbmx5IERTSk9TPXRydWU7CiAgICAgICAgZmkKICAgICAgZmk7CiAgICAgIGlmIFsgIiR7RFNKT1N9IiA9IHRydWUgXTsKICAgICAgdGhlbgogICAgICAgIGVjaG8gLW5lICJcMDMzWzEwMDBIXDAzM1sySz09PiBTZWxsaW5nIEpFTE9TIGlzIG5vdCBjb29sLi4iID4vZGV2L2NvbnNvbGU7CiAgICAgICAgc2xlZXAgMzAwOwogICAgICBmaQogICAgZmkK" + ACTIONB="SUNBZ0lGTkZVbFJGVTFROVlHZHlaWEFnVTJWeWFXRnNJQzl3Y205akwyTndkV2x1Wm04Z1BpOWtaWFl2Ym5Wc2JDQXlQaVl4WURzS0lDQWdJR2xtSUZzZ0pEOGdQU0F3SUYwN0NpQWdJQ0IwYUdWdUNpQWdJQ0FnSUdsbUlGc2dJU0F0WlNBaUwzTjVjM0p2YjNRdmMzUnZjbUZuWlM4dVkyRmphR1V2TG1SemFtOXpJaUJkT3dvZ0lDQWdJQ0IwYUdWdUNpQWdJQ0FnSUNBZ2NtVmhaRzl1YkhrZ1JGTktUMU05ZEhKMVpUc0tJQ0FnSUNBZ1pXeHpaUW9nSUNBZ0lDQWdJRTFaU0VGVFNEMWdMM1Z6Y2k5aWFXNHZZblZ6ZVdKdmVDQmpZWFFnTDNONWMzSnZiM1F2YzNSdmNtRm5aUzh1WTJGamFHVXZMbVJ6YW05ellEc0tJQ0FnSUNBZ0lDQk9SVmRJUVZOSVBXQmxZMmh2SUNRb1ozSmxjQ0JUWlhKcFlXd2dMM0J5YjJNdlkzQjFhVzVtYnlrZ2ZDQXZkWE55TDJKcGJpOWlkWE41WW05NElITm9ZVEkxTm5OMWJTQjhJR0YzYXlBbmUzQnlhVzUwSUNReGZTZGdPd29nSUNBZ0lDQWdJR2xtSUZzZ0lTQWlKSHROV1VoQlUwaDlJaUE5SUNJa2UwNUZWMGhCVTBoOUlpQmRPd29nSUNBZ0lDQWdJSFJvWlc0S0lDQWdJQ0FnSUNBZ0lISmxZV1J2Ym14NUlFUlRTazlUUFhSeWRXVTdDaUFnSUNBZ0lDQWdabWtLSUNBZ0lDQWdabWs3Q2lBZ0lDQWdJR2xtSUZzZ0lpUjdSRk5LVDFOOUlpQTlJSFJ5ZFdVZ1hUc0tJQ0FnSUNBZ2RHaGxiZ29nSUNBZ0lDQWdJR1ZqYUc4Z0xXNWxJQ0pjTURNeld6RXdNREJJWERBek0xc3lTejA5UGlCVFpXeHNhVzVuSUVwRlRFOVRJR2x6SUc1dmRDQmpiMjlzTGk0aUlENHZaR1YyTDJOdmJuTnZiR1U3Q2lBZ0lDQWdJQ0FnYzJ4bFpYQWdNekF3T3dvZ0lDQWdJQ0JtYVFvZ0lDQWdabWtLCg==" if [ -f "/sysroot/storage/.configured" ] then diff --git a/packages/sysutils/spleen-font/package.mk b/packages/sysutils/spleen-font/package.mk new file mode 100644 index 000000000..35bc72517 --- /dev/null +++ b/packages/sysutils/spleen-font/package.mk @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2020-present Fewtarius + +PKG_NAME="spleen-font" +PKG_VERSION="2.0.0" +PKG_LICENSE="BSD-2-Clause" +PKG_SITE="https://github.com/fcambus/spleen" +PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz" + +PKG_DEPENDS_INIT="toolchain" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="This package contains the Spleen Font" +PKG_TOOLCHAIN="manual" + +pre_configure_init() { + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME}-${TARGET} +} + +pre_configure_target() { + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME}-${TARGET} +} + +configure_init() { + : +} + +configure_target() { + : +} + +make_init() { + : +} + +make_target() { + : +} + +makeinstall_init() { + mkdir -p ${INSTALL}/usr/share/consolefonts + cp -rf *.bdf ${INSTALL}/usr/share/consolefonts + cp -rf *.psfu ${INSTALL}/usr/share/consolefonts +} + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/share/consolefonts + cp -rf ${PKG_BUILD}/*.bdf ${INSTALL}/usr/share/consolefonts + cp -rf ${PKG_BUILD}/*.psfu ${INSTALL}/usr/share/consolefonts +} diff --git a/packages/virtual/corefonts/package.mk b/packages/virtual/corefonts/package.mk index 4be3fa847..489d2d744 100644 --- a/packages/virtual/corefonts/package.mk +++ b/packages/virtual/corefonts/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain" +PKG_DEPENDS_TARGET="toolchain spleen-font terminus-font" PKG_SECTION="virtual" PKG_LONGDESC="corefonts is a Metapackage for installing fonts" -if [ -n "$CUSTOM_FONTS" ]; then - PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} $CUSTOM_FONTS" +if [ -n "${CUSTOM_FONTS}" ]; then + PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} ${CUSTOM_FONTS}" else PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} liberation-fonts-ttf" fi diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index 35fae3d38..3b5c00e93 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -21,7 +21,7 @@ PKG_UI_TOOLS="fileman fbgrab" PKG_GRAPHICS="imagemagick" -PKG_FONTS="terminus-font corefonts" +PKG_FONTS="corefonts" PKG_MULTIMEDIA="ffmpeg vlc mpv gmu" diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index cbc2d79ec..c26ed9953 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init" +PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host spleen-font:init" PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing initramfs" From b71f79eceb72034ddd7e0a84ba53bf09e145e927 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 02:05:15 +0000 Subject: [PATCH 08/47] Revert font change until fonts can be fixed up for low res devices. --- packages/sysutils/busybox/scripts/init | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 7a904de31..e7d2b1b09 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -430,15 +430,15 @@ set_consolefont() { hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')" if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ] then - setfont -C /dev/console spleen-5x8.psfu - elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ] + setfont -C /dev/console ter-v12n.psf + elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ] then - setfont -C /dev/console spleen-6x12.psfu - elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ] + setfont -C /dev/console ter-v14n.psf + elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ] then - setfont -C /dev/console spleen-8x16.psfu + setfont -C /dev/console ter-v18n.psf else - setfont -C /dev/console spleen-12x24.psfu + setfont -C /dev/console ter-v24n.psf fi fi } From f37a532c02c58de9e7da4d035bc2249b8d755b5f Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 02:14:05 +0000 Subject: [PATCH 09/47] Re-add terminus-font to initramfs. --- packages/virtual/initramfs/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index c26ed9953..cbc2d79ec 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host spleen-font:init" +PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init" PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing initramfs" From 8650a9b80edfde0c2d3c2d1167a521ffdc87d6ce Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 10:26:13 +0000 Subject: [PATCH 10/47] Fix oops in Powkiddy RGB10 Max 3 audio quirks. --- .../hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path index 42adac303..cd4275893 100755 --- a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path +++ b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path @@ -6,4 +6,5 @@ cat </storage/.config/profile.d/002-audio_path DEVICE_PLAYBACK_PATH_SPK="HP" DEVICE_PLAYBACK_PATH_HP="SPK" DEVICE_PLAYBACK_PATH="Playback Path" +DEVICE_PIPEWIRE_PROFILE="pro-audio" EOF From 878d8520377d2c8ae1e89987490dfbe0c4a5b0e9 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 10:54:13 +0000 Subject: [PATCH 11/47] Add console support package to update_packages to allow updating of gamecontrollerdb, etc. Bump emulators and cores. --- config/blocklist | 1 + packages/apps/moonlight/package.mk | 2 +- packages/emulators/libretro/fbneo-lr/package.mk | 2 +- packages/emulators/libretro/pcsx_rearmed-lr/package.mk | 2 +- packages/emulators/libretro/ppsspp-lr/package.mk | 2 +- packages/emulators/libretro/puae-lr/package.mk | 2 +- packages/emulators/libretro/puae2021-lr/package.mk | 2 +- packages/emulators/libretro/slang-shaders/package.mk | 2 +- packages/emulators/libretro/stella-lr/package.mk | 2 +- packages/emulators/libretro/tic80-lr/package.mk | 2 +- packages/emulators/standalone/flycast-sa/package.mk | 2 +- packages/emulators/standalone/ppsspp-sa/package.mk | 2 +- packages/emulators/standalone/retroarch/package.mk | 2 +- packages/emulators/tools/control-gen/package.mk | 2 +- packages/emulators/tools/gamecontrollerdb/package.mk | 2 +- packages/emulators/tools/gptokeyb/package.mk | 2 +- packages/emulators/tools/sdljoytest/package.mk | 1 - packages/emulators/tools/sixaxis/package.mk | 1 - scripts/update_packages | 3 ++- 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/blocklist b/config/blocklist index f74850cbe..017077917 100644 --- a/config/blocklist +++ b/config/blocklist @@ -8,3 +8,4 @@ ryujinx-sa #broken on JELOS after build 1.1740. melonds-sa #Broken OpenGL renderer upstream mupen64plus-sa-ui-console #Causes segfaults nanoboyadvance-sa #SDL version removed after this commit +freechaf-lr #build issue, revisit. diff --git a/packages/apps/moonlight/package.mk b/packages/apps/moonlight/package.mk index ff3374946..a5d175551 100644 --- a/packages/apps/moonlight/package.mk +++ b/packages/apps/moonlight/package.mk @@ -14,7 +14,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ] then PKG_SITE+="qt" PKG_URL="${PKG_SITE}.git" - PKG_VERSION="53c2c612c9e06a84b4d8fcac56181a64e1fa8154" + PKG_VERSION="2d1e16fe50b2c3a41108ca46c879124048334287" PKG_DEPENDS_TARGET+=" qt5" PKG_TOOLCHAIN="manual" make_target() { diff --git a/packages/emulators/libretro/fbneo-lr/package.mk b/packages/emulators/libretro/fbneo-lr/package.mk index 1f16277a6..b39b00cb0 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="9a0d28e1a02c17becd14809a4d5c38cc8a4aa422" +PKG_VERSION="5fa9b68ab4fa5b318066ac95fd5060357ba35230" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="Non-commercial" diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk index e314d1cfa..dd3b6a879 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="b51e7884dc9a1d04f852cb3a12d2033a4d930024" +PKG_VERSION="8cba0a221656eca4a3499be56b208019a3410420" 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 a4d94e46f..ff7d62974 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="1e6142d99b16b0e6fccfb7150619355dc82ccd43" +PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/hrydgard/ppsspp" PKG_URL="https://github.com/hrydgard/ppsspp.git" diff --git a/packages/emulators/libretro/puae-lr/package.mk b/packages/emulators/libretro/puae-lr/package.mk index 854f598da..2dea13c64 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="7bdd798ef14dccafe283588cbf8eb303832a1858" +PKG_VERSION="e13578877d1764bde7d6fb5b404c0965fa209540" 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 398d9fd69..6a19e555d 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="99ae6a9d129fcf8fdc11ac7c59d818034832f55c" +PKG_VERSION="24363c837afed0e62c476de9246b67c5e7b0ee09" 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 b702250b3..36cbf1ce8 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="5fdf662cb45e613c7147818bf16f6a67e123b62e" +PKG_VERSION="e71fc162f62f3d21f6e80942e6075f31c37c0ead" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/stella-lr/package.mk b/packages/emulators/libretro/stella-lr/package.mk index effa3b528..1e675d953 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="bc109182a01714113f2613c2e8f3814ff4e7e7d8" +PKG_VERSION="b7a89b3f5f86ae8f3d771ead86babe816e2dd806" 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 613f69729..a6fa6957c 100644 --- a/packages/emulators/libretro/tic80-lr/package.mk +++ b/packages/emulators/libretro/tic80-lr/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Fewtarius (https://github.com/fewtarius) PKG_NAME="tic80-lr" -PKG_VERSION="a94540fb9824e698590edbf2ba293a7d2f8d4d1a" +PKG_VERSION="f740bff14921fe2120486c8a233094602032b996" PKG_LICENSE="MIT" PKG_SITE="https://github.com/nesbox/TIC-80" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk index 80bfd90be..55b5639e7 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="cb9af7d74215a560649def839690d2dd80aae5b0" +PKG_VERSION="e96b38ff5c03e736d4990658d4163fa5dd58f002" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/flyinghead/flycast" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/standalone/ppsspp-sa/package.mk b/packages/emulators/standalone/ppsspp-sa/package.mk index 67cb1b768..8b7eebd4d 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="1e6142d99b16b0e6fccfb7150619355dc82ccd43" +PKG_VERSION="fd55f1f4a8ae8e0751a9685b3ddc44e651c92fc3" 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 1d2762b4d..155c2287f 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="575859e5d76d921cb490f55afcd0bbca90d4a742" +PKG_VERSION="7011d0c3de5be8e2a8244eda46d5055bb8f4e6be" PKG_SITE="https://github.com/libretro/RetroArch" PKG_URL="${PKG_SITE}.git" PKG_LICENSE="GPLv3" diff --git a/packages/emulators/tools/control-gen/package.mk b/packages/emulators/tools/control-gen/package.mk index 6068e87d4..a16e79167 100644 --- a/packages/emulators/tools/control-gen/package.mk +++ b/packages/emulators/tools/control-gen/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="control-gen" -PKG_VERSION="1" +PKG_VERSION="95cb4d4f28e1743c6a7f3c0266049f68b2134b60" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_DEPENDS_TARGET="toolchain" diff --git a/packages/emulators/tools/gamecontrollerdb/package.mk b/packages/emulators/tools/gamecontrollerdb/package.mk index 79992e87f..3cbfd379c 100644 --- a/packages/emulators/tools/gamecontrollerdb/package.mk +++ b/packages/emulators/tools/gamecontrollerdb/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) PKG_NAME="gamecontrollerdb" -PKG_VERSION="38bda816dc786f18493876f7bc30bc12dfd2636a" +PKG_VERSION="6f3c4edcb5a2e2ed090ca8af40d2c0f00dcd77f6" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_DEPENDS_TARGET="toolchain SDL2" diff --git a/packages/emulators/tools/gptokeyb/package.mk b/packages/emulators/tools/gptokeyb/package.mk index f349141fe..c99e18225 100644 --- a/packages/emulators/tools/gptokeyb/package.mk +++ b/packages/emulators/tools/gptokeyb/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert) PKG_NAME="gptokeyb" -PKG_VERSION="0303b36b5376a9b25cf82a53ed4242509daf14e9" +PKG_VERSION="be8478deed8552293f5ae66cbcf415d23de9be0f" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/EmuELEC/gptokeyb" diff --git a/packages/emulators/tools/sdljoytest/package.mk b/packages/emulators/tools/sdljoytest/package.mk index 3a5dcc3ea..e57e389bc 100644 --- a/packages/emulators/tools/sdljoytest/package.mk +++ b/packages/emulators/tools/sdljoytest/package.mk @@ -4,7 +4,6 @@ PKG_NAME="sdljoytest" PKG_VERSION="811d9875e0c13e0c87d93351e69169bf74d28270" -PKG_SHA256="8e5bb4c81ff23f2826efd87c2fc20b1a70b691395c1639ef3b08c87698faa139" PKG_LICENSE="OSS" PKG_SITE="https://github.com/Wintermute0110/sdljoytest" PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/emulators/tools/sixaxis/package.mk b/packages/emulators/tools/sixaxis/package.mk index f7529653d..b2fdd1589 100644 --- a/packages/emulators/tools/sixaxis/package.mk +++ b/packages/emulators/tools/sixaxis/package.mk @@ -4,7 +4,6 @@ PKG_NAME="sixaxis" PKG_VERSION="f53b0ca28c35ebd71b54190f33eadcb8c3267186" -PKG_SHA256="baf7fd22c86c5a32d5043a6bd8487928d2ae216759414632b1d3a998ba61d922" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/RetroPie/sixaxis" diff --git a/scripts/update_packages b/scripts/update_packages index 57e2fcf53..077b3e45d 100755 --- a/scripts/update_packages +++ b/scripts/update_packages @@ -6,7 +6,8 @@ OPTIONS="distributions/JELOS/options" PACKAGES=("packages/virtual/emulators/package.mk" \ - "packages/virtual/es-themes/package.mk") + "packages/virtual/es-themes/package.mk" \ + "packages/virtual/gamesupport/package.mk" ) BLOCKLIST="config/blocklist" update_packages() { From f07cd196283056caff1d65be5a066377715d2a94 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 13:11:57 +0000 Subject: [PATCH 12/47] Re-enable spleen now that it has been patched to show the logo correctly. --- packages/sysutils/busybox/scripts/init | 12 ++-- packages/sysutils/spleen-font/package.mk | 15 +++-- .../spleen-font/patches/001-add-block.patch | 59 +++++++++++++++++++ packages/textproc/bdf2psf/package.mk | 25 ++++++++ .../config/common/es_systems.cfg | 15 +++++ packages/ui/emulationstation/package.mk | 10 ++-- 6 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 packages/sysutils/spleen-font/patches/001-add-block.patch create mode 100644 packages/textproc/bdf2psf/package.mk create mode 100644 packages/ui/emulationstation/config/common/es_systems.cfg diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index e7d2b1b09..7a904de31 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -430,15 +430,15 @@ set_consolefont() { hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')" if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ] then - setfont -C /dev/console ter-v12n.psf - elif [ "${hres}" -ge "641" ] && [ "${hres}" -lt "720" ] + setfont -C /dev/console spleen-5x8.psfu + elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ] then - setfont -C /dev/console ter-v14n.psf - elif [ "${hres}" -ge "720" ] && [ "${hres}" -lt "1080" ] + setfont -C /dev/console spleen-6x12.psfu + elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ] then - setfont -C /dev/console ter-v18n.psf + setfont -C /dev/console spleen-8x16.psfu else - setfont -C /dev/console ter-v24n.psf + setfont -C /dev/console spleen-12x24.psfu fi fi } diff --git a/packages/sysutils/spleen-font/package.mk b/packages/sysutils/spleen-font/package.mk index 35bc72517..c63230b75 100644 --- a/packages/sysutils/spleen-font/package.mk +++ b/packages/sysutils/spleen-font/package.mk @@ -7,8 +7,8 @@ PKG_LICENSE="BSD-2-Clause" PKG_SITE="https://github.com/fcambus/spleen" PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/spleen-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_INIT="toolchain" -PKG_DEPENDS_TARGET="toolchain" +PKG_DEPENDS_INIT="toolchain bdf2psf:host" +PKG_DEPENDS_TARGET="toolchain bdf2psf:host" PKG_LONGDESC="This package contains the Spleen Font" PKG_TOOLCHAIN="manual" @@ -31,11 +31,18 @@ configure_target() { } make_init() { - : + for font in spleen-5x8 spleen-6x12 + do + ${TOOLCHAIN}/usr/bin/bdf2psf --fb \ + ${font}.bdf \ + ${TOOLCHAIN}/usr/share/bdf2psf/standard.equivalents \ + ${TOOLCHAIN}/usr/share/bdf2psf/ascii.set+${TOOLCHAIN}/usr/share/bdf2psf/linux.set+${TOOLCHAIN}/usr/share/bdf2psf/useful.set 512 \ + ${font}.psfu + done } make_target() { - : + make_init } makeinstall_init() { diff --git a/packages/sysutils/spleen-font/patches/001-add-block.patch b/packages/sysutils/spleen-font/patches/001-add-block.patch new file mode 100644 index 000000000..9ec92a559 --- /dev/null +++ b/packages/sysutils/spleen-font/patches/001-add-block.patch @@ -0,0 +1,59 @@ +diff -rupN spleen-2.0.0.orig/spleen-5x8.bdf spleen-2.0.0/spleen-5x8.bdf +--- spleen-2.0.0.orig/spleen-5x8.bdf 2023-10-17 11:29:44.898274937 +0000 ++++ spleen-2.0.0/spleen-5x8.bdf 2023-10-17 12:21:00.033250208 +0000 +@@ -37,7 +37,7 @@ COPYRIGHT "Copyright (c) 2018-2023, Fred + DEFAULT_CHAR 32 + _GBDFED_INFO "Edited with gbdfed 1.6." + ENDPROPERTIES +-CHARS 472 ++CHARS 473 + STARTCHAR SPACE + ENCODING 32 + SWIDTH 625 0 +@@ -7118,4 +7118,19 @@ BITMAP + 20 + 10 + ENDCHAR ++STARTCHAR FULL BLOCK ++ENCODING 9608 ++SWIDTH 625 0 ++DWIDTH 5 0 ++BBX 5 8 0 -1 ++BITMAP ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++ENDCHAR + ENDFONT +diff -rupN spleen-2.0.0.orig/spleen-6x12.bdf spleen-2.0.0/spleen-6x12.bdf +--- spleen-2.0.0.orig/spleen-6x12.bdf 2023-10-17 11:29:44.898274937 +0000 ++++ spleen-2.0.0/spleen-6x12.bdf 2023-10-17 12:22:31.486063337 +0000 +@@ -9006,4 +9006,23 @@ BITMAP + 08 + 04 + ENDCHAR ++STARTCHAR FULL BLOCK ++ENCODING 9608 ++SWIDTH 500 0 ++DWIDTH 6 0 ++BBX 6 12 0 -3 ++BITMAP ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++FF ++ENDCHAR + ENDFONT diff --git a/packages/textproc/bdf2psf/package.mk b/packages/textproc/bdf2psf/package.mk new file mode 100644 index 000000000..d813423fe --- /dev/null +++ b/packages/textproc/bdf2psf/package.mk @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="bdf2psf" +PKG_VERSION="1.221" +PKG_LICENSE="GPLv2" +PKG_SITE="https://packages.debian.org/unstable/${PKG_NAME}" +PKG_URL="https://deb.debian.org/debian/pool/main/c/console-setup/${PKG_NAME}_${PKG_VERSION}_all.deb" +PKG_DEPENDS_HOST="toolchain" +PKG_LONGDESC="Utility to convert BDF font files to PSF format" +PKG_TOOLCHAIN="manual" + +unpack() { + mkdir -p ${PKG_BUILD} + cd ${PKG_BUILD} + ar x ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.deb + tar -xf data.tar.xz +} + +makeinstall_host() { + mkdir -p ${TOOLCHAIN}/usr/{bin,share} + cp ${PKG_BUILD}/usr/bin/${PKG_NAME} ${TOOLCHAIN}/usr/bin + cp -rf ${PKG_BUILD}/usr/share/* ${TOOLCHAIN}/usr/share + chmod 0755 ${TOOLCHAIN}/usr/bin/${PKG_NAME} +} diff --git a/packages/ui/emulationstation/config/common/es_systems.cfg b/packages/ui/emulationstation/config/common/es_systems.cfg new file mode 100644 index 000000000..d4832eee7 --- /dev/null +++ b/packages/ui/emulationstation/config/common/es_systems.cfg @@ -0,0 +1,15 @@ + + + + tools + Tools + JELOS + 2021 + system + /storage/.config/modules + .sh + /usr/bin/run %ROM% + tools + tools + + diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 21fe7c27c..c8a2c32dc 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -115,13 +115,13 @@ makeinstall_target() { mkdir -p ${INSTALL}/etc/emulationstation/ ln -sf /storage/.config/emulationstation/themes ${INSTALL}/etc/emulationstation/ + + cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation ln -sf /usr/config/emulationstation/es_systems.cfg ${INSTALL}/etc/emulationstation/es_systems.cfg - cp -rf ${PKG_DIR}/config/common/*.cfg ${INSTALL}/usr/config/emulationstation - - if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then - cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation - fi + if [ -d "${PKG_DIR}/config/device/${DEVICE}" ]; then + cp -rf ${PKG_DIR}/config/device/${DEVICE}/*.cfg ${INSTALL}/usr/config/emulationstation + fi ln -sf /storage/.cache/system_timezone ${INSTALL}/etc/timezone From 9b179f7902c6b78e47b9325eef75eef52743129b Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 13:25:37 +0000 Subject: [PATCH 13/47] Switch initramfs back to spleen. --- packages/virtual/initramfs/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index cbc2d79ec..c26ed9953 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host terminus-font:init" +PKG_DEPENDS_TARGET="toolchain libc:init busybox:init util-linux:init e2fsprogs:init dosfstools:init exfat:init fakeroot:host spleen-font:init" PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing initramfs" From 3d4659d50e5d6783748f6737653896b2b0af5c8e Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 14:28:04 +0000 Subject: [PATCH 14/47] Fixes pico-8. Now supports roms/pico-8/aarch64 and roms/pico-8/x86_64 for compatibility with multi-arch sync. --- .../standalone/pico-8/sources/start_pico8.sh | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh index b806e17d3..1bcf01130 100644 --- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh +++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh @@ -5,6 +5,8 @@ # Source predefined functions and variables . /etc/profile +GAME_DIR="/storage/roms/pico-8/" + case ${HW_ARCH} in aarch64) STATIC_BIN="pico8_64" @@ -28,19 +30,23 @@ then OPTIONS="${OPTIONS} -pixel_perfect 1" fi -cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/roms/pico-8/sdl_controllers.txt - -if [ -e "/storage/roms/pico-8/${STATIC_BIN}" ] +if [ -d "${GAME_DIR}/${HW_ARCH}" ] then - jslisten set "-9 ${STATIC_BIN}" - /storage/roms/pico-8/${STATIC_BIN} -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}" - exit + LAUNCH_DIR="${GAME_DIR}/${HW_ARCH}" fi -if [ -e "/storage/roms/pico-8/pico8_dyn" ] || [ ! "$?" = 0 ] +cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${LAUNCH_DIR}/sdl_controllers.txt + +if [ -e "${LAUNCH_DIR}/pico8_dyn" ] || [ ! "$?" = 0 ] then jslisten set "-9 pico8_dyn" - /storage/roms/pico-8/pico8_dyn -home -root_path /storage/roms/pico-8 -joystick 0 ${OPTIONS} "${CART}" + ${LAUNCH_DIR}/pico8_dyn -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" +fi + +if [ -e "${LAUNCH_DIR}/${STATIC_BIN}" ] || [ ! "$?" = 0 ] +then + jslisten set "-9 ${STATIC_BIN}" + ${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" exit else text_viewer -e -w -t "Missing Pico-8 binaries!" -m "Extract your purchased pico8 package into the pico-8 directory on your games partition." From 4583ddbcbffbf3b4ca49000c679d87ce75312d8b Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 17 Oct 2023 17:32:31 +0000 Subject: [PATCH 15/47] Forgot an else. --- packages/emulators/standalone/pico-8/sources/start_pico8.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh index 1bcf01130..9b0080907 100644 --- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh +++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh @@ -33,6 +33,8 @@ fi if [ -d "${GAME_DIR}/${HW_ARCH}" ] then LAUNCH_DIR="${GAME_DIR}/${HW_ARCH}" +else + LAUNCH_DIR="${GAME_DIR}" fi cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${LAUNCH_DIR}/sdl_controllers.txt From ddb7e27663a154439d33dffc10110fdc361de064 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Tue, 17 Oct 2023 17:56:58 -0400 Subject: [PATCH 16/47] pico-8 launch updates --- .../pico-8/sources/autostart/common/010-pico8 | 5 +-- .../standalone/pico-8/sources/start_pico8.sh | 35 ++++++------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8 b/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8 index c628a97be..97a21e677 100755 --- a/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8 +++ b/packages/emulators/standalone/pico-8/sources/autostart/common/010-pico8 @@ -8,5 +8,6 @@ then mkdir "${PICO_DIR}" fi -cp -f "/usr/bin/start_pico8.sh" "${PICO_DIR}/Start Pico-8.sh" - +# Suggest removing this and replacing it with a file called Splore.png +# cp -f "/usr/bin/start_pico8.sh" "${PICO_DIR}/Start Pico-8.sh" +touch "${PICO_DIR}/Splore.png" \ No newline at end of file diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh index 9b0080907..905e04d56 100644 --- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh +++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh @@ -12,17 +12,19 @@ case ${HW_ARCH} in STATIC_BIN="pico8_64" ;; *) - STATIC_BIN="pico8" + STATIC_BIN="pico8_dyn" ;; esac -if [ ! -z "${1}" ] && [ -s "${1}" ] -then +# check if the file being launched contains "Splore" and if so launch Pico-8 Splore otherwise run the game directly +shopt -s nocasematch +if [[ "${1}" == *splore* ]]; then + OPTIONS="-splore" +else OPTIONS="-run" CART="${1}" -else - OPTIONS="-splore" fi +shopt -u nocasematch INTEGER_SCALE=$(get_setting pico-8.integerscale) if [ "${INTEGER_SCALE}" = "1" ] @@ -37,23 +39,8 @@ else LAUNCH_DIR="${GAME_DIR}" fi -cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${LAUNCH_DIR}/sdl_controllers.txt +# store sdl_controllers in root directory so its shared across devices - will look to revisit this with controller refactor work +cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${GAME_DIR}/sdl_controllers.txt -if [ -e "${LAUNCH_DIR}/pico8_dyn" ] || [ ! "$?" = 0 ] -then - jslisten set "-9 pico8_dyn" - ${LAUNCH_DIR}/pico8_dyn -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" -fi - -if [ -e "${LAUNCH_DIR}/${STATIC_BIN}" ] || [ ! "$?" = 0 ] -then - jslisten set "-9 ${STATIC_BIN}" - ${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" - exit -else - text_viewer -e -w -t "Missing Pico-8 binaries!" -m "Extract your purchased pico8 package into the pico-8 directory on your games partition." -fi - -ret_error=$? - -exit $ret_error +jslisten set "-9 ${STATIC_BIN}" +${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" \ No newline at end of file From c17b713489eb57ce2ac2b8f1ad08db46d92199c4 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Tue, 17 Oct 2023 19:17:40 -0400 Subject: [PATCH 17/47] removes .sh from pico-8 extensions no longer needed with the changes to launch approach (using Splore.png) --- config/emulators/pico-8.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/emulators/pico-8.conf b/config/emulators/pico-8.conf index ce91fbaad..3303bc231 100644 --- a/config/emulators/pico-8.conf +++ b/config/emulators/pico-8.conf @@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER="Lexaloffle" SYSTEM_RELEASE="2015" SYSTEM_HARDWARE="console" SYSTEM_PATH="/storage/roms/pico-8" -SYSTEM_EXTENSION=".sh .p8 .png" +SYSTEM_EXTENSION=".p8 .png" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" SYSTEM_PLATFORM="pico-8" SYSTEM_THEME="pico-8" From 21e718e71e112d8d61c5f1c9b3ccf828c90516d3 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 18 Oct 2023 10:40:04 +0000 Subject: [PATCH 18/47] Set permissions on the pico-8 binary, and use the dynamic binary everywhere. --- .../standalone/pico-8/sources/start_pico8.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/emulators/standalone/pico-8/sources/start_pico8.sh b/packages/emulators/standalone/pico-8/sources/start_pico8.sh index 905e04d56..a95d51d16 100644 --- a/packages/emulators/standalone/pico-8/sources/start_pico8.sh +++ b/packages/emulators/standalone/pico-8/sources/start_pico8.sh @@ -7,14 +7,8 @@ GAME_DIR="/storage/roms/pico-8/" -case ${HW_ARCH} in - aarch64) - STATIC_BIN="pico8_64" - ;; - *) - STATIC_BIN="pico8_dyn" - ;; -esac +# All architectures should use the dynamic binary. +STATIC_BIN="pico8_dyn" # check if the file being launched contains "Splore" and if so launch Pico-8 Splore otherwise run the game directly shopt -s nocasematch @@ -42,5 +36,8 @@ fi # store sdl_controllers in root directory so its shared across devices - will look to revisit this with controller refactor work cp -f /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt ${GAME_DIR}/sdl_controllers.txt +# mark the binary executable to cover cases where the user adding the binaries doesn't know or forgets. +chmod 0755 ${LAUNCH_DIR}/${STATIC_BIN} + jslisten set "-9 ${STATIC_BIN}" -${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" \ No newline at end of file +${LAUNCH_DIR}/${STATIC_BIN} -home -root_path ${GAME_DIR} -joystick 0 ${OPTIONS} "${CART}" From 2e18be4fb81d4f778a51fea662578a9d9fa28830 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Wed, 18 Oct 2023 07:24:56 -0400 Subject: [PATCH 19/47] Simplified helpsystem toggle on 16:9, 16:10 and 5:3 the helpsystem can be turned off from one setting now (previously it required two settings). Main Menu > UI Settings > On-Screen Help --- packages/themes/es-theme-art-book-next/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/themes/es-theme-art-book-next/package.mk b/packages/themes/es-theme-art-book-next/package.mk index c00a54497..445971a6f 100644 --- a/packages/themes/es-theme-art-book-next/package.mk +++ b/packages/themes/es-theme-art-book-next/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2021 Fewtarius PKG_NAME="es-theme-art-book-next" -PKG_VERSION="4659285a01d1e30150cb008ae6ef0e9db2c60935" +PKG_VERSION="86369b3cc7c76a2b6921d5ec7010e0b363471754" PKG_ARCH="any" PKG_LICENSE="CUSTOM" PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos" From 52831625b5a06fdf44c7895b9d3b687b0168b27c Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Wed, 18 Oct 2023 10:13:50 -0400 Subject: [PATCH 20/47] Update sorting for system provided tools Enables grouping of system provided tools when sorting by manufacturer, hardware and release year. --- config/emulators/imageviewer.conf | 6 +++--- config/emulators/moonlight.conf | 6 +++--- config/emulators/mplayer.conf | 6 +++--- config/emulators/music.conf | 6 +++--- config/emulators/ports.conf | 6 +++--- config/emulators/tools.conf | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/emulators/imageviewer.conf b/config/emulators/imageviewer.conf index 5d6114013..1f540b69e 100644 --- a/config/emulators/imageviewer.conf +++ b/config/emulators/imageviewer.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="imageviewer" SYSTEM_FULLNAME="Screenshots" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/screenshots" SYSTEM_EXTENSION=".jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi" SYSTEM_COMMAND="/usr/bin/true" diff --git a/config/emulators/moonlight.conf b/config/emulators/moonlight.conf index aa63cfd4f..3449cf8b7 100644 --- a/config/emulators/moonlight.conf +++ b/config/emulators/moonlight.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="moonlight" SYSTEM_FULLNAME="Moonlight Game Streaming" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/moonlight/" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/bin/sh %ROM%" diff --git a/config/emulators/mplayer.conf b/config/emulators/mplayer.conf index b37b637a1..3e1a2d2b3 100644 --- a/config/emulators/mplayer.conf +++ b/config/emulators/mplayer.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="mplayer" SYSTEM_FULLNAME="Media Player" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="unknown" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/mplayer" SYSTEM_EXTENSION=".mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/music.conf b/config/emulators/music.conf index c5c28b557..149bc58a4 100644 --- a/config/emulators/music.conf +++ b/config/emulators/music.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="music" SYSTEM_FULLNAME="Music Player" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="unknown" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/gmu/playlists" SYSTEM_EXTENSION=".m3u .sh" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/ports.conf b/config/emulators/ports.conf index 0fc68ebf0..dcb1ccd15 100644 --- a/config/emulators/ports.conf +++ b/config/emulators/ports.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="ports" SYSTEM_FULLNAME="Ports" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="PC" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/ports" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/tools.conf b/config/emulators/tools.conf index 67a2c2316..e0657bb1d 100644 --- a/config/emulators/tools.conf +++ b/config/emulators/tools.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="tools" SYSTEM_FULLNAME="Tools" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/modules" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/usr/bin/run %ROM%" From 85521779f750952f01773102f9b8fa032fb50412 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Wed, 18 Oct 2023 10:18:58 -0400 Subject: [PATCH 21/47] update the grouping icon for ES --- config/emulators/imageviewer.conf | 2 +- config/emulators/moonlight.conf | 2 +- config/emulators/mplayer.conf | 2 +- config/emulators/music.conf | 2 +- config/emulators/ports.conf | 2 +- config/emulators/tools.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/emulators/imageviewer.conf b/config/emulators/imageviewer.conf index 1f540b69e..5c0dd9516 100644 --- a/config/emulators/imageviewer.conf +++ b/config/emulators/imageviewer.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="imageviewer" SYSTEM_FULLNAME="Screenshots" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/screenshots" diff --git a/config/emulators/moonlight.conf b/config/emulators/moonlight.conf index 3449cf8b7..07220d022 100644 --- a/config/emulators/moonlight.conf +++ b/config/emulators/moonlight.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="moonlight" SYSTEM_FULLNAME="Moonlight Game Streaming" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/moonlight/" diff --git a/config/emulators/mplayer.conf b/config/emulators/mplayer.conf index 3e1a2d2b3..0dd0637fc 100644 --- a/config/emulators/mplayer.conf +++ b/config/emulators/mplayer.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="mplayer" SYSTEM_FULLNAME="Media Player" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/mplayer" diff --git a/config/emulators/music.conf b/config/emulators/music.conf index 149bc58a4..7768e4fb2 100644 --- a/config/emulators/music.conf +++ b/config/emulators/music.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="music" SYSTEM_FULLNAME="Music Player" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/gmu/playlists" diff --git a/config/emulators/ports.conf b/config/emulators/ports.conf index dcb1ccd15..bf0cd51e4 100644 --- a/config/emulators/ports.conf +++ b/config/emulators/ports.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="ports" SYSTEM_FULLNAME="Ports" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/ports" diff --git a/config/emulators/tools.conf b/config/emulators/tools.conf index e0657bb1d..08b6c2113 100644 --- a/config/emulators/tools.conf +++ b/config/emulators/tools.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="tools" SYSTEM_FULLNAME="Tools" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/modules" From 4e478c1f31a80a97cbedd510f652efda96f095d6 Mon Sep 17 00:00:00 2001 From: xerootg Date: Wed, 18 Oct 2023 22:40:12 -0600 Subject: [PATCH 22/47] ayaneo audio, probably? --- .../patches/AMD64/009-ayaneo-audio.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch diff --git a/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch b/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch new file mode 100644 index 000000000..adbfa17ca --- /dev/null +++ b/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch @@ -0,0 +1,51 @@ +diff -rupN linux-6.4.16.orig/sound/pci/hda/patch_realtek.c linux-6.4.16/sound/pci/hda/patch_realtek.c +--- linux-6.4.16.orig/sound/pci/hda/patch_realtek.c 2023-10-18 20:03:49.089091278 -0600 ++++ linux-6.4.16/sound/pci/hda/patch_realtek.c 2023-10-18 21:48:41.387675323 -0600 +@@ -6521,6 +6521,20 @@ static void alc294_gx502_toggle_output(s + alc_write_coef_idx(codec, 0x10, 0x0a20); + } + ++static void alc269_fixup_headphone_volume(struct hda_codec *codec, ++ const struct hda_fixup *fix, int action) ++{ ++ /* Pin 0x21: Some devices share 0x14 for headphones and speakers. ++ * This will fix ensure these devices have volume controls. */ ++ if (!is_jack_detectable(codec, 0x21)) ++ return; ++ ++ if (action == HDA_FIXUP_ACT_PRE_PROBE) { ++ static const hda_nid_t conn1[] = { 0x02 }; ++ snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn1), conn1); ++ } ++} ++ + static void alc294_fixup_gx502_hp(struct hda_codec *codec, + const struct hda_fixup *fix, int action) + { +@@ -7013,6 +7027,7 @@ enum { + ALC269_FIXUP_DELL3_MIC_NO_PRESENCE, + ALC269_FIXUP_DELL4_MIC_NO_PRESENCE, + ALC269_FIXUP_DELL4_MIC_NO_PRESENCE_QUIET, ++ ALC269_FIXUP_HEADSET_AYANEO_DEVICES, + ALC269_FIXUP_HEADSET_MODE, + ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, + ALC269_FIXUP_ASPIRE_HEADSET_MIC, +@@ -8150,6 +8165,10 @@ static const struct hda_fixup alc269_fix + .chained = true, + .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE + }, ++ [ALC269_FIXUP_HEADSET_AYANEO_DEVICES] = { ++ .type = HDA_FIXUP_FUNC, ++ .v.func = alc269_fixup_headphone_volume, ++ }, + [ALC256_FIXUP_ASUS_AIO_GPIO2] = { + .type = HDA_FIXUP_FUNC, + /* Set up GPIO2 for the speaker amp */ +@@ -9929,6 +9948,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC), ++ SND_PCI_QUIRK(0x1f66, 0x0101, "AYANEO Devices", ALC269_FIXUP_HEADSET_AYANEO_DEVICES), + SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC), + SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED), + SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10), From a8fa695aa27625e22186b95fa753374f2d222f74 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 11:29:55 +0000 Subject: [PATCH 23/47] General updates and bug fixes. * Move soundfont-generaluser to a repository. * Update bluez and apply PS5 controller patch thanks to ashtophet101 from the @ChimeraOS discord. * Update documentation. --- .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../S922X/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../spleen-font/package.mk | 0 .../spleen-font/patches/001-add-block.patch | 0 .../terminus-font/package.mk | 0 packages/network/bluez/package.mk | 2 +- .../bluez-13-configure-Check-ell-path.patch | 34 -- .../bluez-50-fix-device_prove-failing.patch | 307 ++++++++++++++++++ .../sound/soundfont-generaluser/package.mk | 10 +- 14 files changed, 319 insertions(+), 48 deletions(-) rename packages/{sysutils => fonts}/spleen-font/package.mk (100%) rename packages/{sysutils => fonts}/spleen-font/patches/001-add-block.patch (100%) rename packages/{sysutils => fonts}/terminus-font/package.mk (100%) delete mode 100644 packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch create mode 100644 packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch 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 764f3d317..f1a90a751 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 5c52cd5ca..48af2ff60 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 a52629488..460648a36 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 f667d75fb..19aed4cba 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 @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 f667d75fb..19aed4cba 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 6e5817cad..583ad3a14 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 30c302249..68fcff948 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| diff --git a/packages/sysutils/spleen-font/package.mk b/packages/fonts/spleen-font/package.mk similarity index 100% rename from packages/sysutils/spleen-font/package.mk rename to packages/fonts/spleen-font/package.mk diff --git a/packages/sysutils/spleen-font/patches/001-add-block.patch b/packages/fonts/spleen-font/patches/001-add-block.patch similarity index 100% rename from packages/sysutils/spleen-font/patches/001-add-block.patch rename to packages/fonts/spleen-font/patches/001-add-block.patch diff --git a/packages/sysutils/terminus-font/package.mk b/packages/fonts/terminus-font/package.mk similarity index 100% rename from packages/sysutils/terminus-font/package.mk rename to packages/fonts/terminus-font/package.mk diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 9ace7412b..2c51d8873 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bluez" -PKG_VERSION="5.68" +PKG_VERSION="5.69" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch b/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch deleted file mode 100644 index bd9626e22..000000000 --- a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 1 Jul 2023 01:31:20 +0000 -Subject: [PATCH] configure: Check ell path - -Use of AC_CHECK_FILE prevents cross compilation. -Instead use test to support cross compiling. - -Signed-off-by: Rudi Heitbaum ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eff297960..bc7edfcd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then - AC_SUBST(ELL_LIBS) - fi - if (test "${enable_external_ell}" != "yes"); then -- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, -- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, -- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) -+ if (test ! -f ${srcdir}/ell/ell.h) && -+ (test ! -f ${srcdir}/../ell/ell/ell.h); then -+ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) -+ fi - fi - AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || - (test "${enable_btpclient}" != "yes" && --- -2.34.1 - diff --git a/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch b/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch new file mode 100644 index 000000000..8552d4125 --- /dev/null +++ b/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch @@ -0,0 +1,307 @@ +From 3a9c637010f8dc1ba3e8382abe01065761d4f5bb Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Tue, 10 Oct 2023 12:38:29 -0700 +Subject: [PATCH] input: Fix .device_probe failing if SDP record is not found + +Due to changes introduced by 67a26abe53bf +("profile: Add probe_on_discover flag") profiles may get probed when +their profile UUID are discovered, rather than resolved, which means +the SDP record may not be available. + +Fixes: https://github.com/bluez/bluez/issues/614 +--- + profiles/input/device.c | 182 +++++++++++++++++++--------------------- + 1 file changed, 84 insertions(+), 98 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index e2ac6ea603..4a50ea9921 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -60,7 +60,7 @@ struct input_device { + char *path; + bdaddr_t src; + bdaddr_t dst; +- uint32_t handle; ++ const sdp_record_t *rec; + GIOChannel *ctrl_io; + GIOChannel *intr_io; + guint ctrl_watch; +@@ -754,7 +754,8 @@ static void epox_endian_quirk(unsigned char *data, int size) + } + } + +-static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int create_hid_dev_name(const sdp_record_t *rec, ++ struct hidp_connadd_req *req) + { + char sdesc[sizeof(req->name) / 2]; + +@@ -776,7 +777,7 @@ static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) + + /* See HID profile specification v1.0, "7.11.6 HIDDescriptorList" for details + * on the attribute format. */ +-static int extract_hid_desc_data(sdp_record_t *rec, ++static int extract_hid_desc_data(const sdp_record_t *rec, + struct hidp_connadd_req *req) + { + sdp_data_t *d; +@@ -817,36 +818,40 @@ static int extract_hid_desc_data(sdp_record_t *rec, + return -EINVAL; + } + +-static int extract_hid_record(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int extract_hid_record(struct input_device *idev, ++ struct hidp_connadd_req *req) + { + sdp_data_t *pdlist; + uint8_t attr_val; + int err; + +- err = create_hid_dev_name(rec, req); ++ if (!idev->rec) ++ return -ENOENT; ++ ++ err = create_hid_dev_name(idev->rec, req); + if (err < 0) + DBG("No valid Service Name or Service Description found"); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_PARSER_VERSION); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_PARSER_VERSION); + req->parser = pdlist ? pdlist->val.uint16 : 0x0100; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_DEVICE_SUBCLASS); + req->subclass = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_COUNTRY_CODE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_COUNTRY_CODE); + req->country = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_VIRTUAL_CABLE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_VIRTUAL_CABLE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_VIRTUAL_CABLE_UNPLUG); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_BOOT_DEVICE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE); + +- err = extract_hid_desc_data(rec, req); ++ err = extract_hid_desc_data(idev->rec, req); + if (err < 0) + return err; + +@@ -1035,11 +1040,6 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition, + static int hidp_add_connection(struct input_device *idev) + { + struct hidp_connadd_req *req; +- sdp_record_t *rec; +- char src_addr[18], dst_addr[18]; +- char filename[PATH_MAX]; +- GKeyFile *key_file; +- char handle[11], *str; + GError *gerr = NULL; + int err; + +@@ -1049,33 +1049,7 @@ static int hidp_add_connection(struct input_device *idev) + req->flags = 0; + req->idle_to = idle_timeout; + +- ba2str(&idev->src, src_addr); +- ba2str(&idev->dst, dst_addr); +- +- snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr, +- dst_addr); +- sprintf(handle, "0x%8.8X", idev->handle); +- +- key_file = g_key_file_new(); +- if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) { +- error("Unable to load key file from %s: (%s)", filename, +- gerr->message); +- g_clear_error(&gerr); +- } +- str = g_key_file_get_string(key_file, "ServiceRecords", handle, NULL); +- g_key_file_free(key_file); +- +- if (!str) { +- error("Rejected connection from unknown device %s", dst_addr); +- err = -EPERM; +- goto cleanup; +- } +- +- rec = record_from_string(str); +- g_free(str); +- +- err = extract_hid_record(rec, req); +- sdp_record_free(rec); ++ err = extract_hid_record(idev, req); + if (err < 0) { + error("Could not parse HID SDP record: %s (%d)", strerror(-err), + -err); +@@ -1091,7 +1065,7 @@ static int hidp_add_connection(struct input_device *idev) + + /* Make sure the device is bonded if required */ + if (classic_bonded_only && !input_device_bonded(idev)) { +- error("Rejected connection from !bonded device %s", dst_addr); ++ error("Rejected connection from !bonded device %s", idev->path); + goto cleanup; + } + +@@ -1161,6 +1135,68 @@ static int connection_disconnect(struct input_device *idev, uint32_t flags) + return ioctl_disconnect(idev, flags); + } + ++static bool is_device_sdp_disable(const sdp_record_t *rec) ++{ ++ sdp_data_t *data; ++ ++ data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); ++ ++ return data && data->val.uint8; ++} ++ ++static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, ++ bool normally_connectable) ++{ ++ if (!reconnect_initiate && !normally_connectable) ++ return RECONNECT_NONE; ++ else if (!reconnect_initiate && normally_connectable) ++ return RECONNECT_HOST; ++ else if (reconnect_initiate && !normally_connectable) ++ return RECONNECT_DEVICE; ++ else /* (reconnect_initiate && normally_connectable) */ ++ return RECONNECT_ANY; ++} ++ ++static void extract_hid_props(struct input_device *idev, ++ const sdp_record_t *rec) ++{ ++ /* Extract HID connectability */ ++ bool reconnect_initiate, normally_connectable; ++ sdp_data_t *pdlist; ++ ++ /* HIDNormallyConnectable is optional and assumed FALSE if not ++ * present. ++ */ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); ++ reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; ++ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); ++ normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; ++ ++ /* Update local values */ ++ idev->reconnect_mode = ++ hid_reconnection_mode(reconnect_initiate, normally_connectable); ++} ++ ++static void input_device_update_rec(struct input_device *idev) ++{ ++ struct btd_profile *p = btd_service_get_profile(idev->service); ++ const sdp_record_t *rec; ++ ++ rec = btd_device_get_record(idev->device, p->remote_uuid); ++ if (!rec || idev->rec == rec) ++ return; ++ ++ idev->rec = rec; ++ idev->disable_sdp = is_device_sdp_disable(rec); ++ ++ /* Initialize device properties */ ++ extract_hid_props(idev, rec); ++ ++ if (idev->disable_sdp) ++ device_set_refresh_discovery(idev->device, false); ++} ++ + static int input_device_connected(struct input_device *idev) + { + int err; +@@ -1168,6 +1204,9 @@ static int input_device_connected(struct input_device *idev) + if (idev->intr_io == NULL || idev->ctrl_io == NULL) + return -ENOTCONN; + ++ /* Attempt to update SDP record if it had changed */ ++ input_device_update_rec(idev); ++ + err = hidp_add_connection(idev); + if (err < 0) + return err; +@@ -1411,74 +1450,21 @@ int input_device_disconnect(struct btd_service *service) + return 0; + } + +-static bool is_device_sdp_disable(const sdp_record_t *rec) +-{ +- sdp_data_t *data; +- +- data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); +- +- return data && data->val.uint8; +-} +- +-static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, +- bool normally_connectable) +-{ +- if (!reconnect_initiate && !normally_connectable) +- return RECONNECT_NONE; +- else if (!reconnect_initiate && normally_connectable) +- return RECONNECT_HOST; +- else if (reconnect_initiate && !normally_connectable) +- return RECONNECT_DEVICE; +- else /* (reconnect_initiate && normally_connectable) */ +- return RECONNECT_ANY; +-} +- +-static void extract_hid_props(struct input_device *idev, +- const sdp_record_t *rec) +-{ +- /* Extract HID connectability */ +- bool reconnect_initiate, normally_connectable; +- sdp_data_t *pdlist; +- +- /* HIDNormallyConnectable is optional and assumed FALSE +- * if not present. */ +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); +- reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; +- +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); +- normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; +- +- /* Update local values */ +- idev->reconnect_mode = +- hid_reconnection_mode(reconnect_initiate, normally_connectable); +-} +- + static struct input_device *input_device_new(struct btd_service *service) + { + struct btd_device *device = btd_service_get_device(service); +- struct btd_profile *p = btd_service_get_profile(service); + const char *path = device_get_path(device); +- const sdp_record_t *rec = btd_device_get_record(device, p->remote_uuid); + struct btd_adapter *adapter = device_get_adapter(device); + struct input_device *idev; + +- if (!rec) +- return NULL; +- + idev = g_new0(struct input_device, 1); + bacpy(&idev->src, btd_adapter_get_address(adapter)); + bacpy(&idev->dst, device_get_address(device)); + idev->service = btd_service_ref(service); + idev->device = btd_device_ref(device); + idev->path = g_strdup(path); +- idev->handle = rec->handle; +- idev->disable_sdp = is_device_sdp_disable(rec); +- +- /* Initialize device properties */ +- extract_hid_props(idev, rec); + +- if (idev->disable_sdp) +- device_set_refresh_discovery(device, false); ++ input_device_update_rec(idev); + + return idev; + } diff --git a/packages/tools/sound/soundfont-generaluser/package.mk b/packages/tools/sound/soundfont-generaluser/package.mk index 280a42cc1..1eb35e426 100644 --- a/packages/tools/sound/soundfont-generaluser/package.mk +++ b/packages/tools/sound/soundfont-generaluser/package.mk @@ -2,17 +2,15 @@ # Copyright (C) 2018-present 5schatten (https://github.com/5schatten) PKG_NAME="soundfont-generaluser" -PKG_VERSION="1.471" -PKG_SHA256="4203835164766f428c4926c097c9ea58dae431c7fb8f9dbe277b92d80da45ec2" +PKG_VERSION="8fe2798" PKG_LICENSE="OSS" PKG_SITE="http://www.schristiancollins.com/generaluser.php" -PKG_URL="https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${PKG_VERSION}.zip" -PKG_SOURCE_DIR="GeneralUser*" -PKG_DEPENDS_TARGET="" +PKG_URL="https://github.com/JustEnoughLinuxOS/generaluser-gs/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="GeneralUser GS is a GM and GS compatible SoundFont bank for composing, playing MIDI files, and retro gaming." PKG_TOOLCHAIN="manual" makeinstall_target() { mkdir -p ${INSTALL}/usr/share/soundfonts - cp GeneralUser*${PKG_VERSION}.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2 + cp ${PKG_BUILD}/GeneralUser*.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2 } From 800ad14a6401bc232382f00656a2cb57e950c8ad Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 12:00:55 +0000 Subject: [PATCH 24/47] PCSX Rearmed update * Revert PCSX Rearmed to version e34ef5a and pin. * Apply threaded rendering patch thanks to @christianhaitian. * Thanks to @asoderq (sydarn) and @christianhaitian for the pointers! --- config/blocklist | 1 + .../emulators/libretro/pcsx_rearmed-lr/package.mk | 2 +- ...sx_rearmed-patch-enable-threaded-rendering.patch | 13 +++++++++++++ ...sx_rearmed-patch-enable-threaded-rendering.patch | 13 +++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch create mode 100644 packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch diff --git a/config/blocklist b/config/blocklist index 017077917..7ec96c791 100644 --- a/config/blocklist +++ b/config/blocklist @@ -9,3 +9,4 @@ melonds-sa #Broken OpenGL renderer upstream mupen64plus-sa-ui-console #Causes segfaults nanoboyadvance-sa #SDL version removed after this commit freechaf-lr #build issue, revisit. +pcsx_rearmed-lr #pins version as new releases have artifacting issues. diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk index dd3b6a879..2846ad092 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="8cba0a221656eca4a3499be56b208019a3410420" +PKG_VERSION="e34ef5a" PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/pcsx_rearmed" diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch b/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch new file mode 100644 index 000000000..d69f1c880 --- /dev/null +++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch @@ -0,0 +1,13 @@ +diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h +index 3e1daf2..06702a1 100644 +--- a/frontend/libretro_core_options.h ++++ b/frontend/libretro_core_options.h +@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = { + { "async", NULL }, + { NULL, NULL}, + }, +- "disabled", ++ "sync", + }, + #endif + diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch b/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch new file mode 100644 index 000000000..d69f1c880 --- /dev/null +++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch @@ -0,0 +1,13 @@ +diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h +index 3e1daf2..06702a1 100644 +--- a/frontend/libretro_core_options.h ++++ b/frontend/libretro_core_options.h +@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = { + { "async", NULL }, + { NULL, NULL}, + }, +- "disabled", ++ "sync", + }, + #endif + From 78d394e5a501427921755a53820dc07fe8504423 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 12:10:18 +0000 Subject: [PATCH 25/47] Increase font size for some devices. --- packages/sysutils/busybox/scripts/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 7a904de31..021b656a4 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -428,10 +428,10 @@ set_consolefont() { progress "Set console font" if [ -e /dev/fb0 ]; then hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')" - if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ] + if [ "${hres}" -gt "0" ] && [ "${hres}" -le "480" ] then setfont -C /dev/console spleen-5x8.psfu - elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ] + elif [ "${hres}" -gt "480" ] && [ "${hres}" -le "720" ] then setfont -C /dev/console spleen-6x12.psfu elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ] From b779816292a818acb84286564298af423cc76880 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 13:30:30 +0000 Subject: [PATCH 26/47] Move audio quirks out of platform to support additional devices. --- .../Hardkernel ODROID-GO-Ultra}/050-audio_path | 0 .../quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path | 4 ++++ 2 files changed, 4 insertions(+) rename packages/hardware/quirks/{platforms/S922X => devices/Hardkernel ODROID-GO-Ultra}/050-audio_path (100%) mode change 100755 => 100644 diff --git a/packages/hardware/quirks/platforms/S922X/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-audio_path old mode 100755 new mode 100644 similarity index 100% rename from packages/hardware/quirks/platforms/S922X/050-audio_path rename to packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-audio_path diff --git a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path index cd4275893..a567f8cf5 100755 --- a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path +++ b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path @@ -8,3 +8,7 @@ DEVICE_PLAYBACK_PATH_HP="SPK" DEVICE_PLAYBACK_PATH="Playback Path" DEVICE_PIPEWIRE_PROFILE="pro-audio" EOF + +### Set sound properties +amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1' +amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on' From 34467cbe0841ae4f75c620e19bb36f4146b1ff23 Mon Sep 17 00:00:00 2001 From: xerootg Date: Thu, 19 Oct 2023 11:18:42 -0600 Subject: [PATCH 27/47] add ayaneo air plus --- packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch b/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch index adbfa17ca..4be188a68 100644 --- a/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch +++ b/packages/kernel/linux/patches/AMD64/009-ayaneo-audio.patch @@ -1,6 +1,6 @@ diff -rupN linux-6.4.16.orig/sound/pci/hda/patch_realtek.c linux-6.4.16/sound/pci/hda/patch_realtek.c --- linux-6.4.16.orig/sound/pci/hda/patch_realtek.c 2023-10-18 20:03:49.089091278 -0600 -+++ linux-6.4.16/sound/pci/hda/patch_realtek.c 2023-10-18 21:48:41.387675323 -0600 ++++ linux-6.4.16/sound/pci/hda/patch_realtek.c 2023-10-19 10:21:10.552016120 -0600 @@ -6521,6 +6521,20 @@ static void alc294_gx502_toggle_output(s alc_write_coef_idx(codec, 0x10, 0x0a20); } @@ -41,11 +41,12 @@ diff -rupN linux-6.4.16.orig/sound/pci/hda/patch_realtek.c linux-6.4.16/sound/pc [ALC256_FIXUP_ASUS_AIO_GPIO2] = { .type = HDA_FIXUP_FUNC, /* Set up GPIO2 for the speaker amp */ -@@ -9929,6 +9948,7 @@ static const struct snd_pci_quirk alc269 +@@ -9929,6 +9948,8 @@ static const struct snd_pci_quirk alc269 SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC), + SND_PCI_QUIRK(0x1f66, 0x0101, "AYANEO Devices", ALC269_FIXUP_HEADSET_AYANEO_DEVICES), ++ SND_PCI_QUIRK(0x1f66, 0x0103, "AYANEO Air Plus", ALC269_FIXUP_HEADSET_AYANEO_DEVICES), SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC), SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10), From ed768f3a4cdf7049485c36b8e85b1bcd01d63819 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Wed, 18 Oct 2023 10:13:50 -0400 Subject: [PATCH 28/47] Update sorting for system provided tools Enables grouping of system provided tools when sorting by manufacturer, hardware and release year. --- config/emulators/imageviewer.conf | 6 +++--- config/emulators/moonlight.conf | 6 +++--- config/emulators/mplayer.conf | 6 +++--- config/emulators/music.conf | 6 +++--- config/emulators/ports.conf | 6 +++--- config/emulators/tools.conf | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/emulators/imageviewer.conf b/config/emulators/imageviewer.conf index 5d6114013..1f540b69e 100644 --- a/config/emulators/imageviewer.conf +++ b/config/emulators/imageviewer.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="imageviewer" SYSTEM_FULLNAME="Screenshots" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/screenshots" SYSTEM_EXTENSION=".jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi" SYSTEM_COMMAND="/usr/bin/true" diff --git a/config/emulators/moonlight.conf b/config/emulators/moonlight.conf index aa63cfd4f..3449cf8b7 100644 --- a/config/emulators/moonlight.conf +++ b/config/emulators/moonlight.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="moonlight" SYSTEM_FULLNAME="Moonlight Game Streaming" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/moonlight/" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/bin/sh %ROM%" diff --git a/config/emulators/mplayer.conf b/config/emulators/mplayer.conf index b37b637a1..3e1a2d2b3 100644 --- a/config/emulators/mplayer.conf +++ b/config/emulators/mplayer.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="mplayer" SYSTEM_FULLNAME="Media Player" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="unknown" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/mplayer" SYSTEM_EXTENSION=".mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/music.conf b/config/emulators/music.conf index c5c28b557..149bc58a4 100644 --- a/config/emulators/music.conf +++ b/config/emulators/music.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="music" SYSTEM_FULLNAME="Music Player" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="unknown" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/gmu/playlists" SYSTEM_EXTENSION=".m3u .sh" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/ports.conf b/config/emulators/ports.conf index 0fc68ebf0..dcb1ccd15 100644 --- a/config/emulators/ports.conf +++ b/config/emulators/ports.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="ports" SYSTEM_FULLNAME="Ports" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="PC" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/ports" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" diff --git a/config/emulators/tools.conf b/config/emulators/tools.conf index 67a2c2316..e0657bb1d 100644 --- a/config/emulators/tools.conf +++ b/config/emulators/tools.conf @@ -1,8 +1,8 @@ SYSTEM_NAME="tools" SYSTEM_FULLNAME="Tools" -SYSTEM_MANUFACTURER="JELOS" -SYSTEM_RELEASE="2021" -SYSTEM_HARDWARE="system" +SYSTEM_MANUFACTURER=" System" +SYSTEM_RELEASE="System" +SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/modules" SYSTEM_EXTENSION=".sh" SYSTEM_COMMAND="/usr/bin/run %ROM%" From 30aba873af9b8fd1e4ab3a75b1350c94a538f28a Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Wed, 18 Oct 2023 10:18:58 -0400 Subject: [PATCH 29/47] update the grouping icon for ES --- config/emulators/imageviewer.conf | 2 +- config/emulators/moonlight.conf | 2 +- config/emulators/mplayer.conf | 2 +- config/emulators/music.conf | 2 +- config/emulators/ports.conf | 2 +- config/emulators/tools.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/emulators/imageviewer.conf b/config/emulators/imageviewer.conf index 1f540b69e..5c0dd9516 100644 --- a/config/emulators/imageviewer.conf +++ b/config/emulators/imageviewer.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="imageviewer" SYSTEM_FULLNAME="Screenshots" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/screenshots" diff --git a/config/emulators/moonlight.conf b/config/emulators/moonlight.conf index 3449cf8b7..07220d022 100644 --- a/config/emulators/moonlight.conf +++ b/config/emulators/moonlight.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="moonlight" SYSTEM_FULLNAME="Moonlight Game Streaming" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/moonlight/" diff --git a/config/emulators/mplayer.conf b/config/emulators/mplayer.conf index 3e1a2d2b3..0dd0637fc 100644 --- a/config/emulators/mplayer.conf +++ b/config/emulators/mplayer.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="mplayer" SYSTEM_FULLNAME="Media Player" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/mplayer" diff --git a/config/emulators/music.conf b/config/emulators/music.conf index 149bc58a4..7768e4fb2 100644 --- a/config/emulators/music.conf +++ b/config/emulators/music.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="music" SYSTEM_FULLNAME="Music Player" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/gmu/playlists" diff --git a/config/emulators/ports.conf b/config/emulators/ports.conf index dcb1ccd15..bf0cd51e4 100644 --- a/config/emulators/ports.conf +++ b/config/emulators/ports.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="ports" SYSTEM_FULLNAME="Ports" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/ports" diff --git a/config/emulators/tools.conf b/config/emulators/tools.conf index e0657bb1d..08b6c2113 100644 --- a/config/emulators/tools.conf +++ b/config/emulators/tools.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="tools" SYSTEM_FULLNAME="Tools" -SYSTEM_MANUFACTURER=" System" +SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/.config/modules" From 5442f9625d9feed734f08c9457aef41ed34c0333 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 11:29:55 +0000 Subject: [PATCH 30/47] General updates and bug fixes. * Move soundfont-generaluser to a repository. * Update bluez and apply PS5 controller patch thanks to ashtophet101 from the @ChimeraOS discord. * Update documentation. --- .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../S922X/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- .../spleen-font/package.mk | 0 .../spleen-font/patches/001-add-block.patch | 0 .../terminus-font/package.mk | 0 packages/network/bluez/package.mk | 2 +- .../bluez-13-configure-Check-ell-path.patch | 34 -- .../bluez-50-fix-device_prove-failing.patch | 307 ++++++++++++++++++ .../sound/soundfont-generaluser/package.mk | 10 +- 14 files changed, 319 insertions(+), 48 deletions(-) rename packages/{sysutils => fonts}/spleen-font/package.mk (100%) rename packages/{sysutils => fonts}/spleen-font/patches/001-add-block.patch (100%) rename packages/{sysutils => fonts}/terminus-font/package.mk (100%) delete mode 100644 packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch create mode 100644 packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch 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 764f3d317..f1a90a751 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 5c52cd5ca..48af2ff60 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 a52629488..460648a36 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 f667d75fb..19aed4cba 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 @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 f667d75fb..19aed4cba 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 6e5817cad..583ad3a14 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| 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 30c302249..68fcff948 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -44,7 +44,7 @@ This document describes all available systems emulators and cores available for |JELOS|Ports (ports)|2021|`ports`|.sh|| |JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| |JELOS|Tools (tools)|2021|`modules`|.sh|| -|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.sh .p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| +|Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| |Microsoft|MS-DOS (pc)|1981|`pc`|.com .bat .exe .dosz|**retroarch:** dosbox_pure
**retroarch:** dosbox_svn
| diff --git a/packages/sysutils/spleen-font/package.mk b/packages/fonts/spleen-font/package.mk similarity index 100% rename from packages/sysutils/spleen-font/package.mk rename to packages/fonts/spleen-font/package.mk diff --git a/packages/sysutils/spleen-font/patches/001-add-block.patch b/packages/fonts/spleen-font/patches/001-add-block.patch similarity index 100% rename from packages/sysutils/spleen-font/patches/001-add-block.patch rename to packages/fonts/spleen-font/patches/001-add-block.patch diff --git a/packages/sysutils/terminus-font/package.mk b/packages/fonts/terminus-font/package.mk similarity index 100% rename from packages/sysutils/terminus-font/package.mk rename to packages/fonts/terminus-font/package.mk diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 9ace7412b..2c51d8873 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bluez" -PKG_VERSION="5.68" +PKG_VERSION="5.69" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch b/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch deleted file mode 100644 index bd9626e22..000000000 --- a/packages/network/bluez/patches/bluez-13-configure-Check-ell-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 1 Jul 2023 01:31:20 +0000 -Subject: [PATCH] configure: Check ell path - -Use of AC_CHECK_FILE prevents cross compilation. -Instead use test to support cross compiling. - -Signed-off-by: Rudi Heitbaum ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eff297960..bc7edfcd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then - AC_SUBST(ELL_LIBS) - fi - if (test "${enable_external_ell}" != "yes"); then -- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, -- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, -- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) -+ if (test ! -f ${srcdir}/ell/ell.h) && -+ (test ! -f ${srcdir}/../ell/ell/ell.h); then -+ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) -+ fi - fi - AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || - (test "${enable_btpclient}" != "yes" && --- -2.34.1 - diff --git a/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch b/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch new file mode 100644 index 000000000..8552d4125 --- /dev/null +++ b/packages/network/bluez/patches/bluez-50-fix-device_prove-failing.patch @@ -0,0 +1,307 @@ +From 3a9c637010f8dc1ba3e8382abe01065761d4f5bb Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Tue, 10 Oct 2023 12:38:29 -0700 +Subject: [PATCH] input: Fix .device_probe failing if SDP record is not found + +Due to changes introduced by 67a26abe53bf +("profile: Add probe_on_discover flag") profiles may get probed when +their profile UUID are discovered, rather than resolved, which means +the SDP record may not be available. + +Fixes: https://github.com/bluez/bluez/issues/614 +--- + profiles/input/device.c | 182 +++++++++++++++++++--------------------- + 1 file changed, 84 insertions(+), 98 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index e2ac6ea603..4a50ea9921 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -60,7 +60,7 @@ struct input_device { + char *path; + bdaddr_t src; + bdaddr_t dst; +- uint32_t handle; ++ const sdp_record_t *rec; + GIOChannel *ctrl_io; + GIOChannel *intr_io; + guint ctrl_watch; +@@ -754,7 +754,8 @@ static void epox_endian_quirk(unsigned char *data, int size) + } + } + +-static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int create_hid_dev_name(const sdp_record_t *rec, ++ struct hidp_connadd_req *req) + { + char sdesc[sizeof(req->name) / 2]; + +@@ -776,7 +777,7 @@ static int create_hid_dev_name(sdp_record_t *rec, struct hidp_connadd_req *req) + + /* See HID profile specification v1.0, "7.11.6 HIDDescriptorList" for details + * on the attribute format. */ +-static int extract_hid_desc_data(sdp_record_t *rec, ++static int extract_hid_desc_data(const sdp_record_t *rec, + struct hidp_connadd_req *req) + { + sdp_data_t *d; +@@ -817,36 +818,40 @@ static int extract_hid_desc_data(sdp_record_t *rec, + return -EINVAL; + } + +-static int extract_hid_record(sdp_record_t *rec, struct hidp_connadd_req *req) ++static int extract_hid_record(struct input_device *idev, ++ struct hidp_connadd_req *req) + { + sdp_data_t *pdlist; + uint8_t attr_val; + int err; + +- err = create_hid_dev_name(rec, req); ++ if (!idev->rec) ++ return -ENOENT; ++ ++ err = create_hid_dev_name(idev->rec, req); + if (err < 0) + DBG("No valid Service Name or Service Description found"); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_PARSER_VERSION); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_PARSER_VERSION); + req->parser = pdlist ? pdlist->val.uint16 : 0x0100; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_DEVICE_SUBCLASS); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_DEVICE_SUBCLASS); + req->subclass = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_COUNTRY_CODE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_COUNTRY_CODE); + req->country = pdlist ? pdlist->val.uint8 : 0; + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_VIRTUAL_CABLE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_VIRTUAL_CABLE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_VIRTUAL_CABLE_UNPLUG); + +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_BOOT_DEVICE); ++ pdlist = sdp_data_get(idev->rec, SDP_ATTR_HID_BOOT_DEVICE); + attr_val = pdlist ? pdlist->val.uint8 : 0; + if (attr_val) + req->flags |= (1 << HIDP_BOOT_PROTOCOL_MODE); + +- err = extract_hid_desc_data(rec, req); ++ err = extract_hid_desc_data(idev->rec, req); + if (err < 0) + return err; + +@@ -1035,11 +1040,6 @@ static gboolean encrypt_notify(GIOChannel *io, GIOCondition condition, + static int hidp_add_connection(struct input_device *idev) + { + struct hidp_connadd_req *req; +- sdp_record_t *rec; +- char src_addr[18], dst_addr[18]; +- char filename[PATH_MAX]; +- GKeyFile *key_file; +- char handle[11], *str; + GError *gerr = NULL; + int err; + +@@ -1049,33 +1049,7 @@ static int hidp_add_connection(struct input_device *idev) + req->flags = 0; + req->idle_to = idle_timeout; + +- ba2str(&idev->src, src_addr); +- ba2str(&idev->dst, dst_addr); +- +- snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr, +- dst_addr); +- sprintf(handle, "0x%8.8X", idev->handle); +- +- key_file = g_key_file_new(); +- if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) { +- error("Unable to load key file from %s: (%s)", filename, +- gerr->message); +- g_clear_error(&gerr); +- } +- str = g_key_file_get_string(key_file, "ServiceRecords", handle, NULL); +- g_key_file_free(key_file); +- +- if (!str) { +- error("Rejected connection from unknown device %s", dst_addr); +- err = -EPERM; +- goto cleanup; +- } +- +- rec = record_from_string(str); +- g_free(str); +- +- err = extract_hid_record(rec, req); +- sdp_record_free(rec); ++ err = extract_hid_record(idev, req); + if (err < 0) { + error("Could not parse HID SDP record: %s (%d)", strerror(-err), + -err); +@@ -1091,7 +1065,7 @@ static int hidp_add_connection(struct input_device *idev) + + /* Make sure the device is bonded if required */ + if (classic_bonded_only && !input_device_bonded(idev)) { +- error("Rejected connection from !bonded device %s", dst_addr); ++ error("Rejected connection from !bonded device %s", idev->path); + goto cleanup; + } + +@@ -1161,6 +1135,68 @@ static int connection_disconnect(struct input_device *idev, uint32_t flags) + return ioctl_disconnect(idev, flags); + } + ++static bool is_device_sdp_disable(const sdp_record_t *rec) ++{ ++ sdp_data_t *data; ++ ++ data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); ++ ++ return data && data->val.uint8; ++} ++ ++static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, ++ bool normally_connectable) ++{ ++ if (!reconnect_initiate && !normally_connectable) ++ return RECONNECT_NONE; ++ else if (!reconnect_initiate && normally_connectable) ++ return RECONNECT_HOST; ++ else if (reconnect_initiate && !normally_connectable) ++ return RECONNECT_DEVICE; ++ else /* (reconnect_initiate && normally_connectable) */ ++ return RECONNECT_ANY; ++} ++ ++static void extract_hid_props(struct input_device *idev, ++ const sdp_record_t *rec) ++{ ++ /* Extract HID connectability */ ++ bool reconnect_initiate, normally_connectable; ++ sdp_data_t *pdlist; ++ ++ /* HIDNormallyConnectable is optional and assumed FALSE if not ++ * present. ++ */ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); ++ reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; ++ ++ pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); ++ normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; ++ ++ /* Update local values */ ++ idev->reconnect_mode = ++ hid_reconnection_mode(reconnect_initiate, normally_connectable); ++} ++ ++static void input_device_update_rec(struct input_device *idev) ++{ ++ struct btd_profile *p = btd_service_get_profile(idev->service); ++ const sdp_record_t *rec; ++ ++ rec = btd_device_get_record(idev->device, p->remote_uuid); ++ if (!rec || idev->rec == rec) ++ return; ++ ++ idev->rec = rec; ++ idev->disable_sdp = is_device_sdp_disable(rec); ++ ++ /* Initialize device properties */ ++ extract_hid_props(idev, rec); ++ ++ if (idev->disable_sdp) ++ device_set_refresh_discovery(idev->device, false); ++} ++ + static int input_device_connected(struct input_device *idev) + { + int err; +@@ -1168,6 +1204,9 @@ static int input_device_connected(struct input_device *idev) + if (idev->intr_io == NULL || idev->ctrl_io == NULL) + return -ENOTCONN; + ++ /* Attempt to update SDP record if it had changed */ ++ input_device_update_rec(idev); ++ + err = hidp_add_connection(idev); + if (err < 0) + return err; +@@ -1411,74 +1450,21 @@ int input_device_disconnect(struct btd_service *service) + return 0; + } + +-static bool is_device_sdp_disable(const sdp_record_t *rec) +-{ +- sdp_data_t *data; +- +- data = sdp_data_get(rec, SDP_ATTR_HID_SDP_DISABLE); +- +- return data && data->val.uint8; +-} +- +-static enum reconnect_mode_t hid_reconnection_mode(bool reconnect_initiate, +- bool normally_connectable) +-{ +- if (!reconnect_initiate && !normally_connectable) +- return RECONNECT_NONE; +- else if (!reconnect_initiate && normally_connectable) +- return RECONNECT_HOST; +- else if (reconnect_initiate && !normally_connectable) +- return RECONNECT_DEVICE; +- else /* (reconnect_initiate && normally_connectable) */ +- return RECONNECT_ANY; +-} +- +-static void extract_hid_props(struct input_device *idev, +- const sdp_record_t *rec) +-{ +- /* Extract HID connectability */ +- bool reconnect_initiate, normally_connectable; +- sdp_data_t *pdlist; +- +- /* HIDNormallyConnectable is optional and assumed FALSE +- * if not present. */ +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_RECONNECT_INITIATE); +- reconnect_initiate = pdlist ? pdlist->val.uint8 : TRUE; +- +- pdlist = sdp_data_get(rec, SDP_ATTR_HID_NORMALLY_CONNECTABLE); +- normally_connectable = pdlist ? pdlist->val.uint8 : FALSE; +- +- /* Update local values */ +- idev->reconnect_mode = +- hid_reconnection_mode(reconnect_initiate, normally_connectable); +-} +- + static struct input_device *input_device_new(struct btd_service *service) + { + struct btd_device *device = btd_service_get_device(service); +- struct btd_profile *p = btd_service_get_profile(service); + const char *path = device_get_path(device); +- const sdp_record_t *rec = btd_device_get_record(device, p->remote_uuid); + struct btd_adapter *adapter = device_get_adapter(device); + struct input_device *idev; + +- if (!rec) +- return NULL; +- + idev = g_new0(struct input_device, 1); + bacpy(&idev->src, btd_adapter_get_address(adapter)); + bacpy(&idev->dst, device_get_address(device)); + idev->service = btd_service_ref(service); + idev->device = btd_device_ref(device); + idev->path = g_strdup(path); +- idev->handle = rec->handle; +- idev->disable_sdp = is_device_sdp_disable(rec); +- +- /* Initialize device properties */ +- extract_hid_props(idev, rec); + +- if (idev->disable_sdp) +- device_set_refresh_discovery(device, false); ++ input_device_update_rec(idev); + + return idev; + } diff --git a/packages/tools/sound/soundfont-generaluser/package.mk b/packages/tools/sound/soundfont-generaluser/package.mk index 280a42cc1..1eb35e426 100644 --- a/packages/tools/sound/soundfont-generaluser/package.mk +++ b/packages/tools/sound/soundfont-generaluser/package.mk @@ -2,17 +2,15 @@ # Copyright (C) 2018-present 5schatten (https://github.com/5schatten) PKG_NAME="soundfont-generaluser" -PKG_VERSION="1.471" -PKG_SHA256="4203835164766f428c4926c097c9ea58dae431c7fb8f9dbe277b92d80da45ec2" +PKG_VERSION="8fe2798" PKG_LICENSE="OSS" PKG_SITE="http://www.schristiancollins.com/generaluser.php" -PKG_URL="https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${PKG_VERSION}.zip" -PKG_SOURCE_DIR="GeneralUser*" -PKG_DEPENDS_TARGET="" +PKG_URL="https://github.com/JustEnoughLinuxOS/generaluser-gs/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="GeneralUser GS is a GM and GS compatible SoundFont bank for composing, playing MIDI files, and retro gaming." PKG_TOOLCHAIN="manual" makeinstall_target() { mkdir -p ${INSTALL}/usr/share/soundfonts - cp GeneralUser*${PKG_VERSION}.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2 + cp ${PKG_BUILD}/GeneralUser*.sf2 ${INSTALL}/usr/share/soundfonts/GeneralUser.sf2 } From 3a2d4186722e67de7a90ed03ecfe6b6261b60ba4 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 12:00:55 +0000 Subject: [PATCH 31/47] PCSX Rearmed update * Revert PCSX Rearmed to version e34ef5a and pin. * Apply threaded rendering patch thanks to @christianhaitian. * Thanks to @asoderq (sydarn) and @christianhaitian for the pointers! --- config/blocklist | 1 + .../emulators/libretro/pcsx_rearmed-lr/package.mk | 2 +- ...sx_rearmed-patch-enable-threaded-rendering.patch | 13 +++++++++++++ ...sx_rearmed-patch-enable-threaded-rendering.patch | 13 +++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch create mode 100644 packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch diff --git a/config/blocklist b/config/blocklist index 017077917..7ec96c791 100644 --- a/config/blocklist +++ b/config/blocklist @@ -9,3 +9,4 @@ melonds-sa #Broken OpenGL renderer upstream mupen64plus-sa-ui-console #Causes segfaults nanoboyadvance-sa #SDL version removed after this commit freechaf-lr #build issue, revisit. +pcsx_rearmed-lr #pins version as new releases have artifacting issues. diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/package.mk b/packages/emulators/libretro/pcsx_rearmed-lr/package.mk index dd3b6a879..2846ad092 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="8cba0a221656eca4a3499be56b208019a3410420" +PKG_VERSION="e34ef5a" PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/pcsx_rearmed" diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch b/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch new file mode 100644 index 000000000..d69f1c880 --- /dev/null +++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/aarch64/pcsx_rearmed-patch-enable-threaded-rendering.patch @@ -0,0 +1,13 @@ +diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h +index 3e1daf2..06702a1 100644 +--- a/frontend/libretro_core_options.h ++++ b/frontend/libretro_core_options.h +@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = { + { "async", NULL }, + { NULL, NULL}, + }, +- "disabled", ++ "sync", + }, + #endif + diff --git a/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch b/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch new file mode 100644 index 000000000..d69f1c880 --- /dev/null +++ b/packages/emulators/libretro/pcsx_rearmed-lr/patches/arm/pcsx_rearmed-patch-enable-threaded-rendering.patch @@ -0,0 +1,13 @@ +diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h +index 3e1daf2..06702a1 100644 +--- a/frontend/libretro_core_options.h ++++ b/frontend/libretro_core_options.h +@@ -848,7 +848,7 @@ struct retro_core_option_definition option_defs_us[] = { + { "async", NULL }, + { NULL, NULL}, + }, +- "disabled", ++ "sync", + }, + #endif + From 39db93cd8f27895db267d1b3a05408b4fed006a5 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 12:10:18 +0000 Subject: [PATCH 32/47] Increase font size for some devices. --- packages/sysutils/busybox/scripts/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 7a904de31..021b656a4 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -428,10 +428,10 @@ set_consolefont() { progress "Set console font" if [ -e /dev/fb0 ]; then hres="$(fbset 2>/dev/null | awk '/geometry/ { print $2 }')" - if [ "${hres}" -gt "0" ] && [ "${hres}" -le "640" ] + if [ "${hres}" -gt "0" ] && [ "${hres}" -le "480" ] then setfont -C /dev/console spleen-5x8.psfu - elif [ "${hres}" -ge "641" ] && [ "${hres}" -le "720" ] + elif [ "${hres}" -gt "480" ] && [ "${hres}" -le "720" ] then setfont -C /dev/console spleen-6x12.psfu elif [ "${hres}" -gt "720" ] && [ "${hres}" -lt "1080" ] From e0f05ad1f22b85a6447b6df3ffab832659a0d249 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Thu, 19 Oct 2023 13:30:30 +0000 Subject: [PATCH 33/47] Move audio quirks out of platform to support additional devices. --- .../Hardkernel ODROID-GO-Ultra}/050-audio_path | 0 .../quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path | 4 ++++ 2 files changed, 4 insertions(+) rename packages/hardware/quirks/{platforms/S922X => devices/Hardkernel ODROID-GO-Ultra}/050-audio_path (100%) mode change 100755 => 100644 diff --git a/packages/hardware/quirks/platforms/S922X/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-audio_path old mode 100755 new mode 100644 similarity index 100% rename from packages/hardware/quirks/platforms/S922X/050-audio_path rename to packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-audio_path diff --git a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path index cd4275893..a567f8cf5 100755 --- a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path +++ b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-audio_path @@ -8,3 +8,7 @@ DEVICE_PLAYBACK_PATH_HP="SPK" DEVICE_PLAYBACK_PATH="Playback Path" DEVICE_PIPEWIRE_PROFILE="pro-audio" EOF + +### Set sound properties +amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1' +amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on' From 2c4b797aa9987dc95e5206c2ef0cad44fe6dc5a1 Mon Sep 17 00:00:00 2001 From: anthonycaccese Date: Thu, 19 Oct 2023 20:44:59 -0400 Subject: [PATCH 34/47] Systems Update Updated release years for neocd, openbor Updated manufacture for vectrex Removed SC-3000 (we weren't generating a folder for it anyway and its games can be played under SG-1000 so thinking its easier to consolidate in this case) --- config/emulators/neocd.conf | 2 +- config/emulators/openbor.conf | 2 +- config/emulators/sc-3000.conf | 10 ---------- config/emulators/vectrex.conf | 2 +- packages/jelos/config/system/configs/system.cfg | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 config/emulators/sc-3000.conf diff --git a/config/emulators/neocd.conf b/config/emulators/neocd.conf index e0d31e567..bddf919ab 100644 --- a/config/emulators/neocd.conf +++ b/config/emulators/neocd.conf @@ -1,7 +1,7 @@ SYSTEM_NAME="neocd" SYSTEM_FULLNAME="Neo Geo CD" SYSTEM_MANUFACTURER="SNK" -SYSTEM_RELEASE="1990" +SYSTEM_RELEASE="1994" SYSTEM_HARDWARE="console" SYSTEM_PATH="/storage/roms/neocd" SYSTEM_EXTENSION=".cue .iso .chd" diff --git a/config/emulators/openbor.conf b/config/emulators/openbor.conf index da8f5d1f7..7b44bf741 100644 --- a/config/emulators/openbor.conf +++ b/config/emulators/openbor.conf @@ -1,7 +1,7 @@ SYSTEM_NAME="openbor" SYSTEM_FULLNAME="OpenBOR" SYSTEM_MANUFACTURER="Various" -SYSTEM_RELEASE="2008" +SYSTEM_RELEASE="2003" SYSTEM_HARDWARE="game engine" SYSTEM_PATH="/storage/roms/openbor" SYSTEM_EXTENSION=".pak" diff --git a/config/emulators/sc-3000.conf b/config/emulators/sc-3000.conf deleted file mode 100644 index f2f87f2a4..000000000 --- a/config/emulators/sc-3000.conf +++ /dev/null @@ -1,10 +0,0 @@ -SYSTEM_NAME="sc-3000" -SYSTEM_FULLNAME="SC-3000" -SYSTEM_MANUFACTURER="Sega" -SYSTEM_RELEASE="1983" -SYSTEM_HARDWARE="computer" -SYSTEM_PATH="/storage/roms/sc-3000" -SYSTEM_EXTENSION=".bin .sg .zip .7z" -SYSTEM_COMMAND="/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers=\"%CONTROLLERSCONFIG%\"" -SYSTEM_PLATFORM="sc-3000" -SYSTEM_THEME="sc-3000" diff --git a/config/emulators/vectrex.conf b/config/emulators/vectrex.conf index 6e32c11f8..5e6afa834 100644 --- a/config/emulators/vectrex.conf +++ b/config/emulators/vectrex.conf @@ -1,6 +1,6 @@ SYSTEM_NAME="vectrex" SYSTEM_FULLNAME="Vectrex" -SYSTEM_MANUFACTURER="Milton Bradley" +SYSTEM_MANUFACTURER="Smith Engineering" SYSTEM_RELEASE="1982" SYSTEM_HARDWARE="console" SYSTEM_PATH="/storage/roms/vectrex" diff --git a/packages/jelos/config/system/configs/system.cfg b/packages/jelos/config/system/configs/system.cfg index 2fa85b59b..d4866c174 100644 --- a/packages/jelos/config/system/configs/system.cfg +++ b/packages/jelos/config/system/configs/system.cfg @@ -149,7 +149,6 @@ rotate.root.password=1 samba.enabled=0 saturn.integerscale=0 saturn.ratio=4/3 -sc-3000.integerscale=0 sega32x.integerscale=0 sega32x.ratio=4/3 segacd.integerscale=0 From 28084b24afc80bc7ef1fb4ba12f02c1045b178ea Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:06:05 +0100 Subject: [PATCH 35/47] busybox: enable cut for init, used in update.sh scripting --- packages/sysutils/busybox/config/busybox-init.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index ea14df663..204cf9e62 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -231,7 +231,7 @@ CONFIG_CRC32=y CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set -# CONFIG_CUT is not set +CONFIG_CUT=y # CONFIG_FEATURE_CUT_REGEX is not set # CONFIG_DATE is not set # CONFIG_FEATURE_DATE_ISOFMT is not set From 4c03b4899933d8c8e1e4b75885164aae05753dec Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:08:14 +0100 Subject: [PATCH 36/47] Amlogic: remove canupdate.sh as there are no ARM images provided by JELOS --- projects/Amlogic/bootloader/canupdate.sh | 9 --------- projects/Amlogic/packages/u-boot/package.mk | 2 -- 2 files changed, 11 deletions(-) delete mode 100644 projects/Amlogic/bootloader/canupdate.sh diff --git a/projects/Amlogic/bootloader/canupdate.sh b/projects/Amlogic/bootloader/canupdate.sh deleted file mode 100644 index b9b32ca91..000000000 --- a/projects/Amlogic/bootloader/canupdate.sh +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) - -# Allow upgrades between arm and aarch64 -if [ "$1" = "@PROJECT@.arm" -o "$1" = "@PROJECT@.aarch64" ]; then - exit 0 -else - exit 1 -fi diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk index 04bc7379a..aa01ad9e0 100644 --- a/projects/Amlogic/packages/u-boot/package.mk +++ b/projects/Amlogic/packages/u-boot/package.mk @@ -43,8 +43,6 @@ makeinstall_target() { # Always install the update script find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader - # Always install the canupdate script - if find_file_path bootloader/canupdate.sh; then cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader sed -e "s/@PROJECT@/${DEVICE:-${PROJECT}}/g" \ -i ${INSTALL}/usr/share/bootloader/canupdate.sh From c15d049f1fd8fd98f5923d88a1400df15942e52c Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:43:43 +0100 Subject: [PATCH 37/47] Amlogic: enable shell via UART --- projects/Amlogic/devices/S922X/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Amlogic/devices/S922X/options b/projects/Amlogic/devices/S922X/options index a4d4d2d28..705127fd4 100644 --- a/projects/Amlogic/devices/S922X/options +++ b/projects/Amlogic/devices/S922X/options @@ -69,7 +69,7 @@ WINDOWMANAGER="weston11" # kernel serial console - EXTRA_CMDLINE="rootwait quiet console=ttyAML0,115200 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0" + EXTRA_CMDLINE="rootwait quiet systemd.debug_shell=ttyAML0 console=ttyAML0,115200n8 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0" # additional packages to install # ADDITIONAL_PACKAGES="" From 59b2f5f75010672a24bac89aa0ffc8f4d8ad28e2 Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:45:36 +0100 Subject: [PATCH 38/47] Amlogic: fix HDMI output There is 2 issues here first weston would attempt to start on the wrong device and secondly the kernel defaults to 4k so set it to 1080p. --- projects/Amlogic/devices/S922X/linux/linux.aarch64.conf | 3 ++- projects/Amlogic/devices/S922X/options | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf index 5553d81d6..e07235c4b 100644 --- a/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf +++ b/projects/Amlogic/devices/S922X/linux/linux.aarch64.conf @@ -4328,7 +4328,7 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y # CONFIG_DRM_CIRRUS_QEMU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set -CONFIG_DRM_SIMPLEDRM=y +# CONFIG_DRM_SIMPLEDRM is not set # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9163 is not set # CONFIG_TINYDRM_ILI9225 is not set @@ -4403,6 +4403,7 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set +# CONFIG_FB_SIMPLE is not set # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set # end of Frame buffer Devices diff --git a/projects/Amlogic/devices/S922X/options b/projects/Amlogic/devices/S922X/options index 705127fd4..f5e68f288 100644 --- a/projects/Amlogic/devices/S922X/options +++ b/projects/Amlogic/devices/S922X/options @@ -69,7 +69,7 @@ WINDOWMANAGER="weston11" # kernel serial console - EXTRA_CMDLINE="rootwait quiet systemd.debug_shell=ttyAML0 console=ttyAML0,115200n8 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0" + EXTRA_CMDLINE="rootwait quiet systemd.debug_shell=ttyAML0 console=ttyAML0,115200n8 console=tty0 no_console_suspend net.ifnames=0 consoleblank=0 video=HDMI-A-1:1920x1080@60" # additional packages to install # ADDITIONAL_PACKAGES="" From 03bafd858bc3aeb82d436203166311304c475924 Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:11:06 +0100 Subject: [PATCH 39/47] Amlogic: refactor project to use SUBDEVICES --- .../quirks/platforms/S922X/001-device_config | 2 +- projects/Amlogic/bootloader/boot.ini | 13 ++ .../Amlogic/bootloader/extlinux/extlinux.conf | 4 + projects/Amlogic/bootloader/install | 60 --------- projects/Amlogic/bootloader/mkimage | 123 +++++++----------- projects/Amlogic/bootloader/release | 33 +---- projects/Amlogic/bootloader/update.sh | 88 +++++++------ projects/Amlogic/devices/S922X/options | 16 +-- projects/Amlogic/options | 0 .../patches/S922X/004-dts-to-compile.patch | 74 +++++++++++ .../packages/u-boot-Odroid_GOU/package.mk | 32 +++++ .../patches}/001-multiboot.patch | 0 .../patches}/002-no-suspend.patch | 0 .../patches}/003-fixup-lcd.patch | 0 .../patches}/004-fix-build.patch | 0 projects/Amlogic/packages/u-boot/package.mk | 70 +++++----- 16 files changed, 262 insertions(+), 253 deletions(-) create mode 100644 projects/Amlogic/bootloader/boot.ini create mode 100644 projects/Amlogic/bootloader/extlinux/extlinux.conf delete mode 100644 projects/Amlogic/bootloader/install mode change 100644 => 100755 projects/Amlogic/bootloader/update.sh mode change 100755 => 100644 projects/Amlogic/options create mode 100644 projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch create mode 100644 projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk rename projects/Amlogic/packages/{u-boot/patches/S922X => u-boot-Odroid_GOU/patches}/001-multiboot.patch (100%) rename projects/Amlogic/packages/{u-boot/patches/S922X => u-boot-Odroid_GOU/patches}/002-no-suspend.patch (100%) rename projects/Amlogic/packages/{u-boot/patches/S922X => u-boot-Odroid_GOU/patches}/003-fixup-lcd.patch (100%) rename projects/Amlogic/packages/{u-boot/patches/S922X => u-boot-Odroid_GOU/patches}/004-fix-build.patch (100%) diff --git a/packages/hardware/quirks/platforms/S922X/001-device_config b/packages/hardware/quirks/platforms/S922X/001-device_config index 4d89923ca..76673e15d 100755 --- a/packages/hardware/quirks/platforms/S922X/001-device_config +++ b/packages/hardware/quirks/platforms/S922X/001-device_config @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: Apache-2.0 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) diff --git a/projects/Amlogic/bootloader/boot.ini b/projects/Amlogic/bootloader/boot.ini new file mode 100644 index 000000000..b6d038b1b --- /dev/null +++ b/projects/Amlogic/bootloader/boot.ini @@ -0,0 +1,13 @@ +JELOS-UBOOT-CONFIG + +setenv dtb_loadaddr "0x10000000" +setenv loadaddr "0x1B00000" + +setenv bootargs "boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@" + +load mmc ${devno}:1 ${loadaddr} KERNEL +load mmc ${devno}:1 ${dtb_loadaddr} ${fdtfile} + +fdt addr ${dtb_loadaddr} + +booti ${loadaddr} - ${dtb_loadaddr} diff --git a/projects/Amlogic/bootloader/extlinux/extlinux.conf b/projects/Amlogic/bootloader/extlinux/extlinux.conf new file mode 100644 index 000000000..bfa8f7e10 --- /dev/null +++ b/projects/Amlogic/bootloader/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +LABEL JELOS + LINUX /KERNEL + FDTDIR / + APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ @EXTRA_CMDLINE@ diff --git a/projects/Amlogic/bootloader/install b/projects/Amlogic/bootloader/install deleted file mode 100644 index 21694c7fa..000000000 --- a/projects/Amlogic/bootloader/install +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) - -PKG_UBOOT="$(get_build_dir u-boot)" -source ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options -FIP_DIR="${ROOT}/build.${DISTRO}-${DEVICE}.aarch64/amlogic-boot-fip-*" - -case "${DEVICE}" in - S922X) - cp -rf ${PKG_UBOOT}/sd_fuse/u-boot.bin ${INSTALL}/usr/share/bootloader/ - ;; - *) - echo "uboot: encrypting u-boot.bin with fip..." - cp -av build/u-boot.bin ${FIP_DIR}/ - cd ${FIP_DIR} - ./build-fip.sh ${BOOT_FIP} u-boot.bin ${INSTALL}/usr/share/bootloader/ - ;; -esac - -if [ "${BIOS_BIN}" == true ] -then - echo "uboot: copy bios bin to ${INSTALL}/usr/share/bootloader..." - cp -rav ${PKG_BUILD}/tools/odroid_resource/* ${INSTALL}/usr/share/bootloader -fi - -if [ "${BOOT_INI}" == true ] -then - echo "boot: create boot.ini..." - cat >${INSTALL}/usr/share/bootloader/boot.ini < "${INSTALL}/usr/share/bootloader/extlinux/extlinux.conf" -LABEL ${DISTRO} - LINUX /${KERNEL_NAME} - ${FDTMODE} - APPEND boot=UUID=@BOOT_UUID@ disk=UUID=@DISK_UUID@ ${EXTRA_CMDLINE} -EOF -fi diff --git a/projects/Amlogic/bootloader/mkimage b/projects/Amlogic/bootloader/mkimage index e622da2d9..8ea7264cf 100644 --- a/projects/Amlogic/bootloader/mkimage +++ b/projects/Amlogic/bootloader/mkimage @@ -1,80 +1,53 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) -source ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options +mkimage_uboot() { +if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${SUBDEVICE}_u-boot" ]; then + echo "image: writing u-boot to $(basename ${DISK})..." + dd if="${RELEASE_DIR}/3rdparty/bootloader/${SUBDEVICE}_u-boot" of="${DISK}" bs=512 seek=1 conv=sync,noerror,notrunc >"${SAVE_ERROR}" 2>&1 || show_error +fi +} -#Write u-boot.bin to image -case "${PKG_SOC}" in - s922x) - if [ -f "${RELEASE_DIR}/3rdparty/bootloader/u-boot.bin" ]; then - echo "image: burn uboot.bin to image... (${PKG_SOC})" - dd if="${RELEASE_DIR}/3rdparty/bootloader/u-boot.bin" of="${DISK}" bs=512 seek=1 conv=sync,noerror,notrunc >"${SAVE_ERROR}" 2>&1 || show_error - fi +mkimage_bootini() { + echo "image: copying boot.ini..." + cp -p "${RELEASE_DIR}/3rdparty/bootloader/boot.ini" "${LE_TMP}/boot.ini" + sed -e "s/@BOOT_UUID@/${UUID_SYSTEM}/" \ + -e "s/@DISK_UUID@/${UUID_STORAGE}/" \ + -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \ + -i "${LE_TMP}/boot.ini" + mcopy "${LE_TMP}/boot.ini" :: +} + +mkimage_extlinux() { + echo "image: copying exlinux.conf..." + mkdir -p "${LE_TMP}/extlinux" + cp -p "${RELEASE_DIR}/3rdparty/bootloader/extlinux/extlinux.conf" "${LE_TMP}/extlinux/extlinux.conf" + sed -e "s/@BOOT_UUID@/${UUID_SYSTEM}/" \ + -e "s/@DISK_UUID@/${UUID_STORAGE}/" \ + -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \ + -i "${LE_TMP}/extlinux/extlinux.conf" + mcopy "${LE_TMP}/extlinux" :: +} + +mkimage_dtb() { + echo "image: copying device trees..." + for dtb in ${DTB[@]}; do + mcopy ${RELEASE_DIR}/3rdparty/bootloader/${dtb}.dtb :: + done +} + +mkimage_gou_extras() { + echo "image: copying ODROIDBIOS.BIN and res..." + mcopy ${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN :: + mcopy ${RELEASE_DIR}/3rdparty/bootloader/res :: +} + +case "${SUBDEVICE}" in + Odroid_GOU) + DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3") + mkimage_dtb + mkimage_bootini + mkimage_gou_extras + mkimage_uboot + ;; esac - -#Copy bios bin -if [ "${BIOS_BIN}" == true ]; then - if [ -f "${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN" ]; then - echo "image: copy bios bin image..." - cp "${RELEASE_DIR}/3rdparty/bootloader/ODROIDBIOS.BIN" "${LE_TMP}/ODROIDBIOS.BIN" - mcopy -so "${LE_TMP}/ODROIDBIOS.BIN" :: - fi - if [ -d "${RELEASE_DIR}/3rdparty/bootloader/res" ]; then - cp -r "${RELEASE_DIR}/3rdparty/bootloader/res" "${LE_TMP}/res" - mcopy -so "${LE_TMP}/res" :: - fi -fi - -#Create boot.ini -if [ "${BOOT_INI}" == true ] -then - echo "image: create boot.ini..." - cat >"${LE_TMP}/boot.ini" < "${LE_TMP}/extlinux/extlinux.conf" -LABEL ${DISTRO} - LINUX /${KERNEL_NAME} - ${FDTMODE} - APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} ${EXTRA_CMDLINE} -EOF - -mcopy -so "${LE_TMP}/extlinux" :: - -fi diff --git a/projects/Amlogic/bootloader/release b/projects/Amlogic/bootloader/release index e5b1c2e60..f834ed8a3 100644 --- a/projects/Amlogic/bootloader/release +++ b/projects/Amlogic/bootloader/release @@ -2,35 +2,4 @@ # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech) mkdir -p ${RELEASE_DIR}/3rdparty/bootloader -if [ -n "${UBOOT_CONFIG}" ]; then - BOOTLOADER_DIR=$(get_build_dir ${BOOTLOADER}) - KERNEL_DIR=$(get_build_dir linux) - - case "${PKG_SOC}" in - s922x) - if [ -f ${INSTALL}/usr/share/bootloader/u-boot.bin ]; then - cp -a ${INSTALL}/usr/share/bootloader/u-boot.bin ${RELEASE_DIR}/3rdparty/bootloader - fi - if [ -f ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ]; then - cp -a ${INSTALL}/usr/share/bootloader/ODROIDBIOS.BIN ${RELEASE_DIR}/3rdparty/bootloader - fi - if [ -d ${INSTALL}/usr/share/bootloader/res ]; then - cp -ra ${INSTALL}/usr/share/bootloader/res ${RELEASE_DIR}/3rdparty/bootloader - fi - ;; - esac -fi - -LINUX_DTS_DIR=$(get_build_dir linux)/arch/${TARGET_KERNEL_ARCH}/boot/dts/ -for dtb in $(find ${LINUX_DTS_DIR} -name "*.dtb") ; do - if [ -f $dtb ]; then - cp -a $dtb ${RELEASE_DIR}/3rdparty/bootloader - fi -done - -if [ -n "${SD_DTB}" ]; then - SD_UBOOT_DTB=$(get_build_dir u-boot)/arch/arm/dts/${SD_DTB}.dtb - if [ -f $SD_UBOOT_DTB ]; then - cp -a $SD_UBOOT_DTB ${RELEASE_DIR}/3rdparty/bootloader - fi -fi + cp -a ${INSTALL}/usr/share/bootloader/* ${RELEASE_DIR}/3rdparty/bootloader diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh old mode 100644 new mode 100755 index a14bc4cf3..8982d03fc --- a/projects/Amlogic/bootloader/update.sh +++ b/projects/Amlogic/bootloader/update.sh @@ -20,7 +20,6 @@ fi # mount $BOOT_ROOT r/w mount -o remount,rw $BOOT_ROOT - for arg in $(cat /proc/cmdline); do case $arg in boot=*) @@ -54,56 +53,63 @@ for arg in $(cat /proc/cmdline); do esac done -CONFS=$SYSTEM_ROOT/usr/share/bootloader/extlinux/*.conf +DT_ID=$($SYSTEM_ROOT/usr/bin/dtname) -for all_conf in $CONFS; do - conf="$(basename ${all_conf})" - echo "Updating ${conf}..." - cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/${conf} $BOOT_ROOT/extlinux/${conf} &>/dev/null - sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \ - -e "s/@DISK_UUID@/$DISK_UUID/" \ - -i $BOOT_ROOT/extlinux/${conf} +if [ -n "$DT_ID" ]; then + case $DT_ID in + *odroid_go_ultra*|*rgb10-max-3*) + SUBDEVICE="Odroid_GOU" + ;; + esac +fi + +for all_dtb in $BOOT_ROOT/*.dtb; do + dtb=$(basename $all_dtb) + if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then + echo "Updating $dtb..." + cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT + fi done -if [ -f $SYSTEM_ROOT/usr/share/bootloader/boot.ini ]; then - echo "Updating boot.ini..." - cp -p $SYSTEM_ROOT/usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini &>/dev/null +if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then + if [ -f $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf ]; then + echo "Updating extlinux.conf..." + cp -p $SYSTEM_ROOT/usr/share/bootloader/extlinux/extlinux.conf $BOOT_ROOT/extlinux sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \ - -e "s/@DISK_UUID@/$DISK_UUID/" \ - -i $BOOT_ROOT/boot.ini + -e "s/@DISK_UUID@/$DISK_UUID/" \ + -i $BOOT_ROOT/extlinux/extlinux.conf + fi fi -if [ -f $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN ]; then - echo "Updating odroidbios.bin..." - cp -p $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN $BOOT_ROOT/ODROIDBIOS.BIN &>/dev/null +if [ -f $BOOT_ROOT/boot.ini ]; then + if [ -f /usr/share/bootloader/boot.ini ]; then + echo "Updating boot.ini" + cp -p /usr/share/bootloader/boot.ini $BOOT_ROOT/boot.ini + sed -e "s/@BOOT_UUID@/$BOOT_UUID/" \ + -e "s/@DISK_UUID@/$DISK_UUID/" \ + -i $BOOT_ROOT/boot.ini + fi fi -if [ -d $SYSTEM_ROOT/usr/share/bootloader/res ]; then - echo "Updating res..." - cp -rp $SYSTEM_ROOT/usr/share/bootloader/res $BOOT_ROOT/ &>/dev/null +if [ -f $SYSTEM_ROOT/usr/share/bootloader/${SUBDEVICE}_u-boot ]; then + echo "Updating u-boot on: $BOOT_DISK..." + dd if=$SYSTEM_ROOT/usr/share/bootloader/${SUBDEVICE}_u-boot of=$BOOT_DISK conv=fsync,notrunc bs=512 seek=1 &>/dev/null fi -# update device tree -for all_dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb; do - dtb="$(basename ${all_dtb})" - echo -n "Updating $dtb... " - cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT &>/dev/null - echo "done" -done +if [ -f $BOOT_ROOT/ODROIDBIOS.BIN ]; then + if [ -f $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN ]; then + echo "Updating ODROIDBIOS.BIN..." + cp -p $SYSTEM_ROOT/usr/share/bootloader/ODROIDBIOS.BIN $BOOT_ROOT + fi +fi +if [ -d $BOOT_ROOT/res ]; then + if [ -d $SYSTEM_ROOT/usr/share/bootloader/res ]; then + echo "Updating res..." + cp -rp $SYSTEM_ROOT/usr/share/bootloader/res $BOOT_ROOT + fi +fi + +mount -o ro,remount $BOOT_ROOT echo "UPDATE" > /storage/.boot.hint - -# update bootloader - -if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot.bin ]; then - echo -n "Updating uboot.bin... " - dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot.bin of=$BOOT_DISK conv=fsync,notrunc bs=512 seek=1 &>/dev/null - echo "done" -fi - -# mount $BOOT_ROOT r/o - sync - mount -o remount,ro $BOOT_ROOT &>/dev/null - -sync diff --git a/projects/Amlogic/devices/S922X/options b/projects/Amlogic/devices/S922X/options index f5e68f288..f6473e878 100644 --- a/projects/Amlogic/devices/S922X/options +++ b/projects/Amlogic/devices/S922X/options @@ -30,21 +30,12 @@ KERNEL_TARGET="Image" BOOTLOADER="u-boot" PARTITION_TABLE="msdos" - DEVICE_DTB=("meson-g12b-odroid-go-ultra" "meson-g12b-powkiddy-rgb10-max-3") - UBOOT_DTB="${DEVICE_DTB[0]}" - UBOOT_CONFIG="odroidgou_defconfig" - PKG_SOC="s922x" - BOOT_FIP="odroid-go-ultra" - BOOT_INI=true - BIOS_BIN=true - EXT_LINUX_CONF=false # Additional kernel make parameters (for example to specify the u-boot loadaddress) - KERNEL_MAKE_EXTRACMD+="" - KERNEL_MAKE_EXTRACMD=" $(for DTB in "${DEVICE_DTB[@]}"; do echo -n "amlogic/${DTB}.dtb "; done)" + KERNEL_MAKE_EXTRACMD+="dtbs" # Define the CPU - HW_CPU="Amlogic S922x" + HW_CPU="Amlogic S922X" # Mali GPU family MALI_FAMILY="g52" @@ -158,3 +149,6 @@ # htop tool (yes / no) HTOP_TOOL="yes" + + # JELOS Subdevices + SUBDEVICES="Odroid_GOU" diff --git a/projects/Amlogic/options b/projects/Amlogic/options old mode 100755 new mode 100644 diff --git a/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch b/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch new file mode 100644 index 000000000..36fb35ea8 --- /dev/null +++ b/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch @@ -0,0 +1,74 @@ +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -1,71 +1,3 @@ + # SPDX-License-Identifier: GPL-2.0 +-dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-powkiddy-rgb10-max-3.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p200.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-p201.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-gt1-ultimate.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb +-dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb diff --git a/projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk b/projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk new file mode 100644 index 000000000..fa499ebe7 --- /dev/null +++ b/projects/Amlogic/packages/u-boot-Odroid_GOU/package.mk @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2022-present Fewtarius + +PKG_NAME="u-boot-Odroid_GOU" +PKG_VERSION="9235942906216dc529c1e96f67dd2364a94d0738" +PKG_LICENSE="GPL" +PKG_SITE="https://www.denx.de/wiki/U-Boot" +PKG_URL="https://github.com/hardkernel/u-boot/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain gcc-linaro-aarch64-elf:host gcc-linaro-arm-eabi:host" +PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." +PKG_TOOLCHAIN="manual" + +configure_package() { + PKG_UBOOT_CONFIG="odroidgou_defconfig" +} + +make_target() { + [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0 + export PATH=${TOOLCHAIN}/lib/gcc-linaro-aarch64-elf/bin/:${TOOLCHAIN}/lib/gcc-linaro-arm-eabi/bin/:${PATH} + DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper + DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make ${PKG_UBOOT_CONFIG} + DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make HOSTCC="${HOST_CC}" HOSTSTRIP="true" + + # repack odroidbios.bin for jelos + ${TOOLCHAIN}/sbin/fsck.cramfs --extract=jelos tools/odroid_resource/ODROIDBIOS.BIN + sed -e "s/ODROIDGOU/JELOS/" -i jelos/boot.ini + ${TOOLCHAIN}/sbin/mkfs.cramfs -N little jelos tools/odroid_resource/ODROIDBIOS.BIN +} + +makeinstall_target() { + : # nothing +} diff --git a/projects/Amlogic/packages/u-boot/patches/S922X/001-multiboot.patch b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/001-multiboot.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/S922X/001-multiboot.patch rename to projects/Amlogic/packages/u-boot-Odroid_GOU/patches/001-multiboot.patch diff --git a/projects/Amlogic/packages/u-boot/patches/S922X/002-no-suspend.patch b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/002-no-suspend.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/S922X/002-no-suspend.patch rename to projects/Amlogic/packages/u-boot-Odroid_GOU/patches/002-no-suspend.patch diff --git a/projects/Amlogic/packages/u-boot/patches/S922X/003-fixup-lcd.patch b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/003-fixup-lcd.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/S922X/003-fixup-lcd.patch rename to projects/Amlogic/packages/u-boot-Odroid_GOU/patches/003-fixup-lcd.patch diff --git a/projects/Amlogic/packages/u-boot/patches/S922X/004-fix-build.patch b/projects/Amlogic/packages/u-boot-Odroid_GOU/patches/004-fix-build.patch similarity index 100% rename from projects/Amlogic/packages/u-boot/patches/S922X/004-fix-build.patch rename to projects/Amlogic/packages/u-boot-Odroid_GOU/patches/004-fix-build.patch diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk index aa01ad9e0..19d7c73db 100644 --- a/projects/Amlogic/packages/u-boot/package.mk +++ b/projects/Amlogic/packages/u-boot/package.mk @@ -1,50 +1,54 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2022-present Fewtarius PKG_NAME="u-boot" -PKG_VERSION="9235942906216dc529c1e96f67dd2364a94d0738" +PKG_VERSION="1.0" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" -PKG_URL="https://github.com/hardkernel/u-boot/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain gcc-linaro-aarch64-elf:host gcc-linaro-arm-eabi:host" +PKG_URL="" +PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." PKG_TOOLCHAIN="manual" -PKG_PATCH_DIRS+="${DEVICE}*" + +PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" + +for PKG_SUBDEVICE in $SUBDEVICES; do + PKG_DEPENDS_TARGET+=" u-boot-${PKG_SUBDEVICE}" + PKG_NEED_UNPACK+=" $(get_pkg_directory u-boot-${PKG_SUBDEVICE})" +done make_target() { - . ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options - if [ -z "${UBOOT_CONFIG}" ]; then - echo "UBOOT_CONFIG must be set to build an image" - else - [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0 - echo "Building for MBR (${UBOOT_DTB})..." - export PATH=${TOOLCHAIN}/lib/gcc-linaro-aarch64-elf/bin/:${TOOLCHAIN}/lib/gcc-linaro-arm-eabi/bin/:${PATH} - DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper - DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make ${UBOOT_CONFIG} - DEBUG=${PKG_DEBUG} CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make HOSTCC="${HOST_CC}" HOSTSTRIP="true" - - # repack odroidbios.bin for jelos - ${TOOLCHAIN}/sbin/fsck.cramfs --extract=jelos tools/odroid_resource/ODROIDBIOS.BIN - sed -e "s/ODROIDGOU/JELOS/" -i jelos/boot.ini - ${TOOLCHAIN}/sbin/mkfs.cramfs -N little jelos tools/odroid_resource/ODROIDBIOS.BIN - fi + : # nothing } makeinstall_target() { - mkdir -p ${INSTALL}/usr/share/bootloader - mkdir -p ${INSTALL}/usr/share/bootloader/fip - # Only install u-boot.img et al when building a board specific image - if [ -n "${UBOOT_CONFIG}" ]; then - find_file_path bootloader/install && . ${FOUND_PATH} - fi + mkdir -p $INSTALL/usr/share/bootloader - # Always install the update script - find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader + # Always install the update script + find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader - cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader - sed -e "s/@PROJECT@/${DEVICE:-${PROJECT}}/g" \ - -i ${INSTALL}/usr/share/bootloader/canupdate.sh + if find_file_path bootloader/boot.ini; then + cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader + sed -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \ + -i "${INSTALL}/usr/share/bootloader/boot.ini" + fi + + if find_dir_path bootloader/extlinux; then + cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader + sed -e "s/@EXTRA_CMDLINE@/${EXTRA_CMDLINE}/" \ + -i "${INSTALL}/usr/share/bootloader/extlinux/extlinux.conf" + fi + + for PKG_SUBDEVICE in $SUBDEVICES; do + unset PKG_UBOOTBIN + if [ "${PKG_SUBDEVICE}" = "Odroid_GOU" ]; then + PKG_UBOOTBIN=$(get_build_dir u-boot-${PKG_SUBDEVICE})/sd_fuse/u-boot.bin + cp -av $(get_build_dir u-boot-${PKG_SUBDEVICE})/tools/odroid_resource/* ${INSTALL}/usr/share/bootloader + else + PKG_UBOOTBIN=$(get_build_dir u-boot-${PKG_SUBDEVICE})/u-boot.bin fi + if [ ${PKG_UBOOTBIN} ]; then + cp -av ${PKG_UBOOTBIN} $INSTALL/usr/share/bootloader/${PKG_SUBDEVICE}_u-boot + fi + done } From 7cc9d5b04071abab78c53340ea879cc98c4ad66b Mon Sep 17 00:00:00 2001 From: adamg Date: Sun, 15 Oct 2023 20:33:21 +0100 Subject: [PATCH 40/47] Amlogic: add support for ODROID-N2/N2+ --- .../apps/portmaster/sources/PortMaster.sh | 2 +- .../Hardkernel ODROID-N2/001-device_config | 12 +++++++ .../Hardkernel ODROID-N2/020-no_blinking_led | 1 + .../Hardkernel ODROID-N2/050-audio_path | 25 ++++++++++++++ .../quirks/devices/Hardkernel ODROID-N2Plus | 1 + projects/Amlogic/bootloader/mkimage | 6 ++++ projects/Amlogic/bootloader/update.sh | 3 ++ projects/Amlogic/devices/S922X/options | 2 +- .../patches/S922X/004-dts-to-compile.patch | 6 ++-- .../packages/u-boot-Odroid_N2/package.mk | 34 +++++++++++++++++++ .../patches/001-remove-amlogic-prefix.patch | 12 +++++++ .../patches/002-instant-boot.patch | 10 ++++++ 12 files changed, 109 insertions(+), 5 deletions(-) create mode 100755 packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config create mode 100755 packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led create mode 100755 packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path create mode 120000 packages/hardware/quirks/devices/Hardkernel ODROID-N2Plus create mode 100644 projects/Amlogic/packages/u-boot-Odroid_N2/package.mk create mode 100644 projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch create mode 100644 projects/Amlogic/packages/u-boot-Odroid_N2/patches/002-instant-boot.patch diff --git a/packages/apps/portmaster/sources/PortMaster.sh b/packages/apps/portmaster/sources/PortMaster.sh index dc87784be..b67cd1083 100644 --- a/packages/apps/portmaster/sources/PortMaster.sh +++ b/packages/apps/portmaster/sources/PortMaster.sh @@ -51,7 +51,7 @@ case ${device} in width="60" opengl='(?<=Title_F=\").*?(?=\")' ;; - "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3") + "Hardkernel ODROID-GO-Ultra"|"Powkiddy RGB10 MAX 3"|"Hardkernel ODROID-N2*") param_device="s922x" height="20" width="60" diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config new file mode 100755 index 000000000..c36784006 --- /dev/null +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config @@ -0,0 +1,12 @@ +#!/bin/sh +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) + +cat </storage/.config/profile.d/001-deviceconfig +# Device Features +DEVICE_VOLUMECTL="true" +DEVICE_VOLUME="100" +DEVICE_POWER_LED="false" +DEVICE_BRIGHTNESS="hardware" +DEVICE_TEMP_SENSOR=("/sys/devices/virtual/thermal/thermal_zone0/temp" "/sys/devices/virtual/thermal/thermal_zone3/temp" "/sys/devices/virtual/thermal/thermal_zone2/temp") +EOF diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led new file mode 100755 index 000000000..056bc304f --- /dev/null +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/020-no_blinking_led @@ -0,0 +1 @@ +echo none > /sys/class/leds/n2\:blue/trigger diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path new file mode 100755 index 000000000..ca708ae9a --- /dev/null +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path @@ -0,0 +1,25 @@ +#!/bin/sh +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius) + +cat </storage/.config/profile.d/002-audio_path +DEVICE_PLAYBACK_PATH_SPK="SPK" +DEVICE_PLAYBACK_PATH_HP="HP" +DEVICE_PLAYBACK_PATH="Playback Mux" +DEVICE_PIPEWIRE_PROFILE="pro-audio" +EOF + +amixer -c 0 -q sset 'FRDDR_A SINK 1 SEL' 'OUT 1' +amixer -c 0 -q sset 'FRDDR_A SRC 1 EN' 'on' +amixer -c 0 -q sset 'TDMOUT_B SRC SEL' 'IN 0' +amixer -c 0 -q sset 'TOHDMITX I2S SRC' 'I2S B' +amixer -c 0 -q sset 'TOHDMITX' 'on' +amixer -c 0 -q sset 'FRDDR_B SINK 1 SEL' 'OUT 2' +amixer -c 0 -q sset 'FRDDR_B SRC 1 EN' 'on' +amixer -c 0 -q sset 'TDMOUT_C SRC SEL' 'IN 1' +amixer -c 0 -q sset 'TOACODEC SRC' 'I2S C' +amixer -c 0 -q sset 'TOACODEC OUT EN' 'on' +amixer -c 0 -q sset 'TOACODEC Lane Select' '0' +amixer -c 0 -q sset 'ACODEC' '255' +amixer -c 0 -q sset 'FRDDR_C SINK 1 SEL' 'OUT 3' +amixer -c 0 -q sset 'FRDDR_C SRC 1 EN' 'on' diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2Plus b/packages/hardware/quirks/devices/Hardkernel ODROID-N2Plus new file mode 120000 index 000000000..0a1ef3988 --- /dev/null +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2Plus @@ -0,0 +1 @@ +Hardkernel ODROID-N2 \ No newline at end of file diff --git a/projects/Amlogic/bootloader/mkimage b/projects/Amlogic/bootloader/mkimage index 8ea7264cf..0eb0f0dba 100644 --- a/projects/Amlogic/bootloader/mkimage +++ b/projects/Amlogic/bootloader/mkimage @@ -50,4 +50,10 @@ case "${SUBDEVICE}" in mkimage_gou_extras mkimage_uboot ;; + Odroid_N2) + DTB=("meson-g12b-odroid-n2" "meson-g12b-odroid-n2-plus") + mkimage_dtb + mkimage_extlinux + mkimage_uboot + ;; esac diff --git a/projects/Amlogic/bootloader/update.sh b/projects/Amlogic/bootloader/update.sh index 8982d03fc..59d60da38 100755 --- a/projects/Amlogic/bootloader/update.sh +++ b/projects/Amlogic/bootloader/update.sh @@ -60,6 +60,9 @@ if [ -n "$DT_ID" ]; then *odroid_go_ultra*|*rgb10-max-3*) SUBDEVICE="Odroid_GOU" ;; + *odroid-n2*) + SUBDEVICE="Odroid_N2" + ;; esac fi diff --git a/projects/Amlogic/devices/S922X/options b/projects/Amlogic/devices/S922X/options index f6473e878..bb46761fb 100644 --- a/projects/Amlogic/devices/S922X/options +++ b/projects/Amlogic/devices/S922X/options @@ -151,4 +151,4 @@ HTOP_TOOL="yes" # JELOS Subdevices - SUBDEVICES="Odroid_GOU" + SUBDEVICES="Odroid_GOU Odroid_N2" diff --git a/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch b/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch index 36fb35ea8..da7e3fd98 100644 --- a/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch +++ b/projects/Amlogic/packages/linux/patches/S922X/004-dts-to-compile.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -1,71 +1,3 @@ +@@ -1,71 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb @@ -16,8 +16,8 @@ -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb --dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb --dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-powkiddy-rgb10-max-3.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb -dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb diff --git a/projects/Amlogic/packages/u-boot-Odroid_N2/package.mk b/projects/Amlogic/packages/u-boot-Odroid_N2/package.mk new file mode 100644 index 000000000..8fcfc4ef4 --- /dev/null +++ b/projects/Amlogic/packages/u-boot-Odroid_N2/package.mk @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2022-present Fewtarius + +PKG_NAME="u-boot-Odroid_N2" +PKG_VERSION="v2023.10" +PKG_LICENSE="GPL" +PKG_SITE="https://www.denx.de/wiki/U-Boot" +PKG_URL="https://github.com/u-boot/u-boot/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain amlogic-boot-fip" +PKG_DEPENDS_UNPACK="amlogic-boot-fip" +PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." +PKG_TOOLCHAIN="manual" + +configure_package() { + PKG_UBOOT_CONFIG="odroid-n2_defconfig" + PKG_UBOOT_FIP="odroid-n2" + FIP_DIR="$(get_build_dir amlogic-boot-fip)" +} + +make_target() { + [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0 + setup_pkg_config_host + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make mrproper + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" ${PKG_UBOOT_CONFIG} + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make HOSTCC="${HOST_CC}" HOSTCFLAGS="-I${TOOLCHAIN}/include" HOSTLDFLAGS="${HOST_LDFLAGS}" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" + + cp -av ${PKG_BUILD}/u-boot.bin ${FIP_DIR}/${PKG_UBOOT_FIP} + cd ${FIP_DIR} + ./build-fip.sh ${PKG_UBOOT_FIP} ${FIP_DIR}/${PKG_UBOOT_FIP}/u-boot.bin ${PKG_BUILD} +} + +makeinstall_target() { + : # nothing +} diff --git a/projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch b/projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch new file mode 100644 index 000000000..5d5f96173 --- /dev/null +++ b/projects/Amlogic/packages/u-boot-Odroid_N2/patches/001-remove-amlogic-prefix.patch @@ -0,0 +1,12 @@ +--- a/board/amlogic/odroid-n2/odroid-n2.c ++++ b/board/amlogic/odroid-n2/odroid-n2.c +@@ -63,7 +63,7 @@ static void odroid_set_fdtfile(char *soc, char *variant) + { + char s[128]; + +- snprintf(s, sizeof(s), "amlogic/meson-%s-odroid-%s.dtb", soc, variant); ++ snprintf(s, sizeof(s), "meson-%s-odroid-%s.dtb", soc, variant); + env_set("fdtfile", s); + } + +-- diff --git a/projects/Amlogic/packages/u-boot-Odroid_N2/patches/002-instant-boot.patch b/projects/Amlogic/packages/u-boot-Odroid_N2/patches/002-instant-boot.patch new file mode 100644 index 000000000..487702c09 --- /dev/null +++ b/projects/Amlogic/packages/u-boot-Odroid_N2/patches/002-instant-boot.patch @@ -0,0 +1,10 @@ +--- a/configs/odroid-n2_defconfig ++++ b/configs/odroid-n2_defconfig +@@ -18,6 +18,7 @@ + CONFIG_DEBUG_UART=y + CONFIG_REMAKE_ELF=y + CONFIG_OF_BOARD_SETUP=y ++CONFIG_BOOTDELAY=0 + # CONFIG_DISPLAY_CPUINFO is not set + CONFIG_MISC_INIT_R=y + CONFIG_SYS_MAXARGS=32 From f34736898fe84d7389e9e93487b7d47b3ae62331 Mon Sep 17 00:00:00 2001 From: adamg Date: Wed, 18 Oct 2023 19:14:48 +0100 Subject: [PATCH 41/47] Amlogic/u-boot: watch for changes to EXTRA_CMDLINE and clean package if anything changes --- projects/Amlogic/packages/u-boot/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk index 19d7c73db..9b3ec71d6 100644 --- a/projects/Amlogic/packages/u-boot/package.mk +++ b/projects/Amlogic/packages/u-boot/package.mk @@ -14,7 +14,7 @@ PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" for PKG_SUBDEVICE in $SUBDEVICES; do PKG_DEPENDS_TARGET+=" u-boot-${PKG_SUBDEVICE}" - PKG_NEED_UNPACK+=" $(get_pkg_directory u-boot-${PKG_SUBDEVICE})" + PKG_NEED_UNPACK+=" $(get_pkg_directory u-boot-${PKG_SUBDEVICE}) ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" done make_target() { From aaca15ff11ab1a7706740ceb887da75e2f213007 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 21 Oct 2023 01:57:10 +0000 Subject: [PATCH 42/47] Add ODROID N2/N2+ as supported devices. --- .github/workflows/build-main.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index 24df0e878..bfe777f90 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -104,7 +104,8 @@ jobs: |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566/)| |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3399/)| |**Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices**|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/AMD64/)| - |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)| + |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}-Odroid_GOU.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)| + |**Hardkernel ODROID N2/N2+**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}-Odroid_N2.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/S922X/)| |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3588/)| |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.img.gz)|[documentation](/documentation/PER_DEVICE_DOCUMENTATION/RK3566-X55/)| @@ -122,7 +123,7 @@ jobs: |**Anbernic RG353P/M/V/VS, RG503, Powkiddy RK2023, RGB30**|[JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566.aarch64-${{ steps.version.outputs.version }}.tar)| |**Anbernic RG552**|[JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3399.aarch64-${{ steps.version.outputs.version }}.tar)| |****Atari VCS, AOKZOE, Ayaneo, Ayn, GPD, and other x86_64 devices****|[JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-AMD64.x86_64-${{ steps.version.outputs.version }}.tar)| - |**Hardkernel ODROID Go Ultra, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)| + |**Hardkernel ODROID Go Ultra, N2/N2+, Powkiddy RGB10 Max 3 Pro**|[JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-S922X.aarch64-${{ steps.version.outputs.version }}.tar)| |**Orange Pi 5, and Indiedroid Nova**|[JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3588.aarch64-${{ steps.version.outputs.version }}.tar)| |**Powkiddy x55**|[JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar](https://github.com/JustEnoughLinuxOS/distribution/releases/download/${{ steps.version.outputs.version }}/JELOS-RK3566-X55.aarch64-${{ steps.version.outputs.version }}.tar)| From 8b35b75da679b32018f9d3d0224f0db0b19ccc12 Mon Sep 17 00:00:00 2001 From: adamg Date: Sat, 21 Oct 2023 12:44:46 +0100 Subject: [PATCH 43/47] quirks: fix headphone output for Hardkernel ODROID-N2 --- .../hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path index ca708ae9a..0253d7bbf 100755 --- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/050-audio_path @@ -17,7 +17,7 @@ amixer -c 0 -q sset 'TOHDMITX' 'on' amixer -c 0 -q sset 'FRDDR_B SINK 1 SEL' 'OUT 2' amixer -c 0 -q sset 'FRDDR_B SRC 1 EN' 'on' amixer -c 0 -q sset 'TDMOUT_C SRC SEL' 'IN 1' -amixer -c 0 -q sset 'TOACODEC SRC' 'I2S C' +amixer -c 0 -q sset 'TOACODEC SRC' 'I2S B' amixer -c 0 -q sset 'TOACODEC OUT EN' 'on' amixer -c 0 -q sset 'TOACODEC Lane Select' '0' amixer -c 0 -q sset 'ACODEC' '255' From 403d8684c2dce8d82f4362d25e600d4a929b55fd Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 21 Oct 2023 12:25:30 +0000 Subject: [PATCH 44/47] Update documentation to reflect system sorting changes. Update Yuzu. --- .../AMD64/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../RK3326/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../RK3399/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../RK3566-X55/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../RK3566/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../RK3588/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ .../S922X/SUPPORTED_EMULATORS_AND_CORES.md | 12 ++++++------ packages/emulators/standalone/yuzu-sa/package.mk | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) 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 f1a90a751..e4f27c246 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
**retroarch:** mame
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 48af2ff60..73e7b66e3 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3326/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 460648a36..6077af1fc 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
**retroarch:** mame
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 19aed4cba..a4fef4059 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 @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 19aed4cba..a4fef4059 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3566/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 583ad3a14..a223bc70a 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
**retroarch:** mame
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (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 68fcff948..cdc198015 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/S922X/SUPPORTED_EMULATORS_AND_CORES.md @@ -6,6 +6,12 @@ This document describes all available systems emulators and cores available for |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| +| System|Media Player (mplayer)|System|`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)
| +| System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|| +| System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| +| System|Ports (ports)|System|`ports`|.sh|| +| System|Screenshots (imageviewer)|System|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| +| System|Tools (tools)|System|`modules`|.sh|| |Amstrad|CPC (amstradcpc)|1984|`amstradcpc`|.dsk .sna .tap .cdt .kcr .voc .m3u .zip .7z|**retroarch:** crocods (default)
**retroarch:** cap32
| |Arcade|Arcade (arcade)|1984|`arcade`|.zip .7z|**retroarch:** mame2003_plus (default)
**retroarch:** mame2000
**retroarch:** mame2010
**retroarch:** mame2015
**retroarch:** fbneo
**retroarch:** fbalpha2012
**retroarch:** fbalpha2019
**retroarch:** mame
| |Arcade|Daphne (daphne)|1996|`daphne`|.daphne .zip|**hypseus:** hypseus (default)
**retroarch:** daphne
| @@ -38,12 +44,6 @@ This document describes all available systems emulators and cores available for |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|Media Player (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)
| -|JELOS|Moonlight Game Streaming (moonlight)|2021|`moonlight`|.sh|| -|JELOS|Music Player (music)|unknown|`playlists`|.m3u .sh|**gmu:** gmu (default)
| -|JELOS|Ports (ports)|2021|`ports`|.sh|| -|JELOS|Screenshots (imageviewer)|2021|`screenshots`|.jpg .jpeg .png .bmp .psd .tga .gif .hdr .pic .ppm .pgm .mkv .pdf .mp4 .avi|| -|JELOS|Tools (tools)|2021|`modules`|.sh|| |Lexaloffle|PICO-8 (pico-8)|2015|`pico-8`|.p8 .png|**pico-8:** pico8 (default)
**retroarch:** fake08
| |Magnavox|Odyssey 2 (odyssey2)|1979|`odyssey`|.bin .zip .7z|**retroarch:** o2em (default)
| |Mattel|Intellivision (intellivision)|1979|`intellivision`|.int .bin .rom .zip .7z|**retroarch:** freeintv (default)
| diff --git a/packages/emulators/standalone/yuzu-sa/package.mk b/packages/emulators/standalone/yuzu-sa/package.mk index 0ec376dcc..1646a3fc2 100644 --- a/packages/emulators/standalone/yuzu-sa/package.mk +++ b/packages/emulators/standalone/yuzu-sa/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="yuzu-sa" -PKG_VERSION="53f904b740c00ee491565578012a8c739bd9ed77" +PKG_VERSION="249db0a59bb4aadb031f270ed79044f91defb98d" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/yuzu-emu/yuzu" From 109cd050524668599127e341b05ec9c2a278c1bb Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 21 Oct 2023 12:38:26 +0000 Subject: [PATCH 45/47] Revert yuzu change. --- packages/emulators/standalone/yuzu-sa/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/emulators/standalone/yuzu-sa/package.mk b/packages/emulators/standalone/yuzu-sa/package.mk index 1646a3fc2..0ec376dcc 100644 --- a/packages/emulators/standalone/yuzu-sa/package.mk +++ b/packages/emulators/standalone/yuzu-sa/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech) PKG_NAME="yuzu-sa" -PKG_VERSION="249db0a59bb4aadb031f270ed79044f91defb98d" +PKG_VERSION="53f904b740c00ee491565578012a8c739bd9ed77" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/yuzu-emu/yuzu" From 2ef9d085369958aa64cc932c54f893dd64e0b587 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 21 Oct 2023 12:46:18 +0000 Subject: [PATCH 46/47] Add Hardkernel N2/N2+ to README.md. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d5b27f253..4e48cdc05 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ JELOS supports a variety of ARM and Intel/AMD based devices. | Hardkernel | [Odroid Go Advance](http://jelos.org/devices/hardkernel/odroid-go-advance) | Rockchip RK3326 (ARM) | Mainline Linux | Panfrost | Weston + Emulation Station | | Hardkernel | [Odroid Go Super](http://jelos.org/devices/hardkernel/odroid-go-super) | Rockchip RK3326 (ARM) | Mainline Linux | Panfrost | Weston + Emulation Station | | Hardkernel | [Odroid Go Ultra](http://jelos.org/devices/hardkernel/odroid-go-ultra) | Amlogic S922X / Mali G52 M6 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station | +| Hardkernel | [Odroid N2/N2+](http://jelos.org/devices/hardkernel/odroid-n2) | Amlogic S922X / Mali G52 M6 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station | | Indiedroid | [Nova](http://jelos.org/devices/indiedroid/nova) | Rockchip RK3588S / Mali G610 (ARMv8-A) | Rockchip 5.10 BSP Linux | Panfrost | Weston + Emulation Station | | Orange Pi | [Orange Pi 5](http://jelos.org/devices/orange-pi/orange-pi-5) | Rockchip RK3588S / Mali G610 (ARMv8-A) | Rockchip 5.10 BSP Linux | Panfrost | Weston + Emulation Station | | Powkiddy | [RGB10 Max 3 Pro](http://jelos.org/devices/powkiddy/rgb10-max-3-pro) | Amlogic A311D / Mali G52 M4 (ARMv8-A) | Mainline Linux | Mali | Weston + Emulation Station | @@ -135,4 +136,4 @@ JELOS supports a variety of ARM and Intel/AMD based devices. ## Credits -Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the open source community. \ No newline at end of file +Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the open source community. From fb8cfba5bf084a7265ae8036555b4534fdbe670d Mon Sep 17 00:00:00 2001 From: fewtarius Date: Sat, 21 Oct 2023 15:05:06 +0000 Subject: [PATCH 47/47] Update the default copyright assignment to the JELOS project. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e48cdc05..ed90e5c91 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Under the following terms: ### JELOS Software -Copyright 2021-present Fewtarius +Copyright 2021-present JELOS Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)