diff --git a/config/blocklist b/config/blocklist index 111aac9c7..9439b8130 100644 --- a/config/blocklist +++ b/config/blocklist @@ -3,6 +3,7 @@ np2kai # Last major commit before hiatus is broken. vice-sa # Doesn't support updating with the script. dolphin-sa # Wayland patch is now broken upstream duckstation-lr #Libretro support removed from upstream. +duckstation-sa #Patches need to be reworked. rpcs3-sa #Need to update to llvm 16 gzdoom-sa #will break build patch ryujinx-sa #broken on JELOS after build 1.1740. @@ -11,3 +12,4 @@ mupen64plus-sa-ui-console #Causes segfaults nanoboyadvance-sa #SDL version removed after this commit kronos-sa #using the release version of kronos had better results. retroarch #pinning to release versions for stability. +vita3k-sa #Patch updates needed. 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 2a7780011..4c4f5397b 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/AMD64/SUPPORTED_EMULATORS_AND_CORES.md @@ -99,11 +99,11 @@ This document describes all available systems emulators and cores available for |Sega|Mega Drive (megadrive)|1990|`megadrive`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)
**retroarch:** genesis_plus_gx_wide
**retroarch:** picodrive
**mednafen:** md
| |Sega|Mega Drive (megadrive-japan)|1988|`megadrive-japan`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)
**retroarch:** genesis_plus_gx_wide
**retroarch:** picodrive
**mednafen:** md
| |Sega|Naomi (naomi)|1998|`naomi`|.lst .bin .dat .zip .7z|**retroarch:** flycast2021
**retroarch:** flycast (default)
**flycast:** flycast-sa
| -|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**kronos:** kronos-sa
**retroarch:** yabasanshiro (default)
**mednafen:** ss
**retroarch:** beetle_saturn
**kronos:** kronos-sa (default)
| +|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**kronos:** kronos-sa
**retroarch:** yabasanshiro (default)
**retroarch:** kronos
**mednafen:** ss
**retroarch:** beetle_saturn
**kronos:** kronos-sa (default)
| |Sega|Sega 32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)
| |Sega|Sega CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)
**retroarch:** picodrive
| |Sega|SG-1000 (sg-1000)|1983|`sg-1000`|.bin .sg .zip .7z|**retroarch:** gearsystem (default)
**retroarch:** genesis_plus_gx
**retroarch:** picodrive
| -|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**retroarch:** beetle_saturn
**mednafen:** ss
| +|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**retroarch:** beetle_saturn
**retroarch:** kronos
**mednafen:** ss
| |Sharp|X1 (x1)|1982|`x1`|.dx1 .2d .2hd .tfd .d88d .hdm .xdf .dup .tap .cmd .zip .7z|**retroarch:** x1 (default)
| |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)
| |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse
| 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 d39f67f9a..5fc66a84e 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/RK3399/SUPPORTED_EMULATORS_AND_CORES.md @@ -95,11 +95,11 @@ This document describes all available systems emulators and cores available for |Sega|Mega Drive (megadrive)|1990|`megadrive`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)
**retroarch:** genesis_plus_gx_wide
**retroarch:** picodrive
**mednafen:** md
| |Sega|Mega Drive (megadrive-japan)|1988|`megadrive-japan`|.bin .gen .md .sg .smd .zip .7z|**retroarch:** genesis_plus_gx (default)
**retroarch:** genesis_plus_gx_wide
**retroarch:** picodrive
**mednafen:** md
| |Sega|Naomi (naomi)|1998|`naomi`|.lst .bin .dat .zip .7z|**flycast:** flycast-sa
**retroarch:** flycast (default)
| -|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**yabasanshiro:** yabasanshiro-sa (default)
**retroarch:** yabasanshiro
**retroarch:** beetle_saturn
**kronos:** kronos-sa (default)
| +|Sega|Saturn (saturn)|1994|`saturn`|.cue .chd .iso|**yabasanshiro:** yabasanshiro-sa (default)
**retroarch:** yabasanshiro
**retroarch:** beetle_saturn
| |Sega|Sega 32X (sega32x)|1994|`sega32x`|.32x .smd .bin .md .zip .7z|**retroarch:** picodrive (default)
| |Sega|Sega CD (segacd)|1991|`segacd`|.chd .cue .iso .m3u|**retroarch:** genesis_plus_gx (default)
**retroarch:** picodrive
| |Sega|SG-1000 (sg-1000)|1983|`sg-1000`|.bin .sg .zip .7z|**retroarch:** gearsystem (default)
**retroarch:** genesis_plus_gx
**retroarch:** picodrive
| -|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**retroarch:** beetle_saturn
**mednafen:** ss
| +|Sega|ST-V (st-v)|1995|`st-v`|.zip .ZIP|**retroarch:** beetle_saturn (default)
**mednafen:** ss
| |Sharp|X1 (x1)|1982|`x1`|.dx1 .2d .2hd .tfd .d88d .hdm .xdf .dup .tap .cmd .zip .7z|**retroarch:** x1 (default)
| |Sharp|x68000 (x68000)|1987|`x68000`|.dim .img .d88d .hdm .dup .2hd .xdf .hdf .cmd .m3u .zip .7z|**retroarch:** px68k (default)
| |Sinclair|ZX Spectrum (zxspectrum)|1982|`zxspectrum`|.tzx .tap .z80 .rzx .scl .trd .dsk .zip .7z|**retroarch:** fuse
| diff --git a/packages/apps/moonlight/package.mk b/packages/apps/moonlight/package.mk index 1a7edccb6..99b3ae515 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="1ef083c952b72f9ec1f8217d6ce7f3e91d13b636" + PKG_VERSION="8f2db994068757bead7598a8308c9e839be85e8c" PKG_DEPENDS_TARGET+=" qt5" PKG_TOOLCHAIN="manual" make_target() { diff --git a/packages/apps/oga_controls/package.mk b/packages/apps/oga_controls/package.mk index 6168e9e05..bb5adba95 100644 --- a/packages/apps/oga_controls/package.mk +++ b/packages/apps/oga_controls/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="oga_controls" PKG_VERSION="1604ee24150c1c5bb7c66bc4670919c2ad8f0064" diff --git a/packages/apps/portmaster/package.mk b/packages/apps/portmaster/package.mk index 45d19fb12..58bb34ab3 100644 --- a/packages/apps/portmaster/package.mk +++ b/packages/apps/portmaster/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="portmaster" PKG_VERSION="8.5.13_1130" diff --git a/packages/apps/portmaster/scripts/portmaster_compatibility.sh b/packages/apps/portmaster/scripts/portmaster_compatibility.sh index cd4b2923f..3563a3d58 100644 --- a/packages/apps/portmaster/scripts/portmaster_compatibility.sh +++ b/packages/apps/portmaster/scripts/portmaster_compatibility.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/apps/portmaster/scripts/start_portmaster.sh b/packages/apps/portmaster/scripts/start_portmaster.sh index 0a4ae49fb..d784dbf75 100644 --- a/packages/apps/portmaster/scripts/start_portmaster.sh +++ b/packages/apps/portmaster/scripts/start_portmaster.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "PortMaster" diff --git a/packages/apps/portmaster/sources/control.txt b/packages/apps/portmaster/sources/control.txt index b2ce01054..88f5afcdb 100644 --- a/packages/apps/portmaster/sources/control.txt +++ b/packages/apps/portmaster/sources/control.txt @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) # This file can and should be sourced by ports for various parameters to # minimize script customizations and allow for easier future updates diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index f3df26e51..e68d177ef 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -8,28 +8,13 @@ PKG_SITE="https://xiph.org/flac/" PKG_URL="http://downloads.xiph.org/releases/flac/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libogg" PKG_LONGDESC="An Free Lossless Audio Codec." -PKG_TOOLCHAIN="autotools" -# flac-1.3.1 dont build with LTO support -PKG_BUILD_FLAGS="+pic" -# package specific configure options -PKG_CONFIGURE_OPTS_TARGET="--enable-shared \ - --disable-static \ - --disable-rpath \ - --disable-altivec \ - --disable-doxygen-docs \ - --disable-thorough-tests \ - --disable-cpplibs \ - --disable-xmms-plugin \ - --disable-oggtest \ - --with-ogg=${SYSROOT_PREFIX}/usr \ - --with-gnu-ld" - -if target_has_feature sse; then - PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} --enable-sse" -else - PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} --disable-sse" -fi +pre_configure_target() { + PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON \ + -DWITH_STACK_PROTECTOR=OFF \ + -DINSTALL_MANPAGES=OFF \ + -DNDEBUG=OFF" +} post_makeinstall_target() { rm -rf ${INSTALL}/usr/bin diff --git a/packages/audio/ldacBT/package.mk b/packages/audio/ldacBT/package.mk index 89a4fdd40..4909477f3 100644 --- a/packages/audio/ldacBT/package.mk +++ b/packages/audio/ldacBT/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ldacBT" -PKG_VERSION="fbffba4" +PKG_VERSION="af2dd23979453bcd1cad7c4086af5fb421a955c5" PKG_LICENSE="Apache" PKG_SITE="https://github.com/EHfive/ldacBT" PKG_URL="${PKG_SITE}.git" diff --git a/packages/compat/box64/package.mk b/packages/compat/box64/package.mk index 48762b46f..e3752e787 100644 --- a/packages/compat/box64/package.mk +++ b/packages/compat/box64/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="box64" -PKG_VERSION="b07ea3460ea337f6ac45d6ea53d0c890923d408e" +PKG_VERSION="211fee2e4e4ce1f7132660469df613df5a74ac88" PKG_ARCH="aarch64" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ptitSeb/box64" diff --git a/packages/compat/box86/package.mk b/packages/compat/box86/package.mk index 192ebbb60..975c314dc 100644 --- a/packages/compat/box86/package.mk +++ b/packages/compat/box86/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="box86" -PKG_VERSION="150b035a1bd492f67e852502551df168737ad069" +PKG_VERSION="57c1ed71187b52a3480c9cbbb741d02307ccb14c" PKG_ARCH="arm aarch64" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ptitSeb/box86" diff --git a/packages/compat/wine-wayland/package.mk b/packages/compat/wine-wayland/package.mk index 515e948c7..1285199c8 100644 --- a/packages/compat/wine-wayland/package.mk +++ b/packages/compat/wine-wayland/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="wine-wayland" PKG_VERSION="8.2.1" diff --git a/packages/compress/unrar/package.mk b/packages/compress/unrar/package.mk index 092eac612..7407b1872 100644 --- a/packages/compress/unrar/package.mk +++ b/packages/compress/unrar/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="unrar" -PKG_VERSION="c0561ea" +PKG_VERSION="df15c8c3c9f4105d3501bc477e80ac6b8e227677" PKG_LICENSE="free" PKG_SITE="http://www.rarlab.com" PKG_URL="https://github.com/pmachapman/unrar.git" diff --git a/packages/debug/apitrace/package.mk b/packages/debug/apitrace/package.mk index 92418d1da..76d8ad651 100644 --- a/packages/debug/apitrace/package.mk +++ b/packages/debug/apitrace/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="apitrace" -PKG_VERSION="00706d1" +PKG_VERSION="c314a74227d658db08077d685a83e1246e0c13a7" PKG_LICENSE="GPL" PKG_SITE="https://github.com/apitrace/apitrace" PKG_URL="${PKG_SITE}.git" diff --git a/packages/devel/ecm/package.mk b/packages/devel/ecm/package.mk index 42af2c534..81193f7c5 100644 --- a/packages/devel/ecm/package.mk +++ b/packages/devel/ecm/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="ecm" PKG_VERSION="v5.112.0" diff --git a/packages/devel/hidapi/package.mk b/packages/devel/hidapi/package.mk index 14ffb7aa8..d60b58bd4 100644 --- a/packages/devel/hidapi/package.mk +++ b/packages/devel/hidapi/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="hidapi" -PKG_VERSION="1ba21cee743b927004e641409b87e5fcc50f3736" +PKG_VERSION="7011fa98af2dde00c298105735e470de800288c7" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libusb/hidapi" PKG_URL="${PKG_SITE}.git" diff --git a/packages/devel/libdatrie/package.mk b/packages/devel/libdatrie/package.mk index 85fb9bac4..28467ec97 100644 --- a/packages/devel/libdatrie/package.mk +++ b/packages/devel/libdatrie/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libdatrie" PKG_VERSION="0.2.13" diff --git a/packages/devel/libp11-kit/package.mk b/packages/devel/libp11-kit/package.mk index d26a90ac5..5be5db8fd 100644 --- a/packages/devel/libp11-kit/package.mk +++ b/packages/devel/libp11-kit/package.mk @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libp11-kit" -PKG_VERSION="66d6b42" +PKG_VERSION="3f6233d70ed81fdbc81b9bff345ea90ec2496b3b" PKG_LICENSE="libp11-kit" PKG_SITE="https://github.com/p11-glue/p11-kit" PKG_URL="${PKG_SITE}.git" diff --git a/packages/devel/librga/package.mk b/packages/devel/librga/package.mk index 68b9f15ce..cba047265 100644 --- a/packages/devel/librga/package.mk +++ b/packages/devel/librga/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert) PKG_NAME="librga" -PKG_VERSION="df26244" +PKG_VERSION="df26244eb0c3991df319d4276ab80e8c0bf91f64" PKG_ARCH="arm aarch64" PKG_LICENSE="GNU" PKG_DEPENDS_TARGET="toolchain libdrm" diff --git a/packages/devel/libserialport/package.mk b/packages/devel/libserialport/package.mk index 596258dde..adc4e7d85 100644 --- a/packages/devel/libserialport/package.mk +++ b/packages/devel/libserialport/package.mk @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 PKG_NAME="libserialport" -PKG_VERSION="fd20b0f" +PKG_VERSION="fd20b0fc5a34cd7f776e4af6c763f59041de223b" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/sigrokproject/libserialport" PKG_URL="${PKG_SITE}.git" diff --git a/packages/devel/libthai/package.mk b/packages/devel/libthai/package.mk index cd985448c..fe52fd44e 100644 --- a/packages/devel/libthai/package.mk +++ b/packages/devel/libthai/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libthai" PKG_VERSION="0.1.29" diff --git a/packages/devel/qt5/package.mk b/packages/devel/qt5/package.mk index da2f3075b..f795e4e35 100644 --- a/packages/devel/qt5/package.mk +++ b/packages/devel/qt5/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="qt5" -PKG_VERSION="b62f335cb3bb1a4e9d7411fad7de9c8eddde1b4e" +PKG_VERSION="4765fa1df7a837db9c1f89c4da0dd76b74bb5fab" PKG_LICENSE="GPL" PKG_SITE="http://qt-project.org" PKG_URL="https://invent.kde.org/qt/qt/qt5.git" diff --git a/packages/emulators/libretro/arduous-lr/package.mk b/packages/emulators/libretro/arduous-lr/package.mk index b544c8751..9bf880dce 100644 --- a/packages/emulators/libretro/arduous-lr/package.mk +++ b/packages/emulators/libretro/arduous-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="arduous-lr" PKG_VERSION="aed50506962df6f965748e888b3fe7027ddb410d" diff --git a/packages/emulators/libretro/beetle-psx-lr/package.mk b/packages/emulators/libretro/beetle-psx-lr/package.mk index 6dab96483..8bdf7c81d 100644 --- a/packages/emulators/libretro/beetle-psx-lr/package.mk +++ b/packages/emulators/libretro/beetle-psx-lr/package.mk @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="beetle-psx-lr" -PKG_VERSION="853532c906f4a6ce46b670357a0d4d392212f63b" +PKG_VERSION="05fda4c7e4e98392aca86198644b0c0153369771" PKG_LICENSE="GPLv2" PKG_SITE="https://git.libretro.com/libretro/beetle-psx-libretro" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/libretro/beetle-saturn-lr/package.mk b/packages/emulators/libretro/beetle-saturn-lr/package.mk index e5debef76..fbf77fa76 100644 --- a/packages/emulators/libretro/beetle-saturn-lr/package.mk +++ b/packages/emulators/libretro/beetle-saturn-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="beetle-saturn-lr" PKG_VERSION="cd395e9e3ee407608450ebc565e871b24e7ffed6" diff --git a/packages/emulators/libretro/boom3-lr/package.mk b/packages/emulators/libretro/boom3-lr/package.mk index 0a87995a7..aa8a5b570 100644 --- a/packages/emulators/libretro/boom3-lr/package.mk +++ b/packages/emulators/libretro/boom3-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="boom3-lr" PKG_VERSION="0bea79abf5ec8262dfe9af73cb8c54ea6e2aeb98" diff --git a/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh b/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh index 319ca47b5..89472908b 100644 --- a/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh +++ b/packages/emulators/libretro/boom3-lr/scripts/Doom 3 - Resurrection of Evil.sh @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) /usr/bin/retroarch -L /usr/lib/libretro/boom3_xp_libretro.so /storage/roms/idtech/doom3/d3xp/pak000.pk4 diff --git a/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh b/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh index fd3bf4f6e..203c04d6a 100644 --- a/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh +++ b/packages/emulators/libretro/boom3-lr/scripts/Doom 3.sh @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) /usr/bin/retroarch -L /usr/lib/libretro/boom3_libretro.so /storage/roms/idtech/doom3/base/pak000.pk4 diff --git a/packages/emulators/libretro/bsnes-lr/package.mk b/packages/emulators/libretro/bsnes-lr/package.mk index 263cb6e08..84e4162e5 100644 --- a/packages/emulators/libretro/bsnes-lr/package.mk +++ b/packages/emulators/libretro/bsnes-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="bsnes-lr" PKG_VERSION="370a8642b1ec06d60d65467f4db1b098e4cb49f1" diff --git a/packages/emulators/libretro/bsnes-mercury-performance-lr/package.mk b/packages/emulators/libretro/bsnes-mercury-performance-lr/package.mk index 07efb2079..25a9ae206 100644 --- a/packages/emulators/libretro/bsnes-mercury-performance-lr/package.mk +++ b/packages/emulators/libretro/bsnes-mercury-performance-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="bsnes-mercury-performance-lr" PKG_VERSION="60c204ca17941704110885a815a65c740572326f" diff --git a/packages/emulators/libretro/citra-lr/package.mk b/packages/emulators/libretro/citra-lr/package.mk index c63898361..227b7fefe 100644 --- a/packages/emulators/libretro/citra-lr/package.mk +++ b/packages/emulators/libretro/citra-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="citra-lr" PKG_VERSION="d7e1612c17b1acb5d5eb68bb046820db49aeea5e" diff --git a/packages/emulators/libretro/desmume-lr/package.mk b/packages/emulators/libretro/desmume-lr/package.mk index 9f08a4265..e0a07bade 100644 --- a/packages/emulators/libretro/desmume-lr/package.mk +++ b/packages/emulators/libretro/desmume-lr/package.mk @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="desmume-lr" -PKG_VERSION="cf0fcc6ea4a85b7491bdf9adc7bf09748b4be7da" +PKG_VERSION="4ee1bb1d6a6c9695baea49d0c2dff34c10187502" PKG_LICENSE="GPLv2" PKG_SITE="https://git.libretro.com/libretro/desmume" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/libretro/dolphin-lr/package.mk b/packages/emulators/libretro/dolphin-lr/package.mk index d9cb70bb4..c3902682c 100644 --- a/packages/emulators/libretro/dolphin-lr/package.mk +++ b/packages/emulators/libretro/dolphin-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="dolphin-lr" PKG_VERSION="2f4b0f7902257d40a054f60b2c670d6e314f2a04" diff --git a/packages/emulators/libretro/dosbox-pure-lr/package.mk b/packages/emulators/libretro/dosbox-pure-lr/package.mk index 3a4106d91..752152d76 100644 --- a/packages/emulators/libretro/dosbox-pure-lr/package.mk +++ b/packages/emulators/libretro/dosbox-pure-lr/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dosbox-pure-lr" -PKG_VERSION="8b790959d5fa5b267cfd2746af7d400a6ff76609" +PKG_VERSION="696503df41c52376cc4de8774c4c46107a846a8f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" diff --git a/packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc12-compile.patch b/packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc12-compile.patch index b84ca6e14..505c31eff 100644 --- a/packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc12-compile.patch +++ b/packages/emulators/libretro/duckstation-lr/patches/001-fix-gcc12-compile.patch @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) diff --git a/src/core/cpu_core.h b/src/core/cpu_core.h index c9199153..5d82b5c0 100644 diff --git a/packages/emulators/libretro/ecwolf-lr/package.mk b/packages/emulators/libretro/ecwolf-lr/package.mk index 900368a0e..e0b1c8f3d 100644 --- a/packages/emulators/libretro/ecwolf-lr/package.mk +++ b/packages/emulators/libretro/ecwolf-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="ecwolf-lr" PKG_VERSION="18eca17c2d634b154824e0782c6cbbe0a2c9ea76" diff --git a/packages/emulators/libretro/flycast-lr/package.mk b/packages/emulators/libretro/flycast-lr/package.mk index c092fa1da..d6d172e35 100644 --- a/packages/emulators/libretro/flycast-lr/package.mk +++ b/packages/emulators/libretro/flycast-lr/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="flycast-lr" -PKG_VERSION="92a10ba0f0a5ca0d1ec9498962002f4cdcc8e7f6" +PKG_VERSION="f4f087a6ea83a5483dedf23ad2b38763988eccc5" PKG_SITE="https://github.com/flyinghead/flycast" PKG_URL="${PKG_SITE}.git" PKG_DEPENDS_TARGET="toolchain zlib libzip" diff --git a/packages/emulators/libretro/glsl-shaders/package.mk b/packages/emulators/libretro/glsl-shaders/package.mk index 4b3b48b4c..ed22b88f6 100644 --- a/packages/emulators/libretro/glsl-shaders/package.mk +++ b/packages/emulators/libretro/glsl-shaders/package.mk @@ -21,7 +21,7 @@ ################################################################################ PKG_NAME="glsl-shaders" -PKG_VERSION="07a6b9ae8cb1211209d336cd49313ef02658598f" +PKG_VERSION="7e1617b722f85466ad7dd4ddb4ac241fd02dc8d0" PKG_REV="1" PKG_ARCH="aarch64" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/gpsp-lr/package.mk b/packages/emulators/libretro/gpsp-lr/package.mk index 4a667ed6a..f4a7c7f93 100644 --- a/packages/emulators/libretro/gpsp-lr/package.mk +++ b/packages/emulators/libretro/gpsp-lr/package.mk @@ -21,7 +21,7 @@ ################################################################################ PKG_NAME="gpsp-lr" -PKG_VERSION="1d972ec7ff26088a68bbc9a93978dae2d13ee5d4" +PKG_VERSION="895fb075c3a04a0eff8c92a150e01e42df10a062" PKG_ARCH="arm aarch64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/gpsp" diff --git a/packages/emulators/libretro/idtech-lr/package.mk b/packages/emulators/libretro/idtech-lr/package.mk index 6ffa1cf40..325913756 100644 --- a/packages/emulators/libretro/idtech-lr/package.mk +++ b/packages/emulators/libretro/idtech-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="idtech-lr" PKG_LICENSE="Apache-2.0" diff --git a/packages/emulators/libretro/kronos-lr/config/Kronos.opt b/packages/emulators/libretro/kronos-lr/config/Kronos.opt new file mode 100644 index 000000000..28611d2f5 --- /dev/null +++ b/packages/emulators/libretro/kronos-lr/config/Kronos.opt @@ -0,0 +1,19 @@ +kronos_addon_cartridge = "512K_backup_ram" +kronos_bandingmode = "disabled" +kronos_force_downsampling = "disabled" +kronos_force_hle_bios = "disabled" +kronos_language_id = "English" +kronos_meshmode = "disabled" +kronos_multitap_port1 = "disabled" +kronos_multitap_port2 = "disabled" +kronos_polygon_mode = "cpu_tesselation" +kronos_resolution_mode = "original" +kronos_service_enabled = "disabled" +kronos_sh2coretype = "kronos" +kronos_skipframe = "0" +kronos_stv_favorite_region = "EU" +kronos_use_beetle_saves = "disabled" +kronos_use_cs = "disabled" +kronos_videocoretype = "opengl" +kronos_videoformattype = "auto" +kronos_wireframe_mode = "disabled" diff --git a/packages/emulators/libretro/kronos-lr/package.mk b/packages/emulators/libretro/kronos-lr/package.mk new file mode 100644 index 000000000..51811e462 --- /dev/null +++ b/packages/emulators/libretro/kronos-lr/package.mk @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="kronos-lr" +PKG_LICENSE="GPLv2" +PKG_SITE="https://github.com/libretro/yabause" +PKG_ARCH="x86_64" +PKG_URL="${PKG_SITE}.git" +PKG_VERSION="fec6e18cc6f00933f6303a983935a44302f3075f" +PKG_GIT_CLONE_BRANCH="kronos" +PKG_DEPENDS_TARGET="toolchain boost zlib" +PKG_LONGDESC="Kronos is a Sega Saturn emulator forked from yabause." +PKG_TOOLCHAIN="make" +GET_HANDLER_SUPPORT="git" +PKG_PATCH_DIRS+="${DEVICE}" + +pre_configure_target() { + sed -i 's/\-latomic//' ${PKG_BUILD}/yabause/src/libretro/Makefile +} + +make_target() { +# This was only necessary in the main repo, but may come to libretro later on +# make -C ${PKG_BUILD}/yabause/src/libretro/ generate-files + make -C ${PKG_BUILD}/yabause/src/libretro/ +} + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/lib/libretro + cp -a ${PKG_BUILD}/yabause/src/libretro/kronos_libretro.so ${INSTALL}/usr/lib/libretro/kronos_libretro.so +} diff --git a/packages/emulators/libretro/melonds-lr/package.mk b/packages/emulators/libretro/melonds-lr/package.mk index a695d6bfc..2b01a5bdd 100644 --- a/packages/emulators/libretro/melonds-lr/package.mk +++ b/packages/emulators/libretro/melonds-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="melonds-lr" PKG_VERSION="c6488c88cb4c7583dbcd61609e0eef441572fae8" diff --git a/packages/emulators/libretro/mesen-lr/package.mk b/packages/emulators/libretro/mesen-lr/package.mk index 19b04a472..979b299e2 100644 --- a/packages/emulators/libretro/mesen-lr/package.mk +++ b/packages/emulators/libretro/mesen-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="mesen-lr" PKG_VERSION="d25d60fc190f3f7603a1113ef1e11d9da65b7583" diff --git a/packages/emulators/libretro/parallel-n64-lr/package.mk b/packages/emulators/libretro/parallel-n64-lr/package.mk index 305f41cf3..688f1f3ef 100644 --- a/packages/emulators/libretro/parallel-n64-lr/package.mk +++ b/packages/emulators/libretro/parallel-n64-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="parallel-n64-lr" PKG_VERSION="49eadb4da85f7e3bd59b60f61e8fd5dbfb9f07d5" diff --git a/packages/emulators/libretro/play-lr/package.mk b/packages/emulators/libretro/play-lr/package.mk index b66a1d855..ec026a237 100644 --- a/packages/emulators/libretro/play-lr/package.mk +++ b/packages/emulators/libretro/play-lr/package.mk @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="play-lr" -PKG_VERSION="58216c3110abcaf582c6eb9c8fad62ec92945ae6" +PKG_VERSION="e0f5091e6eb80d609807fc2a9da3f2516373582f" PKG_ARCH="x86_64" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/jpd002/Play-" diff --git a/packages/emulators/libretro/ppsspp-lr/package.mk b/packages/emulators/libretro/ppsspp-lr/package.mk index 5240a4996..22e70688c 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="3d508ef282d25cfba66a0f3a7e9c45b62b3c637f" +PKG_VERSION="58e12acee4d7829ee675ce95f3d377c3aaa3ecc5" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/hrydgard/ppsspp" PKG_URL="https://github.com/hrydgard/ppsspp.git" diff --git a/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh b/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh index 26c7f4af2..e8d878c95 100644 --- a/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh +++ b/packages/emulators/libretro/prboom-lr/scripts/Doom II.sh @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) /usr/bin/retroarch -L /usr/lib/libretro/prboom_libretro.so /storage/roms/idtech/doom2/Doom2.wad diff --git a/packages/emulators/libretro/prboom-lr/scripts/Doom.sh b/packages/emulators/libretro/prboom-lr/scripts/Doom.sh index 58dddbce5..36cd2b13d 100644 --- a/packages/emulators/libretro/prboom-lr/scripts/Doom.sh +++ b/packages/emulators/libretro/prboom-lr/scripts/Doom.sh @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) /usr/bin/retroarch -L /usr/lib/libretro/prboom_libretro.so /storage/roms/idtech/doom/Doom.wad diff --git a/packages/emulators/libretro/slang-shaders/package.mk b/packages/emulators/libretro/slang-shaders/package.mk index dad90f42c..d5e29a770 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="41a011230071b5b4163e9321d24489542d9d840a" +PKG_VERSION="8595c3cbea2120bc9b82e4ff756f61100543ec83" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh b/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh index efe7883ea..669deb59b 100644 --- a/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh +++ b/packages/emulators/libretro/tyrquake-lr/scripts/Quake.sh @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) /usr/bin/retroarch -L /usr/lib/libretro/tyrquake_libretro.so /storage/roms/idtech/quakepaks/id1/* diff --git a/packages/emulators/libretro/vitaquake2-lr/package.mk b/packages/emulators/libretro/vitaquake2-lr/package.mk index 24e1c4bcd..6a96ce830 100644 --- a/packages/emulators/libretro/vitaquake2-lr/package.mk +++ b/packages/emulators/libretro/vitaquake2-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="vitaquake2-lr" PKG_VERSION="6bb3ee592169694b055e7efd5fa2a4e57875bddd" diff --git a/packages/emulators/libretro/vitaquake3-lr/package.mk b/packages/emulators/libretro/vitaquake3-lr/package.mk index bc5ce4693..05e8be26a 100644 --- a/packages/emulators/libretro/vitaquake3-lr/package.mk +++ b/packages/emulators/libretro/vitaquake3-lr/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="vitaquake3-lr" PKG_VERSION="7a633867cf0a35c71701aef6fc9dd9dfab9c33a9" diff --git a/packages/emulators/standalone/aethersx2-sa/package.mk b/packages/emulators/standalone/aethersx2-sa/package.mk index 77a96b837..817f1c918 100644 --- a/packages/emulators/standalone/aethersx2-sa/package.mk +++ b/packages/emulators/standalone/aethersx2-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="aethersx2-sa" PKG_VERSION="v1.5-3606" diff --git a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh index 4ce0047bb..afa4f15da 100755 --- a/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh +++ b/packages/emulators/standalone/aethersx2-sa/scripts/start_aethersx2.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/cemu-sa/package.mk b/packages/emulators/standalone/cemu-sa/package.mk index d003fa954..65eabcb33 100644 --- a/packages/emulators/standalone/cemu-sa/package.mk +++ b/packages/emulators/standalone/cemu-sa/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="cemu-sa" -PKG_VERSION="dee764473db26462a898aae8ea73c65a9cbafda1" +PKG_VERSION="bab1616565b8fab99c52e0bedb275ae90a7b53df" PKG_ARCH="x86_64" PKG_LICENSE="MPL-2.0" PKG_SITE="https://github.com/cemu-project/Cemu" diff --git a/packages/emulators/standalone/citra-sa/package.mk b/packages/emulators/standalone/citra-sa/package.mk index 5408ef5bb..44e18c496 100644 --- a/packages/emulators/standalone/citra-sa/package.mk +++ b/packages/emulators/standalone/citra-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="citra-sa" PKG_LICENSE="MPLv2" @@ -17,7 +17,7 @@ case ${DEVICE} in ;; *) PKG_URL="${PKG_SITE}.git" - PKG_VERSION="60584e861d15f5cf1f64890c03e8090460d3f7c4" + PKG_VERSION="2b20082581906fe973e26ed36bef695aa1f64527" ;; esac diff --git a/packages/emulators/standalone/citra-sa/scripts/start_citra.sh b/packages/emulators/standalone/citra-sa/scripts/start_citra.sh index 1daff7d82..5b13e1862 100644 --- a/packages/emulators/standalone/citra-sa/scripts/start_citra.sh +++ b/packages/emulators/standalone/citra-sa/scripts/start_citra.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 citra" diff --git a/packages/emulators/standalone/dolphin-sa/package.mk b/packages/emulators/standalone/dolphin-sa/package.mk index 0c3d99d10..9ece22bd8 100644 --- a/packages/emulators/standalone/dolphin-sa/package.mk +++ b/packages/emulators/standalone/dolphin-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="dolphin-sa" PKG_LICENSE="GPLv2" diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh index fbe47ad0b..51f64011e 100755 --- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh +++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_gc.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 dolphin-emu-nogui" diff --git a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh index 199aae6d3..cd783654d 100755 --- a/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh +++ b/packages/emulators/standalone/dolphin-sa/scripts/start_dolphin_wii.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 dolphin-emu-nogui" diff --git a/packages/emulators/standalone/drastic-sa/package.mk b/packages/emulators/standalone/drastic-sa/package.mk index 8375b0134..e79ecc385 100644 --- a/packages/emulators/standalone/drastic-sa/package.mk +++ b/packages/emulators/standalone/drastic-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="drastic-sa" PKG_VERSION="1.0" diff --git a/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh b/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh index 1605aaef5..6a77d2cb6 100644 --- a/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh +++ b/packages/emulators/standalone/drastic-sa/scripts/start_drastic.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/duckstation-sa/package.mk b/packages/emulators/standalone/duckstation-sa/package.mk index 00a8eb266..e0288acc9 100644 --- a/packages/emulators/standalone/duckstation-sa/package.mk +++ b/packages/emulators/standalone/duckstation-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="duckstation-sa" PKG_LICENSE="GPLv3" diff --git a/packages/emulators/standalone/duckstation-sa/patches/wayland/aarch64/003-fix-wayland-compile.patch b/packages/emulators/standalone/duckstation-sa/patches/wayland/aarch64/003-fix-wayland-compile.patch index 8f478de7f..b4ae4ff75 100644 --- a/packages/emulators/standalone/duckstation-sa/patches/wayland/aarch64/003-fix-wayland-compile.patch +++ b/packages/emulators/standalone/duckstation-sa/patches/wayland/aarch64/003-fix-wayland-compile.patch @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) diff --git a/src/util/platform_misc_unix.cpp b/src/util/platform_misc_unix.cpp index 1f7ae9ec..e0487476 100644 diff --git a/packages/emulators/standalone/duckstation-sa/scripts/start_duckstation.sh b/packages/emulators/standalone/duckstation-sa/scripts/start_duckstation.sh index 7a6cded48..2ddb93d49 100644 --- a/packages/emulators/standalone/duckstation-sa/scripts/start_duckstation.sh +++ b/packages/emulators/standalone/duckstation-sa/scripts/start_duckstation.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 duckstation-nogui" diff --git a/packages/emulators/standalone/flycast-sa/package.mk b/packages/emulators/standalone/flycast-sa/package.mk index 6f63edc5b..9f9433dca 100644 --- a/packages/emulators/standalone/flycast-sa/package.mk +++ b/packages/emulators/standalone/flycast-sa/package.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert) -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="flycast-sa" PKG_VERSION="f4f087a6ea83a5483dedf23ad2b38763988eccc5" diff --git a/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh b/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh index 7dbfbdbef..73ecbad21 100644 --- a/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh +++ b/packages/emulators/standalone/flycast-sa/scripts/start_flycast.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 flycast" diff --git a/packages/emulators/standalone/gzdoom-sa/zmusic/package.mk b/packages/emulators/standalone/gzdoom-sa/zmusic/package.mk index 98aa911ea..cc2c66eb5 100644 --- a/packages/emulators/standalone/gzdoom-sa/zmusic/package.mk +++ b/packages/emulators/standalone/gzdoom-sa/zmusic/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="zmusic" -PKG_VERSION="d8e6e28879ee97d00ce0eb9ad13ba462d85faf29" +PKG_VERSION="5ce525efc75a97d1391b46cca4def41a13ff1619" PKG_LICENSE="GPL" PKG_SITE="https://github.com/coelckers/ZMusic" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/standalone/kronos-sa/config/kronos.ini b/packages/emulators/standalone/kronos-sa/config/kronos.ini index a9e60cd20..bf131f8da 100644 --- a/packages/emulators/standalone/kronos-sa/config/kronos.ini +++ b/packages/emulators/standalone/kronos-sa/config/kronos.ini @@ -24,7 +24,7 @@ General\ScreenshotsDirectory=/storage/screenshots General\ScreenshotsFormat=bmp General\ShowFPS=false General\SystemLanguageID=0 -General\Translation= +General\Translation=# General\Version=2.5.0 Input\GunMouseSensitivity=100 Input\PerCore=3 diff --git a/packages/emulators/standalone/kronos-sa/scripts/start_kronos.sh b/packages/emulators/standalone/kronos-sa/scripts/start_kronos.sh index f15a07173..ca6b57b53 100644 --- a/packages/emulators/standalone/kronos-sa/scripts/start_kronos.sh +++ b/packages/emulators/standalone/kronos-sa/scripts/start_kronos.sh @@ -89,7 +89,6 @@ case ${USE_VSYNC} in esac COMPUTE_SHADER=$(get_setting gpu_rgb saturn "${GAME}") -Video\compute_shader_mode case ${COMPUTE_SHADER} in 1) #gpu diff --git a/packages/emulators/standalone/melonds-sa/package.mk b/packages/emulators/standalone/melonds-sa/package.mk index 650a607b6..0519c718f 100644 --- a/packages/emulators/standalone/melonds-sa/package.mk +++ b/packages/emulators/standalone/melonds-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="melonds-sa" PKG_LICENSE="GPLv3" diff --git a/packages/emulators/standalone/melonds-sa/patches/003-fix-audio.patch b/packages/emulators/standalone/melonds-sa/patches/003-fix-audio.patch index 960c34996..3ca068fba 100644 --- a/packages/emulators/standalone/melonds-sa/patches/003-fix-audio.patch +++ b/packages/emulators/standalone/melonds-sa/patches/003-fix-audio.patch @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) diff --git a/src/frontend/qt_sdl/Platform.cpp b/src/frontend/qt_sdl/Platform.cpp index f9eaf42..ff4bc03 100644 diff --git a/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh b/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh index ca4c4ac24..2f72a3f10 100644 --- a/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh +++ b/packages/emulators/standalone/melonds-sa/scripts/start_melonds.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh index c53b40557..003751db4 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/scripts/start_mupen64plus.sh @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC) -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk index 86357a1b4..cb0e7b192 100644 --- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk +++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-video-gliden64/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="mupen64plus-sa-video-gliden64" -PKG_VERSION="0fee30d010d1feda7d343654871b3dfd05ccab70" +PKG_VERSION="a367b3eef3d7b173fb60587c4371de93f0c7c59f" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/gonetz/GLideN64" PKG_URL="${PKG_SITE}.git" diff --git a/packages/emulators/standalone/nanoboyadvance-sa/package.mk b/packages/emulators/standalone/nanoboyadvance-sa/package.mk index 0a669ee28..15b3c920e 100644 --- a/packages/emulators/standalone/nanoboyadvance-sa/package.mk +++ b/packages/emulators/standalone/nanoboyadvance-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="nanoboyadvance-sa" PKG_VERSION="3bb6f478f977dbfd3106508536e5fbce90d1898b" diff --git a/packages/emulators/standalone/nanoboyadvance-sa/scripts/start_nanoboyadvance.sh b/packages/emulators/standalone/nanoboyadvance-sa/scripts/start_nanoboyadvance.sh index 44f1b2088..128d5bbb2 100644 --- a/packages/emulators/standalone/nanoboyadvance-sa/scripts/start_nanoboyadvance.sh +++ b/packages/emulators/standalone/nanoboyadvance-sa/scripts/start_nanoboyadvance.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 NanoBoyAdvance" diff --git a/packages/emulators/standalone/ppsspp-sa/package.mk b/packages/emulators/standalone/ppsspp-sa/package.mk index d2eb353ec..fb0cca5b5 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="03bd7c1cacf0d9849edc60905e6b737fea1abb81" +PKG_VERSION="58e12acee4d7829ee675ce95f3d377c3aaa3ecc5" PKG_LICENSE="GPLv2" PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip" PKG_SHORTDESC="PPSSPPDL" diff --git a/packages/emulators/standalone/primehack/package.mk b/packages/emulators/standalone/primehack/package.mk index f0f7e3628..26cb2955d 100755 --- a/packages/emulators/standalone/primehack/package.mk +++ b/packages/emulators/standalone/primehack/package.mk @@ -1,12 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="primehack" PKG_LICENSE="GPLv2" PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb zstd ecm" PKG_SITE="https://github.com/shiiion/dolphin" PKG_URL="${PKG_SITE}.git" -PKG_VERSION="48dbd3a4a7249948d3e7e21b20842d493c3b00cb" +PKG_VERSION="d65c10ef85bf14cadd660d5f07c88f40f8b7fec5" PKG_GIT_CLONE_BRANCH="master" PKG_LONGDESC="PrimeHack – A Dolphin Emulator fork for Metroid Prime Trilogy." PKG_PATCH_DIRS+=" wayland" diff --git a/packages/emulators/standalone/primehack/scripts/start_primehack.sh b/packages/emulators/standalone/primehack/scripts/start_primehack.sh index d162f80b8..7650b5fa1 100755 --- a/packages/emulators/standalone/primehack/scripts/start_primehack.sh +++ b/packages/emulators/standalone/primehack/scripts/start_primehack.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/rpcs3-sa/package.mk b/packages/emulators/standalone/rpcs3-sa/package.mk index 6355768a6..d7bd98005 100644 --- a/packages/emulators/standalone/rpcs3-sa/package.mk +++ b/packages/emulators/standalone/rpcs3-sa/package.mk @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com) -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="rpcs3-sa" PKG_VERSION="7081b89e976ad7f931c926022bd93ddd9778347c" diff --git a/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh b/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh index d9bc8d2e8..c9d16de86 100755 --- a/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh +++ b/packages/emulators/standalone/rpcs3-sa/scripts/start_rpcs3.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/standalone/ryujinx-sa/package.mk b/packages/emulators/standalone/ryujinx-sa/package.mk index 7b028f12b..d0abd1c99 100644 --- a/packages/emulators/standalone/ryujinx-sa/package.mk +++ b/packages/emulators/standalone/ryujinx-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="ryujinx-sa" PKG_VERSION="1.1.999" diff --git a/packages/emulators/standalone/ryujinx-sa/scripts/start_ryujinx.sh b/packages/emulators/standalone/ryujinx-sa/scripts/start_ryujinx.sh index dfb3ef24f..7a2104ba7 100644 --- a/packages/emulators/standalone/ryujinx-sa/scripts/start_ryujinx.sh +++ b/packages/emulators/standalone/ryujinx-sa/scripts/start_ryujinx.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 Ryujinx" diff --git a/packages/emulators/standalone/vita3k-sa/package.mk b/packages/emulators/standalone/vita3k-sa/package.mk index 2b6c790bf..0fdf101ef 100644 --- a/packages/emulators/standalone/vita3k-sa/package.mk +++ b/packages/emulators/standalone/vita3k-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="vita3k-sa" PKG_VERSION="564417b3b6a31296a2a09912c249a0145376e3c8" diff --git a/packages/emulators/standalone/vita3k-sa/scripts/start_vita3k.sh b/packages/emulators/standalone/vita3k-sa/scripts/start_vita3k.sh index e818276b1..415e268cf 100644 --- a/packages/emulators/standalone/vita3k-sa/scripts/start_vita3k.sh +++ b/packages/emulators/standalone/vita3k-sa/scripts/start_vita3k.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 Vita3K" diff --git a/packages/emulators/standalone/xemu-sa/package.mk b/packages/emulators/standalone/xemu-sa/package.mk index e082299c2..227d77661 100644 --- a/packages/emulators/standalone/xemu-sa/package.mk +++ b/packages/emulators/standalone/xemu-sa/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="xemu-sa" PKG_VERSION="v0.7.117" diff --git a/packages/emulators/standalone/xemu-sa/scripts/start_xemu.sh b/packages/emulators/standalone/xemu-sa/scripts/start_xemu.sh index 68e5b9085..43744de7d 100755 --- a/packages/emulators/standalone/xemu-sa/scripts/start_xemu.sh +++ b/packages/emulators/standalone/xemu-sa/scripts/start_xemu.sh @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile jslisten set "-9 xemu" diff --git a/packages/emulators/standalone/yuzu-sa/package.mk b/packages/emulators/standalone/yuzu-sa/package.mk index c91f59daa..f570724d5 100644 --- a/packages/emulators/standalone/yuzu-sa/package.mk +++ b/packages/emulators/standalone/yuzu-sa/package.mk @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="yuzu-sa" -PKG_VERSION="875568bb3e34725578f7fa3661c8bad89f23a173" +PKG_VERSION="e3578966742aa1e4fd368de35aecce2a0bf45296" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/yuzu-emu/yuzu" diff --git a/packages/emulators/standalone/yuzu-sa/scripts/start_yuzu.sh b/packages/emulators/standalone/yuzu-sa/scripts/start_yuzu.sh index 58a1ddeb1..b3039a738 100755 --- a/packages/emulators/standalone/yuzu-sa/scripts/start_yuzu.sh +++ b/packages/emulators/standalone/yuzu-sa/scripts/start_yuzu.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/emulators/tools/control-gen/Makefile b/packages/emulators/tools/control-gen/Makefile index 02335312f..2cbe7e5c7 100644 --- a/packages/emulators/tools/control-gen/Makefile +++ b/packages/emulators/tools/control-gen/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) CXX ?= gcc CCFLAGS = -W -Wall -std=c++11 `sdl2-config --cflags` diff --git a/packages/emulators/tools/control-gen/control-gen.cpp b/packages/emulators/tools/control-gen/control-gen.cpp index 8b5396cb7..62cfc1b1c 100644 --- a/packages/emulators/tools/control-gen/control-gen.cpp +++ b/packages/emulators/tools/control-gen/control-gen.cpp @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +// Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) #include #include diff --git a/packages/emulators/tools/control-gen/package.mk b/packages/emulators/tools/control-gen/package.mk index 7c4bd4405..c0d614aea 100644 --- a/packages/emulators/tools/control-gen/package.mk +++ b/packages/emulators/tools/control-gen/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="control-gen" PKG_VERSION="16179c655447007c2580243659fc36a34e6a749d" diff --git a/packages/emulators/tools/control-gen/scripts/control-gen_init.sh b/packages/emulators/tools/control-gen/scripts/control-gen_init.sh index e6029fb5d..318bbe196 100644 --- a/packages/emulators/tools/control-gen/scripts/control-gen_init.sh +++ b/packages/emulators/tools/control-gen/scripts/control-gen_init.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) #Check if gptokeyb exists in .config if [ ! -d "/storage/.config/gptokeyb" ]; then diff --git a/packages/graphics/SDL2/SDL_sound/package.mk b/packages/graphics/SDL2/SDL_sound/package.mk index c787d82a3..58cea1184 100644 --- a/packages/graphics/SDL2/SDL_sound/package.mk +++ b/packages/graphics/SDL2/SDL_sound/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="SDL_sound" -PKG_VERSION="253b00c" +PKG_VERSION="c5639414c1bb24fb4eef5861c13adb42a4aab950" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/icculus/SDL_sound" PKG_URL="${PKG_SITE}.git" diff --git a/packages/graphics/gl4es/package.mk b/packages/graphics/gl4es/package.mk index e5fab3c35..a1438584c 100644 --- a/packages/graphics/gl4es/package.mk +++ b/packages/graphics/gl4es/package.mk @@ -20,7 +20,7 @@ case ${DEVICE} in *) PKG_SITE="https://github.com/ptitSeb/gl4es" PKG_URL="${PKG_SITE}.git" - PKG_VERSION="e39434a" + PKG_VERSION="e39434a2b17d12be569a1406f3bd23ac6a231347" ;; esac diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index 01bbe1af3..ca16bf64a 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="glew" PKG_VERSION="2.2.0" diff --git a/packages/graphics/imagemagick/package.mk b/packages/graphics/imagemagick/package.mk index 2aa6b3d8d..85ac4d238 100644 --- a/packages/graphics/imagemagick/package.mk +++ b/packages/graphics/imagemagick/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="imagemagick" -PKG_VERSION="58d86e4" +PKG_VERSION="f65eba252e3aa387bd99297a750a2ee250664f8c" PKG_LICENSE="http://www.imagemagick.org/script/license.php" PKG_SITE="https://github.com/ImageMagick/ImageMagick" PKG_URL="${PKG_SITE}.git" diff --git a/packages/graphics/libegl/package.mk b/packages/graphics/libegl/package.mk index a1bd5820d..89ad2c2dc 100644 --- a/packages/graphics/libegl/package.mk +++ b/packages/graphics/libegl/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libegl" PKG_VERSION="1.0" diff --git a/packages/graphics/libmali-vulkan/package.mk b/packages/graphics/libmali-vulkan/package.mk index 7f86de45c..fe4911305 100644 --- a/packages/graphics/libmali-vulkan/package.mk +++ b/packages/graphics/libmali-vulkan/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libmali-vulkan" PKG_VERSION="r46p0-01eac1" diff --git a/packages/graphics/libwebp/package.mk b/packages/graphics/libwebp/package.mk index d21f3ecc0..aa5174196 100644 --- a/packages/graphics/libwebp/package.mk +++ b/packages/graphics/libwebp/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libwebp" PKG_VERSION="89c5b917463c07bfb5b6390b81d258c49d5fe8c6" diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 17f6c83d9..40dfdc56c 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -18,11 +18,10 @@ case ${DEVICE} in ;; RK3399|RK3566*) #Upstream Mesa appears to be broken on the RK3399 build currently PKG_VERSION="22.3.7" - PKG_SHA256="894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c" PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz" ;; *) - PKG_VERSION="23.3.0" + PKG_VERSION="23.3.1" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz" ;; @@ -49,14 +48,23 @@ PKG_MESON_OPTS_TARGET="-Dgallium-drivers=${GALLIUM_DRIVERS// /,} \ if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd glfw" export X11_INCLUDES= - PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true" + PKG_MESON_OPTS_TARGET+=" -Dplatforms=x11 \ + -Ddri3=enabled \ + -Dglx=dri \ + -Dglvnd=true" elif [ "${DISPLAYSERVER}" = "wl" ]; then PKG_DEPENDS_TARGET+=" wayland wayland-protocols libglvnd glfw" - PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland,x11 -Ddri3=enabled -Dglx=dri -Dglvnd=true" + PKG_MESON_OPTS_TARGET+=" -Dplatforms=wayland,x11 \ + -Ddri3=enabled \ + -Dglx=dri \ + -Dglvnd=true" PKG_DEPENDS_TARGET+=" xorgproto libXext libXdamage libXfixes libXxf86vm libxcb libX11 libxshmfence libXrandr libglvnd" export X11_INCLUDES= else - PKG_MESON_OPTS_TARGET+=" -Dplatforms="" -Ddri3=disabled -Dglx=disabled -Dglvnd=false" + PKG_MESON_OPTS_TARGET+=" -Dplatforms="" \ + -Ddri3=disabled \ + -Dglx=disabled \ + -Dglvnd=false" fi if [ "${LLVM_SUPPORT}" = "yes" ]; then diff --git a/packages/graphics/plymouth-lite/package.mk b/packages/graphics/plymouth-lite/package.mk index 59fdbcef7..50fcb6b18 100644 --- a/packages/graphics/plymouth-lite/package.mk +++ b/packages/graphics/plymouth-lite/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) PKG_NAME="plymouth-lite" -PKG_VERSION="8a3205c" +PKG_VERSION="8a3205c99f947d739c05bac8ca69561194e06c2c" PKG_LICENSE="GPL" PKG_SITE="https://github.com/JustEnoughLinuxOS/plymouth-lite" PKG_URL="${PKG_SITE}.git" diff --git a/packages/graphics/qt6/package.mk b/packages/graphics/qt6/package.mk new file mode 100644 index 000000000..b21b9dc03 --- /dev/null +++ b/packages/graphics/qt6/package.mk @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="qt6" +PKG_MAJOR_VERSION="6.6" +PKG_VERSION="${PKG_MAJOR_VERSION}.1" +PKG_LICENSE="GPLv3" +PKG_SITE="https://download.qt.io" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="Qt6 - Qt is a full development framework with tools designed to streamline the creation of applications and user interfaces for desktop, embedded, and mobile platforms." + +PKG_DEPENDS_TARGET+=" qt6base qt6tools qt6wayland" diff --git a/packages/graphics/qt6/qt6base/package.mk b/packages/graphics/qt6/qt6base/package.mk new file mode 100644 index 000000000..95059d349 --- /dev/null +++ b/packages/graphics/qt6/qt6base/package.mk @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="qt6base" +PKG_MAJOR_VERSION="6.6" +PKG_VERSION="${PKG_MAJOR_VERSION}.1" +PKG_LICENSE="GPLv3" +PKG_SITE="https://download.qt.io" +PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qtbase-everywhere-src-${PKG_VERSION}.tar.xz" +PKG_DEPENDS_HOST="toolchain:host" +PKG_DEPENDS_TARGET="toolchain qt6base:host xorgproto" +PKG_LONGDESC="QT6 base package" + +pre_configure_host() { +PKG_CMAKE_OPTS_HOST+=" + -GNinja \ + -DFEATURE_gui=ON \ + -DFEATURE_openssl_linked=ON \ + -DFEATURE_concurrent=ON \ + -DFEATURE_xml=ON \ + -DFEATURE_sql=ON \ + -DFEATURE_testlib=ON \ + -DFEATURE_network=ON \ + -DFEATURE_dbus=ON \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON \ + -DQT_BUILD_TESTS_BY_DEFAULT=OFF \ + -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF \ + -DCMAKE_CROSSCOMPILING=OFF" +} + +pre_configure_target() { + PKG_CMAKE_OPTS_TARGET+=" + -GNinja \ + -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-linux-gnu \ + -DFEATURE_gui=ON \ + -DFEATURE_concurrent=OFF \ + -DFEATURE_xml=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_testlib=OFF \ + -DFEATURE_network=ON \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_doubleconversion=OFF \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_libudev=ON\ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DFEATURE_png=ON\ + -DFEATURE_system_png=ON \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DFEATURE_vulkan=OFF \ + -DFEATURE_dbus=ON" + +} + +make_host() { + ninja ${NINJA_OPTS} +} diff --git a/packages/graphics/qt6/qt6tools/package.mk b/packages/graphics/qt6/qt6tools/package.mk new file mode 100644 index 000000000..7474accab --- /dev/null +++ b/packages/graphics/qt6/qt6tools/package.mk @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="qt6tools" +PKG_MAJOR_VERSION="6.6" +PKG_VERSION="${PKG_MAJOR_VERSION}.1" +PKG_LICENSE="GPLv3" +PKG_SITE="https://download.qt.io" +PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qttools-everywhere-src-${PKG_VERSION}.tar.xz" +PKG_DEPENDS_HOST="toolchain:host qt6base" +PKG_DEPENDS_TARGET="toolchain qt6tools:host qt6base" +PKG_LONGDESC="QT6 Tools package" + +pre_configure_host() { + PKG_CMAKE_OPTS_HOST+=" -GNinja \ + -DQT_FEATURE_linguist=ON \ + -DQT_FEATURE_qdbus=OFF \ + -DQT_FEATURE_qtattributionsscanner=ON \ + -DQT_FEATURE_qtdiag=ON \ + -DQT_FEATURE_qtplugininfo=ON \ + -DCMAKE_CROSSCOMPILING=OFF" +} + +pre_configure_target() { + PKG_CMAKE_OPTS_TARGET+=" -GNinja \ + -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-linux-gnu \ + -DQT_FEATURE_linguist=ON \ + -DQT_FEATURE_qdbus=ON \ + -DQT_DEBUG_FIND_PACKAGE=ON + -DQT_FEATURE_qtattributionsscanner=ON \ + -DQT_FEATURE_qtdiag=ON \ + -DQT_FEATURE_qtplugininfo=ON \ + -DQT_BUILD_TESTS_BY_DEFAULT=OFF \ + -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF \ + -DQT_FEATURE_LinguistTools=OFF" +} + + +make_host() { + ninja ${NINJA_OPTS} +} diff --git a/packages/graphics/qt6/qt6wayland/package.mk b/packages/graphics/qt6/qt6wayland/package.mk new file mode 100644 index 000000000..fc2178e90 --- /dev/null +++ b/packages/graphics/qt6/qt6wayland/package.mk @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS) + +PKG_NAME="qt6wayland" +PKG_MAJOR_VERSION="6.6" +PKG_VERSION="${PKG_MAJOR_VERSION}.1" +PKG_LICENSE="GPLv3" +PKG_SITE="https://download.qt.io" +PKG_URL="${PKG_SITE}/archive/qt/${PKG_MAJOR_VERSION}/${PKG_VERSION}/submodules/qtwayland-everywhere-src-${PKG_VERSION}.tar.xz" +PKG_DEPENDS_HOST="toolchain:host qt6base" +PKG_DEPENDS_TARGET="toolchain qt6wayland:host qt6base" +PKG_LONGDESC="QT6 wayland" + +pre_configure_host() { + PKG_CMAKE_OPTS_HOST+=" -GNinja \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DCMAKE_CROSSCOMPILING=OFF" +} + +pre_configure_target() { + PKG_CMAKE_OPTS_TARGET+=" -GNinja \ + -DQT_HOST_PATH=${PKG_BUILD}/.x86_64-linux-gnu \ + -DQT_DEBUG_FIND_PACKAGE=ON \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF" +} + +make_host() { + ninja ${NINJA_OPTS} +} diff --git a/packages/graphics/wxwidgets/package.mk b/packages/graphics/wxwidgets/package.mk index 45956a3fc..2c2941a4d 100644 --- a/packages/graphics/wxwidgets/package.mk +++ b/packages/graphics/wxwidgets/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="wxwidgets" -PKG_VERSION="b958f602fa1cdd77ee3d6a77537d4d3850d8230a" +PKG_VERSION="299b51d493da28f919029c75c231e11114f1a420" PKG_LICENSE="wxWindows Library Licence" PKG_SITE="https://github.com/wxWidgets/wxWidgets" PKG_URL="${PKG_SITE}.git" diff --git a/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config b/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config index 161fa2c34..65b60bc8f 100644 --- a/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config +++ b/packages/hardware/quirks/devices/Anbernic RG351M/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/Anbernic RG351M/050-game_configs b/packages/hardware/quirks/devices/Anbernic RG351M/050-game_configs index 182b3b3f4..88f79e326 100644 --- a/packages/hardware/quirks/devices/Anbernic RG351M/050-game_configs +++ b/packages/hardware/quirks/devices/Anbernic RG351M/050-game_configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Anbernic RG351V/001-deviceconfig b/packages/hardware/quirks/devices/Anbernic RG351V/001-device_config similarity index 87% rename from packages/hardware/quirks/devices/Anbernic RG351V/001-deviceconfig rename to packages/hardware/quirks/devices/Anbernic RG351V/001-device_config index cd7c1aba0..311386881 100644 --- a/packages/hardware/quirks/devices/Anbernic RG351V/001-deviceconfig +++ b/packages/hardware/quirks/devices/Anbernic RG351V/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/Anbernic RG351V/004-game-configs b/packages/hardware/quirks/devices/Anbernic RG351V/004-game-configs index 50ebeb04e..020dc4e00 100644 --- a/packages/hardware/quirks/devices/Anbernic RG351V/004-game-configs +++ b/packages/hardware/quirks/devices/Anbernic RG351V/004-game-configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Anbernic RG353P/050-game_configs b/packages/hardware/quirks/devices/Anbernic RG353P/050-game_configs index e96f4f3c8..50b56be0c 100755 --- a/packages/hardware/quirks/devices/Anbernic RG353P/050-game_configs +++ b/packages/hardware/quirks/devices/Anbernic RG353P/050-game_configs @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Anbernic RG353V/001-device_config b/packages/hardware/quirks/devices/Anbernic RG353V/001-device_config index 43c88d32e..6b50cd834 100755 --- a/packages/hardware/quirks/devices/Anbernic RG353V/001-device_config +++ b/packages/hardware/quirks/devices/Anbernic RG353V/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config DEVICE_FAKE_JACKSENSE="true" DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="true" diff --git a/packages/hardware/quirks/devices/Anbernic RG503/001-device_config b/packages/hardware/quirks/devices/Anbernic RG503/001-device_config index 0faaa862b..d22c7d2fa 100755 --- a/packages/hardware/quirks/devices/Anbernic RG503/001-device_config +++ b/packages/hardware/quirks/devices/Anbernic RG503/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config DEVICE_FAKE_JACKSENSE="false" DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/Anbernic RG503/050-game_configs b/packages/hardware/quirks/devices/Anbernic RG503/050-game_configs index f43838a03..6e0a09d91 100755 --- a/packages/hardware/quirks/devices/Anbernic RG503/050-game_configs +++ b/packages/hardware/quirks/devices/Anbernic RG503/050-game_configs @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Anbernic RG552/030-enable_wifi b/packages/hardware/quirks/devices/Anbernic RG552/030-enable_wifi index 73a8134a6..5552ff87c 100755 --- a/packages/hardware/quirks/devices/Anbernic RG552/030-enable_wifi +++ b/packages/hardware/quirks/devices/Anbernic RG552/030-enable_wifi @@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile.d/001-functions diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-device_config b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-device_config index eff112076..99e288cba 100644 --- a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-device_config +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config DEVICE_FAKE_JACKSENSE="true" DEVICE_HEADPHONE_DEV="/dev/input/by-path/platform-hp-detect-switch-event" DEVICE_VOLUMECTL="true" diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-game_configs b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-game_configs index ad4341ccc..ce4c66630 100644 --- a/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-game_configs +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-GO-Ultra/050-game_configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config index 40afabccd..dbe8fe042 100755 --- a/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config +++ b/packages/hardware/quirks/devices/Hardkernel ODROID-N2/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_VOLUME="100" diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config index ca36d07df..cccef9a72 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config +++ b/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/001-device_config @@ -1,8 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/050-game_configs b/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/050-game_configs index 79cd5552d..b1af9bcb2 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/050-game_configs +++ b/packages/hardware/quirks/devices/ODROID-GO Advance Black Edition/050-game_configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config index b0a30ac3c..32b2e47da 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config +++ b/packages/hardware/quirks/devices/ODROID-GO Advance/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/ODROID-GO Advance/050-game_configs b/packages/hardware/quirks/devices/ODROID-GO Advance/050-game_configs index 6f64ff578..74e70f049 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Advance/050-game_configs +++ b/packages/hardware/quirks/devices/ODROID-GO Advance/050-game_configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config b/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config index cdf836298..8990267f6 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config +++ b/packages/hardware/quirks/devices/ODROID-GO Super/001-device_config @@ -1,8 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/hardware/quirks/devices/ODROID-GO Super/050-game_configs b/packages/hardware/quirks/devices/ODROID-GO Super/050-game_configs index 1df1ecbe4..dbc526041 100644 --- a/packages/hardware/quirks/devices/ODROID-GO Super/050-game_configs +++ b/packages/hardware/quirks/devices/ODROID-GO Super/050-game_configs @@ -1,6 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-game_configs b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-game_configs index ad4341ccc..ce4c66630 100755 --- a/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-game_configs +++ b/packages/hardware/quirks/devices/Powkiddy RGB10 MAX 3/050-game_configs @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Powkiddy RGB30/050-game_configs b/packages/hardware/quirks/devices/Powkiddy RGB30/050-game_configs index e96f4f3c8..50b56be0c 100755 --- a/packages/hardware/quirks/devices/Powkiddy RGB30/050-game_configs +++ b/packages/hardware/quirks/devices/Powkiddy RGB30/050-game_configs @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Powkiddy RK2023/050-game_configs b/packages/hardware/quirks/devices/Powkiddy RK2023/050-game_configs index e96f4f3c8..50b56be0c 100755 --- a/packages/hardware/quirks/devices/Powkiddy RK2023/050-game_configs +++ b/packages/hardware/quirks/devices/Powkiddy RK2023/050-game_configs @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/devices/Powkiddy x55/050-game_configs b/packages/hardware/quirks/devices/Powkiddy x55/050-game_configs index e96f4f3c8..50b56be0c 100755 --- a/packages/hardware/quirks/devices/Powkiddy x55/050-game_configs +++ b/packages/hardware/quirks/devices/Powkiddy x55/050-game_configs @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/hardware/quirks/platforms/S922X/001-device_config b/packages/hardware/quirks/platforms/S922X/001-device_config index e5e2368d9..13632dfc6 100755 --- a/packages/hardware/quirks/platforms/S922X/001-device_config +++ b/packages/hardware/quirks/platforms/S922X/001-device_config @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) -cat </storage/.config/profile.d/001-deviceconfig +cat </storage/.config/profile.d/001-device_config # Device Features DEVICE_VOLUMECTL="true" DEVICE_POWER_LED="false" diff --git a/packages/jelos/sources/scripts/automount b/packages/jelos/sources/scripts/automount index e46fd2ba2..43f60bc32 100755 --- a/packages/jelos/sources/scripts/automount +++ b/packages/jelos/sources/scripts/automount @@ -40,6 +40,15 @@ function start_ms() { ;; esac + for GAME_PATH in internal external + do + if [ ! -d "/storage/games-${GAME_PATH}/roms" ] + then + log $0 "Create /storage/games-${GAME_PATH}/roms." + mkdir -p "/storage/games-${GAME_PATH}/roms" + fi + done + MS_ENABLED=$(get_setting system.merged.storage) if [ -e "/storage/.ms_unsupported" ] || \ [ ! "${MS_ENABLED}" = 1 ] diff --git a/packages/jelos/sources/scripts/getoverlays b/packages/jelos/sources/scripts/getoverlays new file mode 100755 index 000000000..ad3813597 --- /dev/null +++ b/packages/jelos/sources/scripts/getoverlays @@ -0,0 +1,11 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2020-present Shanti Gilbert (https://github.com/shantigilbert) +# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) + + +find /storage/overlays/ -name '*.cfg' -print0 | + while IFS= read -r -d '' line; do + echo ${line#/storage/overlays/}, +done diff --git a/packages/jelos/sources/scripts/setsettings.sh b/packages/jelos/sources/scripts/setsettings.sh index b862cef62..ac1e86024 100755 --- a/packages/jelos/sources/scripts/setsettings.sh +++ b/packages/jelos/sources/scripts/setsettings.sh @@ -637,6 +637,11 @@ function set_aspectratio() { done ;; esac +# add_setting "positionx" "custom_viewport_x" +# add_setting "positiony" "custom_viewport_y" +# add_setting "width" "custom_viewport_width" +# add_setting "height" "custom_viewport_height" + add_setting "rotation" "video_rotation" } function set_filtering() { @@ -645,6 +650,7 @@ function set_filtering() { function set_integerscale() { add_setting "integerscale" "video_scale_integer" + add_setting "integerscaleoverscale" "video_scale_integer_overscale" } function set_rgascale() { @@ -688,6 +694,21 @@ function set_filter() { esac } +function set_overlay() { + local OVERLAY="$(game_setting overlayset)" + case ${OVERLAY} in + 0|false|none) + add_setting "none" "input_overlay_enable" "false" + add_setting "none" "input_overlay" "" + ;; + *) + local OVERLAY_PATH="/storage/overlays" + add_setting "none" "input_overlay_enable" "true" + add_setting "none" "input_overlay" "${OVERLAY_PATH}/${OVERLAY}" + ;; + esac +} + function set_rewind() { local REWIND="$(game_setting rewind)" case ${REWIND} in @@ -861,6 +882,37 @@ function set_n64opts() { fi } +function set_saturnopts() { + log "Set up Saturn..." + if [ "${CORE}" = "kronos" ] + then + log "Set up Kronos..." + local KRONOSDIR="${RETROARCH_PATH}/Kronos/config/Kronos" + if [ ! -d "${KRONOSDIR}" ] + then + mkdir -p "${KRONOSDIR}" + fi + + if [ ! -f "${KRONOSDIR}/Kronos.opt" ] + then + cp "/usr/config/retroarch/Kronos.opt" "${KRONOSDIR}/Kronos.opt" + fi + local KRONOSOPT="${KRONOSDIR}/Kronos.opt" + local HLE_BIOS="$(game_setting force_hle_bios)" + sed -i '/kronos_force_hle_bios = /c\kronos_force_hle_bios = "'${HLE_BIOS}'"' "${KRONOSOPT}" + local ADDON_CART="$(game_setting addon_cartridge)" + sed -i '/kronos_addon_cartridge = /c\kronos_addon_cartridge = "'${ADDON_CART}'"' "${KRONOSOPT}" + local TESSELATION="$(game_setting tesselation)" + sed -i '/kronos_polygon_mode = /c\kronos_polygon_mode = "'${TESSELATION}'"' "${KRONOSOPT}" + local RESOLUTION="$(game_setting resolution)" + sed -i '/kronos_resolution_mode = /c\kronos_resolution_mode = "'${RESOLUTION}'"' "${KRONOSOPT}" + local COMPUTE_SHADER="$(game_setting compute_shader)" + sed -i '/kronos_use_cs = /c\kronos_use_cs = "'${COMPUTE_SHADER}'"' "${KRONOSOPT}" + local TRANSPARENCY="$(game_setting transparency)" + sed -i '/kronos_mesh_mode = /c\kronos_mesh_mode = "'${TRANSPARENCY}'"' "${KRONOSOPT}" + fi +} + function set_dreamcastopts() { log "Set up Dreamcast..." if [ "${CORE}" = "flycast" ] @@ -948,7 +1000,7 @@ function set_gambatte() { echo 'gambatte_gb_palette_twb64_1 = "'${TWB1_COLORIZATION}'"' >> ${GAMBATTECONF} echo 'gambatte_gb_palette_twb64_2 = "'${TWB2_COLORIZATION}'"' >> ${GAMBATTECONF} echo 'gambatte_gb_palette_twb64_3 = "'${TWB3_COLORIZATION}'"' >> ${GAMBATTECONF} - echo 'gambatte_gb_palette_pixelshift_1 = "'${PIXELSHIFT1_COLORIZATION}'"' >> ${GAMBATTECONF} + echo 'gambatte_gb_palette_pixelshift_1 = "'${PIXELSHIFT1_COLORIZATION}'"' >> ${GAMBATTECONF} ;; esac fi @@ -1012,6 +1064,7 @@ set_integerscale & set_rgascale & set_shader & set_filter & +set_overlay & set_rewind & set_savestates & set_autosave & @@ -1021,6 +1074,7 @@ set_audiolatency & set_analogsupport & set_tatemode & set_n64opts & +set_saturnopts & set_dreamcastopts & ### Sed operations are expensive, so they are staged and executed as diff --git a/packages/kernel/linux-drivers/RTL8812AU/package.mk b/packages/kernel/linux-drivers/RTL8812AU/package.mk index 49143978c..3f248dc55 100644 --- a/packages/kernel/linux-drivers/RTL8812AU/package.mk +++ b/packages/kernel/linux-drivers/RTL8812AU/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="RTL8812AU" -PKG_VERSION="e6a0d1704ccd31145800ff5eb09ec2435a02f995" +PKG_VERSION="fe35eddb562bba0d6b3dfaa5991fca0ea22ff915" PKG_LICENSE="GPL" PKG_SITE="https://github.com/morrownr/8812au-20210629" PKG_URL="${PKG_SITE}.git" diff --git a/packages/kernel/linux-drivers/RTL8814AU/package.mk b/packages/kernel/linux-drivers/RTL8814AU/package.mk index ad8124776..e8a23477e 100644 --- a/packages/kernel/linux-drivers/RTL8814AU/package.mk +++ b/packages/kernel/linux-drivers/RTL8814AU/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="RTL8814AU" -PKG_VERSION="f058ea8af3afd2a06b2a0a8bf8e2129bcb07d5f5" +PKG_VERSION="866a9100c7b3f6508b81b31a22cae19dcacdacb9" PKG_LICENSE="GPL" PKG_SITE="https://github.com/morrownr/8814au" PKG_URL="${PKG_SITE}.git" diff --git a/packages/kernel/linux-firmware/RTL8188FU-firmware/package.mk b/packages/kernel/linux-firmware/RTL8188FU-firmware/package.mk index 58c769fbb..215e62a8d 100644 --- a/packages/kernel/linux-firmware/RTL8188FU-firmware/package.mk +++ b/packages/kernel/linux-firmware/RTL8188FU-firmware/package.mk @@ -1,5 +1,5 @@ PKG_NAME="RTL8188FU-firmware" -PKG_VERSION="68ced40" +PKG_VERSION="68ced40d862d13663294496bac2e9a91ffa0e5c7" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kelebek333/rtl8188fu" PKG_URL="${PKG_SITE}.git" diff --git a/packages/kernel/linux-firmware/libmali_rk3588/package.mk b/packages/kernel/linux-firmware/libmali_rk3588/package.mk index b1cfa57ce..890a1d446 100755 --- a/packages/kernel/linux-firmware/libmali_rk3588/package.mk +++ b/packages/kernel/linux-firmware/libmali_rk3588/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libmali_rk3588" PKG_VERSION="1.0" diff --git a/packages/kernel/linux/package.mk b/packages/kernel/linux/package.mk index 02d2ca7b9..db530d5b6 100644 --- a/packages/kernel/linux/package.mk +++ b/packages/kernel/linux/package.mk @@ -4,7 +4,7 @@ PKG_NAME="linux" PKG_LICENSE="GPL" -PKG_VERSION="6.6.6" +PKG_VERSION="6.6.4" 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 rdfind:host" diff --git a/packages/lang/luajit/package.mk b/packages/lang/luajit/package.mk index bf2264727..73ddf6878 100644 --- a/packages/lang/luajit/package.mk +++ b/packages/lang/luajit/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2019 Trond Haugland (github.com/escalade) PKG_NAME="luajit" -PKG_VERSION="113a168" +PKG_VERSION="29b0b282f59ac533313199f4f7be79490b7eee51" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/LuaJIT/LuaJIT" diff --git a/packages/misc/modules/sources/Start PortMaster.sh b/packages/misc/modules/sources/Start PortMaster.sh index 196947fb9..a168058ab 100755 --- a/packages/misc/modules/sources/Start PortMaster.sh +++ b/packages/misc/modules/sources/Start PortMaster.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) (https://github.com/brooksytech +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) (https://github.com/brooksytech source /etc/profile diff --git a/packages/multimedia/gmu/package.mk b/packages/multimedia/gmu/package.mk index 7bfcc088d..9fcac4a26 100644 --- a/packages/multimedia/gmu/package.mk +++ b/packages/multimedia/gmu/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="gmu" -PKG_VERSION="3aed18b" +PKG_VERSION="3aed18be8a50873ccfb31d2b135b0d22442ded59" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/jhe2/gmu" PKG_URL="${PKG_SITE}.git" diff --git a/packages/multimedia/libplacebo/package.mk b/packages/multimedia/libplacebo/package.mk index 9f94130ba..0b45cd3a3 100644 --- a/packages/multimedia/libplacebo/package.mk +++ b/packages/multimedia/libplacebo/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libplacebo" -PKG_VERSION="c02c40cc3f5eb4fd736eebf6056ae4ec0df2448b" +PKG_VERSION="52314e0e435fbcb731e326815d4091ed0ba27475" PKG_LICENSE="GPLv2+" PKG_SITE="https://code.videolan.org/videolan/libplacebo" PKG_URL="${PKG_SITE}.git" diff --git a/packages/multimedia/libvpx/package.mk b/packages/multimedia/libvpx/package.mk index e4201a0b1..b467dc1c5 100644 --- a/packages/multimedia/libvpx/package.mk +++ b/packages/multimedia/libvpx/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libvpx" -PKG_VERSION="10b9492" # 1.13.1 +PKG_VERSION="df655cf4fb6c2a23b964544acd015cc715752830" # 1.13.1 PKG_LICENSE="BSD" PKG_SITE="https://github.com/webmproject/libvpx" PKG_URL="${PKG_SITE}.git" diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk index 4811c6e3e..09038748b 100644 --- a/packages/multimedia/rtmpdump/package.mk +++ b/packages/multimedia/rtmpdump/package.mk @@ -4,7 +4,6 @@ PKG_NAME="rtmpdump" PKG_VERSION="c5f04a58fc2aeea6296ca7c44ee4734c18401aa3" -PKG_SHA256="fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46" PKG_LICENSE="GPL" PKG_SITE="http://rtmpdump.mplayerhq.hu/" PKG_URL="http://repo.or.cz/rtmpdump.git/snapshot/${PKG_VERSION}.tar.gz" diff --git a/packages/network/rclone/package.mk b/packages/network/rclone/package.mk index ef0ba5335..b2535c52d 100644 --- a/packages/network/rclone/package.mk +++ b/packages/network/rclone/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="rclone" -PKG_VERSION="1.64.2" +PKG_VERSION="1.65.0" PKG_DEPENDS_TARGET="toolchain fuse rsync" PKG_SECTION="tools" PKG_SHORTDESC="rsync for cloud storage" diff --git a/packages/network/syncthing/package.mk b/packages/network/syncthing/package.mk index 1f27a83a8..af02deafb 100644 --- a/packages/network/syncthing/package.mk +++ b/packages/network/syncthing/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="syncthing" -PKG_VERSION="1.26.0" +PKG_VERSION="1.27.1" PKG_ARCH="any" PKG_LICENSE="MPLv2" PKG_SITE="https://syncthing.net/" diff --git a/packages/network/syncthing/patches/002-no-automatic-upgrade.patch b/packages/network/syncthing/patches/002-no-automatic-upgrade.patch new file mode 100644 index 000000000..9aefdc1af --- /dev/null +++ b/packages/network/syncthing/patches/002-no-automatic-upgrade.patch @@ -0,0 +1,58 @@ +diff -rupN syncthing.orig/cmd/syncthing/main.go syncthing/cmd/syncthing/main.go +--- syncthing.orig/cmd/syncthing/main.go 2023-12-16 12:40:52.535043816 +0000 ++++ syncthing/cmd/syncthing/main.go 2023-12-16 12:54:23.535684981 +0000 +@@ -600,24 +600,24 @@ func syncthingMain(options serveOptions) + // upgrade immediately. The auto-upgrade routine can only be started + // later after App is initialised. + +- autoUpgradePossible := autoUpgradePossible(options) +- if autoUpgradePossible && cfgWrapper.Options().AutoUpgradeEnabled() { ++ //autoUpgradePossible := autoUpgradePossible(options) ++ //if autoUpgradePossible && cfgWrapper.Options().AutoUpgradeEnabled() { + // try to do upgrade directly and log the error if relevant. +- release, err := initialAutoUpgradeCheck(db.NewMiscDataNamespace(ldb)) +- if err == nil { +- err = upgrade.To(release) +- } +- if err != nil { +- if _, ok := err.(*errNoUpgrade); ok || err == errTooEarlyUpgradeCheck || err == errTooEarlyUpgrade { +- l.Debugln("Initial automatic upgrade:", err) +- } else { +- l.Infoln("Initial automatic upgrade:", err) +- } +- } else { +- l.Infof("Upgraded to %q, exiting now.", release.Tag) +- os.Exit(svcutil.ExitUpgrade.AsInt()) +- } +- } ++ // release, err := initialAutoUpgradeCheck(db.NewMiscDataNamespace(ldb)) ++ // if err == nil { ++ // err = upgrade.To(release) ++ // } ++ // if err != nil { ++ // if _, ok := err.(*errNoUpgrade); ok || err == errTooEarlyUpgradeCheck || err == errTooEarlyUpgrade { ++ // l.Debugln("Initial automatic upgrade:", err) ++ // } else { ++ // l.Infoln("Initial automatic upgrade:", err) ++ // } ++ // } else { ++ // l.Infof("Upgraded to %q, exiting now.", release.Tag) ++ // os.Exit(svcutil.ExitUpgrade.AsInt()) ++ // } ++ //} + + if options.Unpaused { + setPauseState(cfgWrapper, false) +@@ -654,9 +654,9 @@ func syncthingMain(options serveOptions) + os.Exit(svcutil.ExitError.AsInt()) + } + +- if autoUpgradePossible { +- go autoUpgrade(cfgWrapper, app, evLogger) +- } ++ //if autoUpgradePossible { ++ // go autoUpgrade(cfgWrapper, app, evLogger) ++ //} + + setupSignalHandling(app) + diff --git a/packages/sysutils/drm_tool/package.mk b/packages/sysutils/drm_tool/package.mk index fcad68cb4..cdaf1f239 100644 --- a/packages/sysutils/drm_tool/package.mk +++ b/packages/sysutils/drm_tool/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="drm_tool" -PKG_VERSION="1cb5b10" +PKG_VERSION="1cb5b10b7d529105e33f27388519671ee7ce46f3" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/NickCis/drm_tool" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/ectool/package.mk b/packages/sysutils/ectool/package.mk index 81b5871af..da5943fa8 100644 --- a/packages/sysutils/ectool/package.mk +++ b/packages/sysutils/ectool/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="ectool" -PKG_VERSION="23c77ef0c32f9f03a367c89babb303dde526da85" +PKG_VERSION="053c901548b751dd10eeae5e0afae8359290bede" PKG_LICENSE="GPL" PKG_SITE="https://review.coreboot.org/coreboot" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/evtest/package.mk b/packages/sysutils/evtest/package.mk index eb87077c5..f4b686525 100644 --- a/packages/sysutils/evtest/package.mk +++ b/packages/sysutils/evtest/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="evtest" -PKG_VERSION="da347a8f" +PKG_VERSION="da347a8f88d2e5729dd12d61ee9743f902065b55" PKG_LICENSE="GPL" PKG_URL="https://gitlab.freedesktop.org/libevdev/evtest.git" PKG_DEPENDS_TARGET="toolchain libxml2" diff --git a/packages/sysutils/htop/package.mk b/packages/sysutils/htop/package.mk index 1203d9867..06c7e0e0f 100644 --- a/packages/sysutils/htop/package.mk +++ b/packages/sysutils/htop/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="htop" -PKG_VERSION="e207c8aebdcdb88bc8ab838e2ac3dd1774d6a618" # 3.2.2 +PKG_VERSION="f55b7a6e1d2625be51e95c13da52d68b80071271" # 3.2.2 PKG_LICENSE="GPL" PKG_SITE="https://github.com/htop-dev/htop" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/libusb/package.mk b/packages/sysutils/libusb/package.mk index bddac786f..906441973 100644 --- a/packages/sysutils/libusb/package.mk +++ b/packages/sysutils/libusb/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libusb" -PKG_VERSION="67ac8a0" +PKG_VERSION="87d6686a5474b95e575390d29e1c897f043acbde" PKG_LICENSE="LGPLv2.1" PKG_SITE="https://github.com/libusb/libusb" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/lm_sensors/package.mk b/packages/sysutils/lm_sensors/package.mk index 05efb7e6b..9e5880619 100644 --- a/packages/sysutils/lm_sensors/package.mk +++ b/packages/sysutils/lm_sensors/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lm_sensors" -PKG_VERSION="42f240d" +PKG_VERSION="42f240d2a457834bcbdf4dc8b57237f97b5f5854" PKG_ARCH="arm x86_64" PKG_LICENSE="GPL" PKG_SITE="http://secure.netroedge.com/~lm78/" diff --git a/packages/sysutils/powertop/package.mk b/packages/sysutils/powertop/package.mk index c2a120c9a..ac8060e34 100644 --- a/packages/sysutils/powertop/package.mk +++ b/packages/sysutils/powertop/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="powertop" -PKG_VERSION="4bdfba1" +PKG_VERSION="4bdfba189864d699621708fea182db292edc9305" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/fenrus75/powertop" diff --git a/packages/sysutils/ryzenadj/package.mk b/packages/sysutils/ryzenadj/package.mk index 8202f6167..9b18ae1d1 100644 --- a/packages/sysutils/ryzenadj/package.mk +++ b/packages/sysutils/ryzenadj/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="ryzenadj" -PKG_VERSION="0460a4d" +PKG_VERSION="dac383e1cd23aa9b631e20dba6d26f1fdf223164" PKG_LICENSE="GPL" PKG_SITE="https://github.com/FlyGoat/RyzenAdj" PKG_URL="${PKG_SITE}.git" diff --git a/packages/sysutils/system-utils/sources/devices/RK3399/headphone_sense b/packages/sysutils/system-utils/sources/devices/RK3399/headphone_sense index 63e5dd0de..cfdbbaa6a 100644 --- a/packages/sysutils/system-utils/sources/devices/RK3399/headphone_sense +++ b/packages/sysutils/system-utils/sources/devices/RK3399/headphone_sense @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/sysutils/system-utils/sources/devices/RK3399/video_sense b/packages/sysutils/system-utils/sources/devices/RK3399/video_sense index 6c5811b77..96f2faf22 100644 --- a/packages/sysutils/system-utils/sources/devices/RK3399/video_sense +++ b/packages/sysutils/system-utils/sources/devices/RK3399/video_sense @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) . /etc/profile diff --git a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense index d5b5ed301..0170df983 100644 --- a/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense +++ b/packages/sysutils/system-utils/sources/devices/S922X/headphone_sense @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) # Source predefined functions and variables . /etc/profile diff --git a/packages/textproc/textviewer/package.mk b/packages/textproc/textviewer/package.mk index 82b2e91a5..6ef76c99e 100644 --- a/packages/textproc/textviewer/package.mk +++ b/packages/textproc/textviewer/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="textviewer" -PKG_VERSION="16d4c69" +PKG_VERSION="16d4c69d4686e9cc210ab5964d909dfedc8866f4" PKG_LICENSE="MIT" PKG_SITE="https://github.com/JustEnoughLinuxOS/TvTextViewer" PKG_URL="${PKG_SITE}.git" diff --git a/packages/textproc/yamlcpp/package.mk b/packages/textproc/yamlcpp/package.mk index fccca7732..d7dd00f72 100644 --- a/packages/textproc/yamlcpp/package.mk +++ b/packages/textproc/yamlcpp/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="yamlcpp" -PKG_VERSION="f732014" # 0.8.0 +PKG_VERSION="c7639e81d5f00a5b47a2c9bd668f10d74b949071" # 0.8.0 PKG_LICENSE="MIT" PKG_SITE="https://github.com/jbeder/yaml-cpp" PKG_URL="${PKG_SITE}.git" diff --git a/packages/themes/es-theme-art-book-next/package.mk b/packages/themes/es-theme-art-book-next/package.mk index 9513ec875..5e38e44d1 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) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="es-theme-art-book-next" -PKG_VERSION="28e8820c8627f9e263e96c5ff058a2319cefbb03" +PKG_VERSION="b88d2b3d31d9cbfdd68be405dcf41ace924be950" PKG_ARCH="any" PKG_LICENSE="CUSTOM" PKG_SITE="https://github.com/anthonycaccese/art-book-next-jelos" diff --git a/packages/tools/freeimagelite/package.mk b/packages/tools/freeimagelite/package.mk index 2d600f932..0dd530782 100644 --- a/packages/tools/freeimagelite/package.mk +++ b/packages/tools/freeimagelite/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="freeimagelite" -PKG_VERSION="9406bd7" +PKG_VERSION="9406bd79d794821488e0c3b353c23017d2a28bdc" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/WohlSoft/libFreeImage" PKG_URL="${PKG_SITE}.git" diff --git a/packages/tools/python-evdev/package.mk b/packages/tools/python-evdev/package.mk index e11f80045..22a7af34c 100644 --- a/packages/tools/python-evdev/package.mk +++ b/packages/tools/python-evdev/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2018-present 5schatten (https://github.com/5schatten) PKG_NAME="python-evdev" -PKG_VERSION="2dd6ce6364bb67eedb209f6aa0bace0c18a3a40a" +PKG_VERSION="c688c9e63c535f3a9e0fae4930315ef432d09384" PKG_LICENSE="OSS" PKG_SITE="https://github.com/gvalkov/python-evdev" PKG_URL="${PKG_SITE}.git" diff --git a/packages/tools/rkbin/package.mk b/packages/tools/rkbin/package.mk index 4977f7977..61ee82bcf 100644 --- a/packages/tools/rkbin/package.mk +++ b/packages/tools/rkbin/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="rkbin" PKG_ARCH="arm aarch64" diff --git a/packages/tools/scrapers/Skyscraper/package.mk b/packages/tools/scrapers/Skyscraper/package.mk index 49d5eedb0..6e164cde7 100644 --- a/packages/tools/scrapers/Skyscraper/package.mk +++ b/packages/tools/scrapers/Skyscraper/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present CoreELEC (https://coreelec.org) PKG_NAME="Skyscraper" -PKG_VERSION="03d8d65" +PKG_VERSION="03d8d657d1ea3dfc5d3b1047922b76971bdf5ff5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/ui/emulationstation/config/common/es_features.cfg b/packages/ui/emulationstation/config/common/es_features.cfg index e059f7b42..3a3b77fbd 100644 --- a/packages/ui/emulationstation/config/common/es_features.cfg +++ b/packages/ui/emulationstation/config/common/es_features.cfg @@ -957,6 +957,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/ui/emulationstation/package.mk b/packages/ui/emulationstation/package.mk index 9eddc3b33..6447e76bc 100644 --- a/packages/ui/emulationstation/package.mk +++ b/packages/ui/emulationstation/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="emulationstation" -PKG_VERSION="cfde267" +PKG_VERSION="ff285e753a28df10b0bb014f9f6e5981accfc2f0" PKG_GIT_CLONE_BRANCH="main" PKG_REV="1" PKG_ARCH="any" diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk index 0267c4e72..4a27cf17e 100644 --- a/packages/virtual/emulators/package.mk +++ b/packages/virtual/emulators/package.mk @@ -37,7 +37,7 @@ case "${DEVICE}" in PKG_EMUS+=" amiberry cemu-sa citra-sa dolphin-sa duckstation-sa melonds-sa minivmacsa mupen64plus-sa kronos-sa \ nanoboyadvance-sa pcsx2-sa primehack rpcs3-sa ryujinx-sa scummvmsa vita3k-sa xemu-sa yuzu-sa mednafen" LIBRETRO_CORES+=" beetle-psx-lr bsnes-hd-lr citra-lr desmume-lr dolphin-lr flycast-lr lrps2-lr mame-lr \ - play-lr ppsspp-lr" + play-lr ppsspp-lr kronos-lr" ;; RK358*) [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr flycast-lr gpsp-lr pcsx_rearmed-lr" @@ -991,6 +991,7 @@ makeinstall_target() { x86_64) add_emu_core saturn kronos kronos-sa false add_emu_core saturn retroarch yabasanshiro true + add_emu_core saturn retroarch kronos false add_emu_core saturn mednafen ss false ;; esac @@ -1002,9 +1003,14 @@ makeinstall_target() { S922X*|RK35*) add_emu_core st-v retroarch beetle_saturn true ;; - RK3399|AMD64) + RK3399) + add_emu_core st-v retroarch beetle_saturn true + add_emu_core st-v mednafen ss false + ;; + AMD64) add_emu_core saturn kronos kronos-sa true add_emu_core st-v retroarch beetle_saturn false + add_emu_core st-v retroarch kronos false add_emu_core st-v mednafen ss false ;; esac diff --git a/packages/x11/lib/libxcb-cursor/package.mk b/packages/x11/lib/libxcb-cursor/package.mk index 9956b69ad..98ac4139f 100644 --- a/packages/x11/lib/libxcb-cursor/package.mk +++ b/packages/x11/lib/libxcb-cursor/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="libxcb-cursor" -PKG_VERSION="103bccad6f4a421ede6a0ef2eecc2749ff9be083" +PKG_VERSION="c393b71fff76fe8627d0e95c53e756615f84d7a3" PKG_LICENSE="OSS" PKG_SITE="https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor" PKG_URL="${PKG_SITE}.git" diff --git a/packages/x11/xserver/xwayland/package.mk b/packages/x11/xserver/xwayland/package.mk index 9740f23ba..266780e0f 100644 --- a/packages/x11/xserver/xwayland/package.mk +++ b/packages/x11/xserver/xwayland/package.mk @@ -4,7 +4,7 @@ # Copyright (C) 2023-present JELOS (https://github.com/JustEnoughLinuxOS/distribution) PKG_NAME="xwayland" -PKG_VERSION="7883646a8f208a1db4cb98f8b295c7f862da3b2a" +PKG_VERSION="7439e9c6c59219335fe35629a90f4fdd49912bcf" PKG_LICENSE="OSS" PKG_SITE="https://gitlab.freedesktop.org/xorg/xserver" PKG_URL="${PKG_SITE}.git" diff --git a/projects/Amlogic/bootloader/mkimage b/projects/Amlogic/bootloader/mkimage index 97015d902..60b98373c 100644 --- a/projects/Amlogic/bootloader/mkimage +++ b/projects/Amlogic/bootloader/mkimage @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) mkimage_uboot() { if [ -f "${RELEASE_DIR}/3rdparty/bootloader/${SUBDEVICE}_u-boot" ]; then diff --git a/projects/Amlogic/bootloader/release b/projects/Amlogic/bootloader/release index 0945beaa7..d8b7438fe 100644 --- a/projects/Amlogic/bootloader/release +++ b/projects/Amlogic/bootloader/release @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) mkdir -p ${RELEASE_DIR}/3rdparty/bootloader cp -a ${INSTALL}/usr/share/bootloader/* ${RELEASE_DIR}/3rdparty/bootloader diff --git a/projects/Amlogic/packages/amlogic-boot-fip/package.mk b/projects/Amlogic/packages/amlogic-boot-fip/package.mk index fc9b1d855..97a004e08 100644 --- a/projects/Amlogic/packages/amlogic-boot-fip/package.mk +++ b/projects/Amlogic/packages/amlogic-boot-fip/package.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) +# Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) PKG_NAME="amlogic-boot-fip" PKG_VERSION="e96b6a694380ff07d5a9e4be644ffe254bd18512" diff --git a/projects/Amlogic/packages/linux/package.mk b/projects/Amlogic/packages/linux/package.mk index 9ee264ca8..8304dd964 100644 --- a/projects/Amlogic/packages/linux/package.mk +++ b/projects/Amlogic/packages/linux/package.mk @@ -18,7 +18,7 @@ PKG_PATCH_DIRS+="${DEVICE}" case ${DEVICE} in S922X*) - PKG_VERSION="6.1.65" + PKG_VERSION="6.1.68" PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" ;; esac diff --git a/projects/Rockchip/devices/RK3566-X55/options b/projects/Rockchip/devices/RK3566-X55/options index c22ce0b35..5d0b81281 100644 --- a/projects/Rockchip/devices/RK3566-X55/options +++ b/projects/Rockchip/devices/RK3566-X55/options @@ -51,7 +51,7 @@ # Mali GPU family MALI_FAMILY="bifrost-g52" - MALI_VERSION="g13p0" + MALI_VERSION="g2p0" OPENGLES="libmali" VULKAN_SUPPORT="no" diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk index 514dee5d7..cbe414885 100644 --- a/projects/Rockchip/packages/linux/package.mk +++ b/projects/Rockchip/packages/linux/package.mk @@ -44,7 +44,7 @@ case ${DEVICE} in PKG_GIT_CLONE_BRANCH="main" ;; RK33*) - PKG_VERSION="6.1.65" + PKG_VERSION="6.1.68" 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/patches/RK3399/000-rk3399-devices.patch b/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch index b8772921c..03ba31659 100644 --- a/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch +++ b/projects/Rockchip/packages/linux/patches/RK3399/000-rk3399-devices.patch @@ -1,6 +1,6 @@ diff -rupN linux.orig/Makefile linux/Makefile ---- linux.orig/Makefile 2023-11-28 13:54:58.570108474 +0000 -+++ linux/Makefile 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/Makefile 2023-12-15 19:18:50.704700106 +0000 ++++ linux/Makefile 2023-12-15 19:20:05.987107578 +0000 @@ -826,6 +826,8 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation) KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) @@ -20,8 +20,8 @@ diff -rupN linux.orig/Makefile linux/Makefile # Require designated initializers for all marked structures KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init) diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boot/dts/rockchip/Makefile ---- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-11-28 13:54:59.138120459 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/arch/arm64/boot/dts/rockchip/Makefile 2023-12-15 19:18:53.540790831 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/Makefile 2023-12-15 19:20:05.987107578 +0000 @@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-li dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb @@ -32,12 +32,12 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/Makefile linux/arch/arm64/boo dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dtsi --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dtsi 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dtsi 2023-11-28 23:23:39.023319423 +0000 -@@ -0,0 +1,141 @@ ++++ linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dtsi 2023-12-15 21:01:28.016763624 +0000 +@@ -0,0 +1,139 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd -+ * Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) ++ * Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) + */ + +/ { @@ -48,6 +48,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dts + opp00 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <825000>; ++ clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <1008000000>; @@ -78,6 +79,7 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dts + opp00 { + opp-hz = /bits/ 64 <600000000>; + opp-microvolt = <825000>; ++ clock-latency-ns = <40000>; + }; + opp01 { + opp-hz = /bits/ 64 <1008000000>; @@ -100,10 +102,6 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dts + opp-microvolt = <1150000>; + }; + opp06 { -+ opp-hz = /bits/ 64 <1992000000>; -+ opp-microvolt = <1250000>; -+ }; -+ opp07 { + opp-hz = /bits/ 64 <2088000000>; + opp-microvolt = <1250000>; + }; @@ -177,14 +175,14 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552-opp.dts +}; diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts --- linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts 1970-01-01 00:00:00.000000000 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts 2023-11-28 19:50:16.215638386 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts 2023-12-15 19:20:05.987107578 +0000 @@ -0,0 +1,1329 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. + * Copyright (c) 2018 Akash Gajjar + * Copyright (c) 2022 Maya Matuszczyk -+ * Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS) ++ * Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS) + */ + + @@ -1509,9 +1507,9 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399-anbernic-rg552.dts lin + status = "okay"; +}; diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi ---- linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-11-28 13:54:59.142120544 +0000 -+++ linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-11-28 19:50:16.215638386 +0000 -@@ -1469,7 +1469,7 @@ +--- linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-12-15 19:18:53.548791087 +0000 ++++ linux/arch/arm64/boot/dts/rockchip/rk3399.dtsi 2023-12-15 19:20:05.987107578 +0000 +@@ -1471,7 +1471,7 @@ <1000000000>, <150000000>, <75000000>, <37500000>, @@ -1521,8 +1519,8 @@ diff -rupN linux.orig/arch/arm64/boot/dts/rockchip/rk3399.dtsi linux/arch/arm64/ <100000000>, <50000000>, <400000000>, <400000000>, diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockchip.c ---- linux.orig/drivers/gpio/gpio-rockchip.c 2023-11-28 13:55:00.750154472 +0000 -+++ linux/drivers/gpio/gpio-rockchip.c 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/gpio/gpio-rockchip.c 2023-12-15 19:18:55.020838176 +0000 ++++ linux/drivers/gpio/gpio-rockchip.c 2023-12-15 19:20:05.987107578 +0000 @@ -335,13 +335,13 @@ static void rockchip_irq_demux(struct ir unsigned long pending; unsigned int irq; @@ -1540,8 +1538,8 @@ diff -rupN linux.orig/drivers/gpio/gpio-rockchip.c linux/drivers/gpio/gpio-rockc /* * Triggering IRQ on both rising and falling edge diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/Kconfig ---- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-11-28 13:55:02.030181481 +0000 -+++ linux/drivers/gpu/drm/panel/Kconfig 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/gpu/drm/panel/Kconfig 2023-12-15 19:18:56.948899851 +0000 ++++ linux/drivers/gpu/drm/panel/Kconfig 2023-12-15 19:20:05.987107578 +0000 @@ -588,6 +588,15 @@ config DRM_PANEL_SHARP_LS043T1LE01 Say Y here if you want to enable support for Sharp LS043T1LE01 qHD (540x960) DSI panel as found on the Qualcomm APQ8074 Dragonboard @@ -1559,8 +1557,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Kconfig linux/drivers/gpu/drm/panel/ tristate "Sharp LS060T1SX01 FullHD video mode panel" depends on OF diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel/Makefile ---- linux.orig/drivers/gpu/drm/panel/Makefile 2023-11-28 13:55:02.030181481 +0000 -+++ linux/drivers/gpu/drm/panel/Makefile 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/gpu/drm/panel/Makefile 2023-12-15 19:18:56.948899851 +0000 ++++ linux/drivers/gpu/drm/panel/Makefile 2023-12-15 19:20:05.987107578 +0000 @@ -59,6 +59,7 @@ obj-$(CONFIG_DRM_PANEL_SEIKO_43WVF1G) += obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o @@ -1571,7 +1569,7 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/Makefile linux/drivers/gpu/drm/panel obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c --- linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-11-28 19:50:16.215638386 +0000 ++++ linux/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c 2023-12-15 19:20:05.987107578 +0000 @@ -0,0 +1,360 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* @@ -1934,8 +1932,8 @@ diff -rupN linux.orig/drivers/gpu/drm/panel/panel-sharp-ls054b3sx01.c linux/driv +MODULE_DESCRIPTION("Panel driver for Sharp LS054B3SX01 1152x1920 Video Mode DSI Panel"); +MODULE_LICENSE("GPL v2"); diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig ---- linux.orig/drivers/input/Kconfig 2023-11-28 13:55:02.446190257 +0000 -+++ linux/drivers/input/Kconfig 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/input/Kconfig 2023-12-15 19:18:57.320911751 +0000 ++++ linux/drivers/input/Kconfig 2023-12-15 19:20:05.987107578 +0000 @@ -51,6 +51,19 @@ config INPUT_FF_MEMLESS To compile this driver as a module, choose M here: the module will be called ff-memless. @@ -1957,8 +1955,8 @@ diff -rupN linux.orig/drivers/input/Kconfig linux/drivers/input/Kconfig tristate "Sparse keymap support library" help diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile ---- linux.orig/drivers/input/Makefile 2023-11-28 13:55:02.446190257 +0000 -+++ linux/drivers/input/Makefile 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/input/Makefile 2023-12-15 19:18:57.320911751 +0000 ++++ linux/drivers/input/Makefile 2023-12-15 19:20:05.987107578 +0000 @@ -10,6 +10,7 @@ input-core-y := input.o input-compat.o i input-core-y += touchscreen.o @@ -1969,7 +1967,7 @@ diff -rupN linux.orig/drivers/input/Makefile linux/drivers/input/Makefile obj-$(CONFIG_INPUT_VIVALDIFMAP) += vivaldi-fmap.o diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-polldev.c --- linux.orig/drivers/input/input-polldev.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux/drivers/input/input-polldev.c 2023-11-28 19:50:16.215638386 +0000 ++++ linux/drivers/input/input-polldev.c 2023-12-15 19:20:05.987107578 +0000 @@ -0,0 +1,362 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* @@ -2334,8 +2332,8 @@ diff -rupN linux.orig/drivers/input/input-polldev.c linux/drivers/input/input-po +} +EXPORT_SYMBOL(input_unregister_polled_device); diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystick/Kconfig ---- linux.orig/drivers/input/joystick/Kconfig 2023-11-28 13:55:02.446190257 +0000 -+++ linux/drivers/input/joystick/Kconfig 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/input/joystick/Kconfig 2023-12-15 19:18:57.324911879 +0000 ++++ linux/drivers/input/joystick/Kconfig 2023-12-15 19:20:05.987107578 +0000 @@ -393,6 +393,12 @@ config JOYSTICK_FSIA6B To compile this driver as a module, choose M here: the module will be called fsia6b. @@ -2350,8 +2348,8 @@ diff -rupN linux.orig/drivers/input/joystick/Kconfig linux/drivers/input/joystic bool "N64 controller" depends on MACH_NINTENDO64 diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joystick/Makefile ---- linux.orig/drivers/input/joystick/Makefile 2023-11-28 13:55:02.446190257 +0000 -+++ linux/drivers/input/joystick/Makefile 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/input/joystick/Makefile 2023-12-15 19:18:57.324911879 +0000 ++++ linux/drivers/input/joystick/Makefile 2023-12-15 19:20:05.987107578 +0000 @@ -30,6 +30,7 @@ obj-$(CONFIG_JOYSTICK_PXRC) += pxrc.o obj-$(CONFIG_JOYSTICK_QWIIC) += qwiic-joystick.o obj-$(CONFIG_JOYSTICK_SENSEHAT) += sensehat-joystick.o @@ -2362,7 +2360,7 @@ diff -rupN linux.orig/drivers/input/joystick/Makefile linux/drivers/input/joysti obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/joystick/singleadcjoy.c --- linux.orig/drivers/input/joystick/singleadcjoy.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux/drivers/input/joystick/singleadcjoy.c 2023-11-28 19:50:16.215638386 +0000 ++++ linux/drivers/input/joystick/singleadcjoy.c 2023-12-15 19:36:26.739762439 +0000 @@ -0,0 +1,1416 @@ +/*----------------------------------------------------------------------------*/ + @@ -2463,7 +2461,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + bool invert_absy; + bool invert_absrx; + bool invert_absry; -+ ++ + /* report interval (ms) */ + int bt_gpio_count; + struct bt_gpio *gpios; @@ -2903,7 +2901,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ +{ + struct platform_device *pdev = to_platform_device(dev); + struct joypad *joypad = platform_get_drvdata(pdev); -+ ++ + return sprintf(buf, "%d\n", pwm_get_period(joypad->pwm)); +} + @@ -3019,10 +3017,10 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + ssize_t pos=0; + if(gpio_get_value(54)==1) + { -+ pos += sprintf(&buf[pos], "disconnected\n"); ++ pos += sprintf(&buf[pos], "disconnected\n"); + }else{ + pos += sprintf(&buf[pos], "connected\n"); -+ } ++ } + return pos; +} + @@ -3190,7 +3188,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + mutex_lock(&joypad->lock); + joypad->enable = false; + mutex_unlock(&joypad->lock); -+ ++ + cancel_work_sync(&joypad->play_work); + pwm_vibrator_stop(joypad); + @@ -3292,7 +3290,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + struct bt_adc *adc = &joypad->adcs[nbtn]; + + adc->scale = joypad->bt_adc_scale; -+ ++ + adc->max = (ADC_MAX_VOLTAGE / 2); + adc->min = (ADC_MAX_VOLTAGE / 2) * (-1); + if (adc->scale) { @@ -3464,7 +3462,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + boosted_level = effect->u.rumble.weak_magnitude + joypad->boost_weak; + + joypad->level = (u16)CLAMP(boosted_level, 0, 0xffff); -+ ++ + dev_info(joypad->dev,"joypad->level = %d", joypad->level); + schedule_work(&joypad->play_work); + return 0; @@ -3520,7 +3518,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + + input = poll_dev->input; + joypad->input = poll_dev->input; -+ ++ + device_property_read_string(dev, "joypad-name", &input->name); + input->phys = DRV_NAME"/input0"; + @@ -3563,7 +3561,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + error); + return error; + } -+ ++ + + /* GPIO key setup */ + __set_bit(EV_KEY, input->evbit); @@ -3735,7 +3733,7 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ + dev_err(dev, "input setup failed!(err = %d)\n", error); + return error; + } -+ ++ + /* rumble setup */ + error = joypad_rumble_setup(dev, joypad); + if (error) { @@ -3781,8 +3779,8 @@ diff -rupN linux.orig/drivers/input/joystick/singleadcjoy.c linux/drivers/input/ +late_initcall(joypad_init); +module_exit(joypad_exit); diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/touchscreen/goodix.c ---- linux.orig/drivers/input/touchscreen/goodix.c 2023-11-28 13:55:02.482191017 +0000 -+++ linux/drivers/input/touchscreen/goodix.c 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/input/touchscreen/goodix.c 2023-12-15 19:18:57.364913158 +0000 ++++ linux/drivers/input/touchscreen/goodix.c 2023-12-15 19:20:05.987107578 +0000 @@ -1037,7 +1037,7 @@ retry_get_irq_gpio: default: if (ts->gpiod_int && ts->gpiod_rst) { @@ -3793,8 +3791,8 @@ diff -rupN linux.orig/drivers/input/touchscreen/goodix.c linux/drivers/input/tou } } diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/supply/cw2015_battery.c ---- linux.orig/drivers/power/supply/cw2015_battery.c 2023-11-28 13:55:04.226227817 +0000 -+++ linux/drivers/power/supply/cw2015_battery.c 2023-11-28 19:50:16.215638386 +0000 +--- linux.orig/drivers/power/supply/cw2015_battery.c 2023-12-15 19:18:59.060967411 +0000 ++++ linux/drivers/power/supply/cw2015_battery.c 2023-12-15 19:20:05.987107578 +0000 @@ -553,7 +553,7 @@ static enum power_supply_property cw_bat }; @@ -3806,7 +3804,7 @@ diff -rupN linux.orig/drivers/power/supply/cw2015_battery.c linux/drivers/power/ .num_properties = ARRAY_SIZE(cw_battery_properties), diff -rupN linux.orig/include/linux/input-polldev.h linux/include/linux/input-polldev.h --- linux.orig/include/linux/input-polldev.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux/include/linux/input-polldev.h 2023-11-28 19:50:16.215638386 +0000 ++++ linux/include/linux/input-polldev.h 2023-12-15 19:20:05.987107578 +0000 @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _INPUT_POLLDEV_H