Merge pull request #1039 from JustEnoughLinuxOS/dev

PR for release

Makefile

@@ -28,11 +28,11 @@ world: x86_64
 x86_64: handheld RK3588
 
 handheld:
-	DEVICE_ROOT=handheld PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
+	PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
 
 RK3588:
-	DEVICE_ROOT=RK3588 PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
-	DEVICE_ROOT=RK3588 PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro
+	PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
+	PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/build_distro
 
 update:
 	PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/update_packages

config/optimize

@@ -1,4 +1,4 @@
-GCC_OPTIM="-Ofast"
+GCC_OPTIM="-O3"
 # Linker hash-style is set to gnu via gcc default
 LD_OPTIM="-Wl,--as-needed"
 

packages/audio/alsa-lib/patches/001-silence-underruns.patch

@@ -0,0 +1,14 @@
+diff -rupN alsa-lib-1.2.8.orig/src/pcm/pcm.c alsa-lib-1.2.8/src/pcm/pcm.c
+--- alsa-lib-1.2.8.orig/src/pcm/pcm.c	2023-02-08 15:16:54.463152310 -0500
++++ alsa-lib-1.2.8/src/pcm/pcm.c	2023-02-08 15:17:08.347091741 -0500
+@@ -8566,8 +8566,8 @@ int snd_pcm_recover(snd_pcm_t *pcm, int
+                         s = "underrun";
+                 else
+                         s = "overrun";
+-                if (!silent)
+-                        SNDERR("%s occurred", s);
++                //if (!silent)
++                //        SNDERR("%s occurred", s);
+                 err = snd_pcm_prepare(pcm);
+                 if (err < 0) {
+                         SNDERR("cannot recovery from %s, prepare failed: %s", s, snd_strerror(err));

packages/audio/rpi-cirrus-config/config/rpi-cirrus-config.sh.sample

@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Sample user config script to setup Cirrus Logic Audio Card
-
-# load helper functions and definitions
-. /usr/lib/alsa/rpi-cirrus-functions.sh
-
-# enable output to S/PDIF, line out and headset out
-playback_to_spdif
-playback_to_lineout
-playback_to_headset
-
-# disable noise gate - this can cut off the first few ms of playback
-mixer 'Noise Gate Switch' off
-
-# Uncomment this line to enable output to speakers
-# playback_to_speakers
-
-# example: mix line in and headset in into line out using a high-pass filter
-# - line in gain is set to +8dB
-# - headset in gain is set to +20dB
-# - line in and headset in are mixed together in the filter, each using
-#   a gain of -3dB (volume 29). line in uses input 1, headset in input 2
-# - first input of line out is connected to audio signal from RPi/Kodi,
-#   using a -3dB gain
-# - second input of line out is connected to output of the filter
-#
-# mixer "${line_out} Digital Switch" off	# mute output
-# setup_line_in 8
-# setup_headset_in 20
-# setup_filter "High-Pass" "240,3"
-# set_mixer $filter_signals $line_in_signals 29 1
-# set_mixer $filter_signals $headset_in_signals 29 2
-# set_mixer $line_out_signals $rpi_out_signals 29 1
-# set_mixer $line_out_signals $filter_signals 29 2
-# mixer "${line_out} Digital Switch" on		# unmute output

packages/audio/sbc/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sbc"
-PKG_VERSION="1.5"
-PKG_SHA256="51d4e385237e9d4780c7b20e660e30fb6a7a6d75ca069f1ed630fa6105232aba"
+PKG_VERSION="2.0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.bluez.org/"
 PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-${PKG_VERSION}.tar.gz"

packages/audio/sbc/patches/sbc_primitives-Fix-build-on-non-x86.patch

@@ -1,39 +0,0 @@
-From: Marius Bakke <marius@xxxxxxx>
-
-Don't call __builtin_cpu_init unless targeting i386 or x86_64.
-Otherwise we get an error at link time:
-
-  CC       sbc/sbc_primitives.lo
-sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’:
-sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration]
-[...]
-  CCLD     src/sbcdec
-ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
-sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
----
- sbc/sbc_primitives.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
-index 97a75be..09c214a 100644
---- a/sbc/sbc_primitives.c
-+++ b/sbc/sbc_primitives.c
-@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j(
- 
- static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
- {
-+#if defined(__x86_64__) || defined(__i386__)
- 	__builtin_cpu_init();
- 
- #ifdef SBC_BUILD_WITH_MMX_SUPPORT
-@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
- 	if (__builtin_cpu_supports("sse4.2"))
- 		sbc_init_primitives_sse(state);
- #endif
-+#endif
- }
- 
- /*
--- 
-2.29.2
-

packages/devel/fribidi/package.mk

@@ -14,7 +14,7 @@ PKG_BUILD_FLAGS="+pic"
 
 PKG_MESON_OPTS_TARGET="-Ddeprecated=false \
                        -Ddocs=false \
-                       -Ddefault_library=static"
+                       -Ddefault_library=shared"
 
 post_makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/bin

packages/devel/glew-cmake/package.mk

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+
+PKG_NAME="glew-cmake"
+PKG_VERSION="2.2.0"
+PKG_SHA256="cdd82afba80f7cf34548cf5c902240d6721ec5a27ec9e075851b4a3a79ec6907"
+PKG_LICENSE="The OpenGL Extension Wrangler Library"
+PKG_SITE="https://github.com/Perlmint/glew-cmake"
+PKG_URL="https://github.com/Perlmint/glew-cmake/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain libXi glu"
+PKG_LONGDESC="The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library."
+
+PKG_CMAKE_OPTS_TARGET="-Dglew-cmake_BUILD_STATIC=off \
+                       -DUSE_GLU=on \
+                       -DPKG_CONFIG_REPRESENTATIVE_TARGET="libglew_shared" \
+                       -DONLY_LIBS=on"

packages/devel/glew-cmake/patches/glew-cmake-999.01-install-libGLEW-symlink.patch

@@ -0,0 +1,78 @@
+From c4936e08b7553f565f4ec3c1b097de411a0b6b5c Mon Sep 17 00:00:00 2001
+From: Gyusun Yeom <omniavinco@gmail.com>
+Date: Thu, 4 Feb 2021 22:10:43 +0900
+Subject: [PATCH 1/2] Install libGLEW symbolic links
+
+---
+ CMakeLists.txt | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5bfdcb2e..03a025fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,8 +97,12 @@ if(glew-cmake_BUILD_STATIC)
+ 		OUTPUT_NAME "glew"
+ 		DEBUG_POSTFIX d)
+ 
+-		target_compile_definitions(libglew_static PUBLIC GLEW_STATIC)
++	target_compile_definitions(libglew_static PUBLIC GLEW_STATIC)
+ 	list(APPEND GLEW_TARGETS libglew_static)
++	if(NOT WIN32)
++		file(CREATE_LINK "libglew.a" "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libGLEW.a" SYMBOLIC)
++		install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libGLEW.a TYPE LIB)
++	endif()
+ endif()
+ 
+ if(glew-cmake_BUILD_SHARED)
+@@ -112,6 +116,10 @@ if(glew-cmake_BUILD_SHARED)
+ 		set_target_properties(libglew_shared PROPERTIES
+ 			OUTPUT_NAME "glew"
+ 			DEBUG_POSTFIX d)
++		if(NOT WIN32)
++			file(CREATE_LINK "libglew.so" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}libGLEW.so" SYMBOLIC)
++			install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libGLEW.so TYPE LIB)
++		endif()
+ 	endif()
+ 
+ 	target_compile_definitions(libglew_shared PRIVATE GLEW_BUILD)
+
+From 81b97ab31e789d02e488d18dac5889d9399de813 Mon Sep 17 00:00:00 2001
+From: Gyusun Yeom <omniavinco@gmail.com>
+Date: Sat, 6 Feb 2021 16:04:38 +0900
+Subject: [PATCH 2/2] Use POST_BUILD script
+
+---
+ CMakeLists.txt | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03a025fc..3d28ad7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,11 @@ if(glew-cmake_BUILD_STATIC)
+ 	target_compile_definitions(libglew_static PUBLIC GLEW_STATIC)
+ 	list(APPEND GLEW_TARGETS libglew_static)
+ 	if(NOT WIN32)
+-		file(CREATE_LINK "libglew.a" "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libGLEW.a" SYMBOLIC)
++		add_custom_command(TARGET libglew_static POST_BUILD
++			COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink libglew.a libGLEW.a
++			WORKING_DIRECTORY ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
++			BYPRODUCTS ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libGLEW.a
++			COMMENT "create libGLEW symbolic link")
+ 		install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libGLEW.a TYPE LIB)
+ 	endif()
+ endif()
+@@ -117,7 +121,11 @@ if(glew-cmake_BUILD_SHARED)
+ 			OUTPUT_NAME "glew"
+ 			DEBUG_POSTFIX d)
+ 		if(NOT WIN32)
+-			file(CREATE_LINK "libglew.so" "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}libGLEW.so" SYMBOLIC)
++			add_custom_command(TARGET libglew_shared POST_BUILD
++				COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink libglew.so libGLEW.so
++				WORKING_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
++				BYPRODUCTS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libGLEW.so
++				COMMENT "create libGLEW symbolic link")
+ 			install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libGLEW.so TYPE LIB)
+ 		endif()
+ 	endif()

packages/devel/libp11-kit/package.mk

@@ -0,0 +1,12 @@
+PKG_NAME="libp11-kit"
+PKG_VERSION="0.24.1"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://github.com/p11-glue/p11-kit"
+PKG_URL="https://github.com/p11-glue/p11-kit/releases/download/${PKG_VERSION}/p11-kit-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="p11-kit aims to solve problems with coordinating the use of PKCS 11 by different components or libraries. "
+
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/lib
+  cp -rf ${PKG_BUILD}/.${TARGET_NAME}/p11-kit/libp11-kit.so* ${INSTALL}/usr/lib/
+}

packages/devel/qt5/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present Frank Hartung (supervisedthinking @ gmail.com)
 
 PKG_NAME="qt5"
-PKG_VERSION="87c5b4694ffd6fd891c26fce02776fc65cac1bd1" # 5.15.7+r176 (KDE Qt5PatchCollection)
+PKG_VERSION="8e65ddffeaf77b312c26d3097c26e525b7c5e220" # 5.15.8+r174 (KDE Qt5PatchCollection)
 PKG_LICENSE="GPL"
 PKG_SITE="http://qt-project.org"
 PKG_URL="https://invent.kde.org/qt/qt/qt5.git"

packages/games/emulators/PPSSPPSDL/package.mk

@@ -20,7 +20,7 @@ case ${DEVICE} in
         PKG_URL="${PKG_SITE}.git"
   ;;
   *)
-	PKG_VERSION="8e38ac078522bdf07e4558f22af855aed20e249a"
+	PKG_VERSION="86a5a82050d5577aac45210dde6616866b857d38"
 	PKG_SITE="https://github.com/hrydgard/ppsspp"
         PKG_URL="${PKG_SITE}.git"
   ;;

packages/games/emulators/flycastsa/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="flycastsa"
-PKG_VERSION="5875eda4d0f34fd334de2c00ff42efc7913e3bc2"
+PKG_VERSION="a045c52146f688f76ff2d21bcb9f6560f9825a82"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"

packages/games/emulators/hatarisa/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)
 
 PKG_NAME="hatarisa"
-PKG_VERSION="9f58fa6a45f07cfc007896ecb4ddb3279451e90a"
+PKG_VERSION="78d7b27b58a3354578dba27614476678a5f895de"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"

packages/games/emulators/hypseus-singe/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="hypseus-singe"
-PKG_VERSION="b7af7615723de86b95a9943e9a7cf444cd250146"
+PKG_VERSION="6650eea978032af6850961053fe4e64bb9be5b41"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL3"

packages/games/emulators/retroarch/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)
 
 PKG_NAME="retroarch"
-PKG_VERSION="c27e73e736467a29c85e8b73212238a4b52388d0"
+PKG_VERSION="3a540f687c4abacfd6713c350ac2c13ae7ac8bdf"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"

packages/games/emulators/rpcs3sa/config/rpcs3/config.yml

@@ -0,0 +1,234 @@
+Core:
+  PPU Decoder: Recompiler (LLVM)
+  PPU Threads: 2
+  PPU Debug: false
+  PPU Calling History: false
+  Save LLVM logs: false
+  Use LLVM CPU: ""
+  Max LLVM Compile Threads: 0
+  PPU LLVM Greedy Mode: false
+  PPU LLVM Precompilation: true
+  Thread Scheduler Mode: Operating System
+  Set DAZ and FTZ: false
+  SPU Decoder: Recompiler (LLVM)
+  SPU Reservation Busy Waiting Percentage: 0
+  SPU GETLLAR Busy Waiting Percentage: 100
+  SPU Debug: false
+  MFC Debug: false
+  Preferred SPU Threads: 0
+  SPU delay penalty: 3
+  SPU loop detection: false
+  Max SPURS Threads: 6
+  SPU Block Size: Safe
+  Accurate GETLLAR: false
+  Accurate SPU DMA: false
+  Accurate SPU Reservations: true
+  Accurate Cache Line Stores: false
+  Accurate RSX reservation access: false
+  RSX FIFO Accuracy: Fast
+  SPU Verification: true
+  SPU Cache: true
+  SPU Profiler: false
+  MFC Commands Shuffling Limit: 0
+  MFC Commands Timeout: 0
+  MFC Commands Shuffling In Steps: false
+  Enable TSX: Disabled
+  Accurate xfloat: false
+  Approximate xfloat: true
+  Relaxed xfloat: true
+  Accurate PPU 128-byte Reservation Op Max Length: 0
+  Stub PPU Traps: 0
+  Full Width AVX-512: false
+  PPU LLVM Java Mode Handling: true
+  Use Accurate DFMA: true
+  PPU Set Saturation Bit: false
+  PPU Accurate Non-Java Mode: false
+  PPU Fixup Vector NaN Values: false
+  PPU Accurate Vector NaN Values: false
+  PPU Set FPCC Bits: false
+  Debug Console Mode: false
+  Hook static functions: false
+  Libraries Control:
+    []
+  HLE lwmutex: false
+  SPU LLVM Lower Bound: 0
+  SPU LLVM Upper Bound: 18446744073709551615
+  TSX Transaction First Limit: 800
+  TSX Transaction Second Limit: 2000
+  Clocks scale: 100
+  SPU Wake-Up Delay: 0
+  SPU Wake-Up Delay Thread Mask: 63
+  Max CPU Preempt Count: 0
+  Allow RSX CPU Preemptions: true
+  Sleep Timers Accuracy: As Host
+  Performance Report Threshold: 500
+  Enable Performance Report: false
+  Assume External Debugger: false
+  SPU GETLLAR polling detection: false
+VFS:
+  Enable /host_root/: false
+  Initialize Directories: true
+  Limit disk cache size: false
+  Disk cache maximum size (MB): 5120
+  Empty /dev_hdd0/tmp/: true
+Video:
+  Renderer: Vulkan
+  Resolution: 720x480
+  Aspect ratio: 16:9
+  Frame limit: Off
+  Second Frame Limit: 0.000000
+  MSAA: Disabled
+  Shader Mode: Async Shader Recompiler
+  Shader Precision: Low
+  Write Color Buffers: false
+  Write Depth Buffer: false
+  Read Color Buffers: false
+  Read Depth Buffer: false
+  Log shader programs: false
+  VSync: true
+  Debug output: false
+  Debug overlay: false
+  Renderdoc Compatibility Mode: false
+  Use GPU texture scaling: false
+  Stretch To Display Area: false
+  Force High Precision Z buffer: false
+  Strict Rendering Mode: false
+  Disable ZCull Occlusion Queries: false
+  Disable Video Output: false
+  Disable Vertex Cache: false
+  Disable FIFO Reordering: false
+  Enable Frame Skip: false
+  Force CPU Blit: false
+  Disable On-Disk Shader Cache: false
+  Disable Vulkan Memory Allocator: false
+  Use full RGB output range: true
+  Strict Texture Flushing: false
+  Multithreaded RSX: false
+  Relaxed ZCULL Sync: true
+  Enable 3D: false
+  Debug Program Analyser: false
+  Accurate ZCULL stats: false
+  Consecutive Frames To Draw: 1
+  Consecutive Frames To Skip: 1
+  Resolution Scale: 100
+  Anisotropic Filter Override: 0
+  Texture LOD Bias Addend: 0
+  Minimum Scalable Dimension: 16
+  Shader Compiler Threads: 0
+  Driver Recovery Timeout: 1000000
+  Driver Wake-Up Delay: 1
+  Vblank Rate: 60
+  Vblank NTSC Fixup: false
+  DECR memory layout: false
+  Allow Host GPU Labels: false
+  Disable MSL Fast Math: false
+  Output Scaling Mode: Bilinear
+  Vulkan:
+    Adapter: AMD Unknown (RADV RENOIR)
+    Force FIFO present mode: false
+    Force primitive restart flag: false
+    Exclusive Fullscreen Mode: Automatic
+    Asynchronous Texture Streaming 2: false
+    FidelityFX CAS Sharpening Intensity: 50
+    Asynchronous Queue Scheduler: Safe
+    Force Disable Exclusive Fullscreen Mode: false
+    Enable FidelityFX Super Resolution Upscaling: false
+    Metal Semaphore: MTLEvent preferred
+  Performance Overlay:
+    Enabled: false
+    Enable Framerate Graph: false
+    Enable Frametime Graph: false
+    Framerate datapoints: 50
+    Frametime datapoints: 170
+    Detail level: Medium
+    Framerate graph detail level: All
+    Frametime graph detail level: All
+    Metrics update interval (ms): 350
+    Font size (px): 10
+    Position: Top Left
+    Font: n023055ms.ttf
+    Horizontal Margin (px): 50
+    Vertical Margin (px): 50
+    Center Horizontally: false
+    Center Vertically: false
+    Opacity (%): 70
+    Body Color (hex): "#FFE138FF"
+    Body Background (hex): "#002339FF"
+    Title Color (hex): "#F26C24FF"
+    Title Background (hex): "#00000000"
+  Shader Loading Dialog:
+    Allow custom background: true
+    Darkening effect strength: 30
+    Blur effect strength: 0
+  Disable native float16 support: false
+  Shader Compilation Hint:
+    Position X (px): 20
+    Position Y (px): 690
+Audio:
+  Renderer: Cubeb
+  Audio Provider: CellAudio
+  RSXAudio Avport: AV multiout
+  Dump to file: false
+  Convert to 16 bit: false
+  Audio Format: Stereo
+  Audio Formats: 0
+  Audio Device: "@@@default@@@"
+  Master Volume: 100
+  Enable Buffering: true
+  Desired Audio Buffer Duration: 100
+  Enable Time Stretching: false
+  Disable Sampling Skip: false
+  Time Stretching Threshold: 75
+  Microphone Type: "Null"
+  Microphone Devices: "@@@@@@@@@@@@"
+  Music Handler: Qt
+  Audio provider: CellAudio
+  Audio Channels: Downmix to Stereo
+Input/Output:
+  Keyboard: Basic
+  Mouse: Basic
+  Camera: "Null"
+  Camera type: Unknown
+  Camera flip: None
+  Camera ID: Default
+  Move: Mouse
+  Buzz emulated controller: "Null"
+  Turntable emulated controller: "Null"
+  GHLtar emulated controller: "Null"
+  Pad handler mode: Single-threaded
+  Pad handler sleep (microseconds): 1000
+  Background input enabled: true
+  Show move cursor: false
+System:
+  License Area: SCEE
+  Language: English (US)
+  Keyboard Type: English keyboard (US standard)
+  Enter button assignment: Enter with cross
+  Console time offset (s): 0
+  PSID high: 0
+  PSID low: 0
+Net:
+  Internet enabled: Disconnected
+  IP address: 0.0.0.0
+  Bind address: 0.0.0.0
+  DNS address: 8.8.8.8
+  IP swap list: ""
+  PSN status: Disconnected
+Savestate:
+  Start Paused: false
+  Suspend Emulation Savestate Mode: false
+  Inspection Mode Savestates: false
+  Save Disc Game Data: false
+Miscellaneous:
+  Automatically start games after boot: true
+  Exit RPCS3 when process finishes: false
+  Start games in fullscreen mode: true
+  Prevent display sleep while running games: true
+  Show trophy popups: true
+  Show shader compilation hint: false
+  Use native user interface: true
+  GDB Server: 127.0.0.1:2345
+  Silence All Logs: true
+  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
+  Pause Emulation During Home Menu: false
+Log: {}

packages/games/emulators/rpcs3sa/config/rpcs3/input_configs/active_profiles.yml

@@ -0,0 +1,2 @@
+Active Profiles:
+  global: Default

packages/games/emulators/rpcs3sa/config/rpcs3/input_configs/global/Default.yml

@@ -0,0 +1,546 @@
+Player 1 Input:
+  Handler: Evdev
+  Device: Microsoft X-Box 360 pad
+  Config:
+    Left Stick Left: LX-
+    Left Stick Down: LY+
+    Left Stick Right: LX+
+    Left Stick Up: LY-
+    Right Stick Left: RX-
+    Right Stick Down: RY+
+    Right Stick Right: RX+
+    Right Stick Up: RY-
+    Start: Start
+    Select: Select
+    PS Button: Mode
+    Square: X
+    Cross: A
+    Circle: B
+    Triangle: Y
+    Left: Hat0 X-
+    Down: Hat0 Y+
+    Right: Hat0 X+
+    Up: Hat0 Y-
+    R1: TR
+    R2: RZ+
+    R3: Thumb R
+    L1: TL
+    L2: LZ+
+    L3: Thumb L
+    Motion Sensor X:
+      Axis: X
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: Y
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: Z
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: RY
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 30
+    Right Stick Deadzone: 30
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 5000
+    Right Pad Squircling Factor: 5000
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 1356
+    Product ID: 616
+  Buddy Device: ""
+Player 2 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"
+Player 3 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"
+Player 4 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"
+Player 5 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"
+Player 6 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"
+Player 7 Input:
+  Handler: "Null"
+  Device: "Null"
+  Config:
+    Left Stick Left: ""
+    Left Stick Down: ""
+    Left Stick Right: ""
+    Left Stick Up: ""
+    Right Stick Left: ""
+    Right Stick Down: ""
+    Right Stick Right: ""
+    Right Stick Up: ""
+    Start: ""
+    Select: ""
+    PS Button: ""
+    Square: ""
+    Cross: ""
+    Circle: ""
+    Triangle: ""
+    Left: ""
+    Down: ""
+    Right: ""
+    Up: ""
+    R1: ""
+    R2: ""
+    R3: ""
+    L1: ""
+    L2: ""
+    L3: ""
+    Motion Sensor X:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: ""
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 0
+    Right Stick Deadzone: 0
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 0
+    Right Pad Squircling Factor: 0
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 0
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 50
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 0
+    Product ID: 0
+  Buddy Device: "Null"

packages/games/emulators/rpcs3sa/package.mk

@@ -0,0 +1,81 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Frank Hartung (supervisedthinking (@) gmail.com)
+# Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="rpcs3sa"
+PKG_VERSION="27cad422b9211c13c58f31f701ff93a9659e26f1" # r0.0.26-14604
+PKG_ARCH="x86_64"
+PKG_LICENSE="GPL-2.0-or-later"
+PKG_SITE="https://rpcs3.net"
+PKG_URL="https://github.com/RPCS3/rpcs3.git"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_TARGET="toolchain linux glibc systemd pulseaudio mesa xorg-server libevdev curl ffmpeg libpng zlib glew-cmake libSM SDL2 enet qt5 rpcs3sa:host vulkan-headers vulkan-loader vulkan-tools libp11-kit"
+PKG_LONGDESC="RPCS3 is an experimental open-source Sony PlayStation 3 emulator and debugger."
+GET_HANDLER_SUPPORT="git"
+PKG_GIT_CLONE_BRANCH="master"
+PKG_GIT_CLONE_SINGLE="yes"
+
+pre_configure_host() {
+  PKG_CMAKE_SCRIPT="${PKG_BUILD}/llvm/CMakeLists.txt"
+  PKG_CMAKE_OPTS_HOST="-DLLVM_TARGETS_TO_BUILD="X86" \
+                       -DLLVM_BUILD_RUNTIME=OFF \
+                       -DLLVM_BUILD_TOOLS=OFF \
+                       -DLLVM_INCLUDE_BENCHMARKS=OFF \
+                       -DLLVM_INCLUDE_DOCS=OFF \
+                       -DLLVM_INCLUDE_EXAMPLES=OFF \
+                       -DLLVM_INCLUDE_TESTS=OFF \
+                       -DLLVM_INCLUDE_TOOLS=OFF \
+                       -DLLVM_INCLUDE_UTILS=OFF \
+                       -DLLVM_CCACHE_BUILD=ON \
+                       -Wno-dev"
+}
+
+pre_configure_target() {
+  PKG_CMAKE_OPTS_TARGET=(-DUSE_NATIVE_INSTRUCTIONS=OFF \
+                         -DBUILD_LLVM_SUBMODULE=ON \
+                         -DCMAKE_C_FLAGS="${CFLAGS}" \
+                         -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+                         -DLLVM_TARGET_ARCH="${TARGET_ARCH}" \
+                         -DLLVM_TABLEGEN=${PKG_BUILD}/.${HOST_NAME}/bin/llvm-tblgen \
+                         -DUSE_DISCORD_RPC=OFF \
+                         -DCMAKE_SKIP_RPATH=ON \
+                         -DUSE_SYSTEM_FFMPEG=ON \
+                         -DUSE_SYSTEM_LIBPNG=ON \
+                         -DUSE_SYSTEM_ZLIB=ON \
+                         -DUSE_SYSTEM_CURL=ON \
+                         -DUSE_VULKAN=ON \
+                         -Wno-dev)
+}
+
+configure_target() {
+  echo "Executing (target): cmake ${CMAKE_GENERATOR_NINJA} ${TARGET_CMAKE_OPTS} "${PKG_CMAKE_OPTS_TARGET[@]}" $(dirname ${PKG_CMAKE_SCRIPT})" | tr -s " "
+  cmake ${CMAKE_GENERATOR_NINJA} ${TARGET_CMAKE_OPTS} "${PKG_CMAKE_OPTS_TARGET[@]}" $(dirname ${PKG_CMAKE_SCRIPT})
+}
+
+make_host() {
+  ninja ${NINJA_OPTS} llvm-tblgen
+}
+
+makeinstall_host() {
+ :
+}
+
+pre_make_target() {
+  # fix cross compiling
+  find ${PKG_BUILD} -name flags.make  -exec sed -i "s:isystem :I:g" \{} \;
+  find ${PKG_BUILD} -name build.ninja -exec sed -i "s:isystem :I:g" \{} \;
+}
+
+post_makeinstall_target() {
+  # Copy scripts
+  mkdir -p ${INSTALL}/usr/bin/
+   cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/bin/
+
+  # Copy config & resources
+  mkdir -p ${INSTALL}/usr/config/rpcs3
+   cp -PR ${PKG_DIR}/config/rpcs3                           ${INSTALL}/usr/config/rpcs3/
+   cp -PR ${INSTALL}/usr/share/rpcs3/{GuiConfigs,Icons} ${INSTALL}/usr/config/rpcs3/ 
+
+  # Clean up
+  safe_remove ${INSTALL}/usr/share
+}

packages/games/emulators/rpcs3sa/package.mk.old

@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+PKG_NAME="rpcs3sa"
+PKG_VERSION="5a63271f0ea2fd2bb7aa866c85ca80a03992ef92"
+PKG_RELEASE="v0.0.26-14690-5a63271f"
+PKG_ARCH="x86_64"
+PKG_LICENSE="LGPL"
+PKG_SITE="https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build"
+PKG_URL="${PKG_SITE}-${PKG_VERSION}/rpcs3-${PKG_RELEASE}_linux64.AppImage"
+PKG_DEPENDS_TARGET="toolchain qt5 libSM libp11 libp11-kit libevdev curl ffmpeg libpng zlib vulkan-loader vulkan-headers"
+PKG_LONGDESC="PS3 Emulator appimage"
+PKG_TOOLCHAIN="manual"
+
+makeinstall_target() {
+  # Redefine strip or the AppImage will be stripped rendering it unusable.
+  export STRIP=true
+
+  mkdir -p ${INSTALL}/usr/lib
+  cp -rf ${PKG_DIR}/lib/* ${INSTALL}/usr/lib
+
+  mkdir -p ${INSTALL}/usr/bin
+  cp ${PKG_BUILD}/*.AppImage ${INSTALL}/usr/bin/${PKG_NAME}
+  cp -rf ${PKG_DIR}/scripts/start_rpcs3sa.sh ${INSTALL}/usr/bin
+  sed -e "s/@APPIMAGE@/${PKG_NAME}/g" -i ${INSTALL}/usr/bin/start_rpcs3sa.sh
+  chmod 755 ${INSTALL}/usr/bin/*
+  mkdir -p ${INSTALL}/usr/config
+  cp -rf ${PKG_DIR}/config/rpcs3 ${INSTALL}/usr/config
+}
+

packages/games/emulators/rpcs3sa/scripts/start_rpcs3sa.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)
+
+. /etc/profile
+
+#Check if rpcs3 exists in .config
+if [ ! -d "/storage/.config/rpcs3" ]; then
+    mkdir -p "/storage/.config/rpcs3"
+        cp -r "/usr/config/rpcs3" "/storage/.config/"
+fi
+
+#Link rpcs3sa dev_flash to bios folder
+if [ ! -d "/storage/roms/bios/rpcs3/dev_flash" ]; then
+    mkdir -p "/storage/bios/rpcs3/dev_flash"
+fi
+rm -rf /storage/.config/rpcs3/dev_flash
+ln -sf /storage/roms/bios/rpcs3/dev_flash /storage/.config/rpcs3/dev_flash
+
+#Set QT enviornment to xwayland
+export QT_QPA_PLATFORM=xcb
+rr_audio.sh pulseaudio
+export SDL_AUDIODRIVER=pulseaudio
+
+rpcs3 --no-gui "${1}"

packages/games/emulators/scummvmsa/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="scummvmsa"
-PKG_VERSION="91c01df4b800034b7aafc8bef4dfca4929bd5667"
+PKG_VERSION="ab666139e2904a57c1db30d8f020137acbd1a5a7"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"

packages/games/libretro/TIC-80/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="TIC-80"
-PKG_VERSION="ca3bb11f7d91b6f61c30b27e95958521e3432576"
+PKG_VERSION="7be33dc4b5bc54e417639333fbd1c67582aeff21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"

packages/games/libretro/fbneo/package.mk

@@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
 
 PKG_NAME="fbneo"
-PKG_VERSION="45d0b3636c3c511f99e1c082817971d0d385873b"
+PKG_VERSION="868dee240104ed2ba3b74ec0bc3c9f467fb284f8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"

packages/games/libretro/flycast/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="flycast"
-PKG_VERSION="5875eda4d0f34fd334de2c00ff42efc7913e3bc2"
+PKG_VERSION="a045c52146f688f76ff2d21bcb9f6560f9825a82"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain libzip"

packages/games/libretro/gambatte/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="gambatte"
-PKG_VERSION="ca0f7e14c55698a8eb81ea5af58701173e85bc7f"
+PKG_VERSION="4c64b5285b88a08b8134f6c36177fdca56d46192"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/libretro/mame2003-plus/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="mame2003-plus"
-PKG_VERSION="92d1f6e814fc794224014e79d87fb11a5fb5224f"
+PKG_VERSION="9f2dffe5ff58200da8659c9c92d5b4a8980d7b94"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MAME"

packages/games/libretro/nestopia/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nestopia"
-PKG_VERSION="cb1e24e2d6e5d49a85924a9d6dd9c470c109f537"
+PKG_VERSION="125e2ab6d7f2dd4accc60cb84154adad21d3a6a9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/libretro/ppsspp/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="ppsspp"
-PKG_VERSION="8e38ac078522bdf07e4558f22af855aed20e249a"
+PKG_VERSION="86a5a82050d5577aac45210dde6616866b857d38"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"

packages/games/libretro/puae/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="puae"
-PKG_VERSION="13aa6e65019c37c20b282c0f8fba5be0c8627462"
+PKG_VERSION="b2c4acb0ae12a507647f8f181962f96ad740f2e8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/games/libretro/scummvm/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="scummvm"
-PKG_VERSION="aec1775518acef20a9248477381b9962f6a09ed8"
+PKG_VERSION="18add58f142f0b0fe1614f79a9a9cb48aa3eb033"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"

packages/games/libretro/slang-shaders/package.mk

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="slang-shaders"
-PKG_VERSION="1fc940e94244b138500404f404b5f8aa5c061ad5"
+PKG_VERSION="356678ec53ca940a53fa509eff0b65bb63a403bb"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/games/libretro/swanstation/package.mk

@@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)
 
 PKG_NAME="swanstation"
-PKG_VERSION="826d58355ce47e2709c6385e66d8833b3125c8e8"
+PKG_VERSION="04f1ec57e8905ce7bb0c677a2fbc3d5f59becef6"
 PKG_ARCH=""
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/libretro/swanstation"

packages/graphics/SDL2/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius
 
 PKG_NAME="SDL2"
-PKG_VERSION="2.26.2"
+PKG_VERSION="2.26.3"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.libsdl.org/"
 PKG_URL="https://www.libsdl.org/release/SDL2-${PKG_VERSION}.tar.gz"

packages/graphics/vulkan/vulkan-loader/package.mk

@@ -36,8 +36,8 @@ pre_configure_target() {
                              -DBUILD_WSI_XLIB_SUPPORT=ON \
                              -DBUILD_WSI_WAYLAND_SUPPORT=OFF"
   elif [ "${DISPLAYSERVER}" = "wl" ]; then
-    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=OFF \
-                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+    PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=ON \
+                             -DBUILD_WSI_XLIB_SUPPORT=ON \
                              -DBUILD_WSI_WAYLAND_SUPPORT=ON"
   else
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_WSI_XCB_SUPPORT=OFF \

packages/graphics/vulkan/vulkan-tools/package.mk

@@ -36,8 +36,8 @@ pre_configure_target() {
                              -DCUBE_WSI_SELECTION=XCB"
   elif [ "${DISPLAYSERVER}" = "wl" ]; then
     PKG_CMAKE_OPTS_TARGET+=" -DBUILD_CUBE=ON \
-                             -DBUILD_WSI_XCB_SUPPORT=OFF \
-                             -DBUILD_WSI_XLIB_SUPPORT=OFF \
+                             -DBUILD_WSI_XCB_SUPPORT=ON \
+                             -DBUILD_WSI_XLIB_SUPPORT=ON \
                              -DBUILD_WSI_WAYLAND_SUPPORT=ON
                              -DCUBE_WSI_SELECTION=WAYLAND"
   else

packages/jelos/config/system/configs/system.cfg

@@ -161,6 +161,7 @@ ssh.enabled=0
 supergrafx.integerscale=0
 supergrafx.ratio=4/3
 supervision.integerscale=0
+syncthing.enabled=0
 system.autohotkeys=1
 system.automount=1
 system.cpugovernor=schedutil

packages/jelos/package.mk

@@ -42,7 +42,7 @@ case "${DEVICE}" in
   ;;
 esac
 
-PKG_TOOLS="i2c-tools syncthing rclone jslisten evtest tailscale pygobject mesa-demos"
+PKG_TOOLS="i2c-tools synctools jslisten evtest tailscale pygobject mesa-demos"
 
 ### Project specific variables
 case "${PROJECT}" in

packages/jelos/sources/post-update

@@ -171,5 +171,12 @@ then
   set_setting ipv6.enabled 0
 fi
 
+SYNCTHING=$(get_setting syncthing.enabled)
+if [ -z "${SYNCTHING}" ]
+then
+  echo "Set syncthing default" >>${LOG}
+  set_setting syncthing.enabled=0
+fi
+
 ### Force everyone to the stable repo
 set_setting updates.branch stable

packages/jelos/sources/scripts/runemu.sh

@@ -295,6 +295,12 @@ then
                         RUNTHIS='${TBASH} /usr/bin/start_aethersx2.sh "${ROMNAME}"'
                         fi
                 ;;
+                "ps3")
+                        jslisten set "-9 rpcs3"
+                        if [ "$EMU" = "rpcs3sa" ]; then
+                        RUNTHIS='${TBASH} /usr/bin/start_rpcs3sa.sh "${ROMNAME}"'
+                        fi
+                ;;
                 "gamecube")
                         jslisten set "-9 dolphin-emu-nogui"
                         if [ "$EMU" = "dolphinsa-gc" ]; then

packages/jelos/sources/scripts/setrootpass

@@ -18,5 +18,8 @@ sed -i "s#root:${CURRENT}:${LPC}::::::#root:${NEW}:${LPC}::::::#g" /storage/.cac
 # Create a root user and set the password.
 echo -ne "${ROOTPASS}\n${ROOTPASS}\n" | smbpasswd -sa root 2>/dev/null
 
+# Set the root user and password for SyncThing
+syncthing generate --gui-user "root" --gui-password "${ROOTPASS}"
+
 # Save the password so we can display it in ES
 set_setting root.password "${ROOTPASS}"

packages/jelos/sources/scripts/wifictl

@@ -72,6 +72,11 @@ check_wifi() {
 }
 
 connect_wifi() {
+  NETCHECK=$(systemctl status connman >/dev/null 2>&1)
+  if [ ! "$?" = "0" ]
+  then
+    systemctl start connman
+  fi
   STATE=$(get_wifi_state)
   if [ ! "${STATE}" = "online" ]
   then
@@ -84,9 +89,6 @@ connect_wifi() {
 
 set_profile() {
   cat > "${WIFICFG}" <<EOF
-[global]
-Name=${OS_NAME}
-
 [service_${OS_NAME}_default]
 Type = wifi
 Name = ${SSID}

packages/kernel/linux/package.mk

@@ -4,7 +4,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.1.9"
+PKG_VERSION="6.1.10"
 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"

packages/lang/Python3/package.mk

@@ -3,8 +3,7 @@
 
 PKG_NAME="Python3"
 # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION!
-PKG_VERSION="3.11.0"
-PKG_SHA256="a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3"
+PKG_VERSION="3.11.1"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.python.org/"
 PKG_URL="https://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz"

packages/lang/Python3/patches/Python3-0401-fix-Mark-new-interpreters-and-threads-as-non-static.patch

@@ -1,62 +0,0 @@
-From 27763ef6ac5ad9d70dba68bf9c2c910ef1ddcded Mon Sep 17 00:00:00 2001
-From: Brandt Bucher <brandtbucher@microsoft.com>
-Date: Wed, 9 Nov 2022 13:55:20 -0800
-Subject: [PATCH] GH-99205: Mark new interpreters and threads as non-static
- (GH-99268) (cherry picked from commit
- 283ab0e1c002f2d7459d581df6b4b8599e7d1a4d)
-
-Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
----
- .../2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst         | 2 ++
- Python/pystate.c                                          | 8 ++++++++
- 2 files changed, 10 insertions(+)
- create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst
-
-diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst
-new file mode 100644
-index 000000000000..8ad0e147c203
---- /dev/null
-+++ b/Misc/NEWS.d/next/Core and Builtins/2022-11-08-16-35-25.gh-issue-99205.2YOoFT.rst	
-@@ -0,0 +1,2 @@
-+Fix an issue that prevented :c:type:`PyThreadState` and
-+:c:type:`PyInterpreterState` memory from being freed properly.
-diff --git a/Python/pystate.c b/Python/pystate.c
-index 425065322ebd..c0d161f894c9 100644
---- a/Python/pystate.c
-+++ b/Python/pystate.c
-@@ -341,6 +341,7 @@ PyInterpreterState_New(void)
-         interp = &runtime->_main_interpreter;
-         assert(interp->id == 0);
-         assert(interp->next == NULL);
-+        assert(interp->_static);
- 
-         interpreters->main = interp;
-     }
-@@ -355,6 +356,9 @@ PyInterpreterState_New(void)
-         // Set to _PyInterpreterState_INIT.
-         memcpy(interp, &initial._main_interpreter,
-                sizeof(*interp));
-+        // We need to adjust any fields that are different from the initial
-+        // interpreter (as defined in _PyInterpreterState_INIT):
-+        interp->_static = false;
- 
-         if (id < 0) {
-             /* overflow or Py_Initialize() not called yet! */
-@@ -817,6 +821,7 @@ new_threadstate(PyInterpreterState *interp)
-         assert(id == 1);
-         used_newtstate = 0;
-         tstate = &interp->_initial_thread;
-+        assert(tstate->_static);
-     }
-     else {
-         // Every valid interpreter must have at least one thread.
-@@ -828,6 +833,9 @@ new_threadstate(PyInterpreterState *interp)
-         memcpy(tstate,
-                &initial._main_interpreter._initial_thread,
-                sizeof(*tstate));
-+        // We need to adjust any fields that are different from the initial
-+        // thread (as defined in _PyThreadState_INIT):
-+        tstate->_static = false;
-     }
-     interp->threads.head = tstate;
- 

packages/network/ethtool/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="ethtool"
-PKG_VERSION="5.1"
-PKG_SHA256="65feac1fec6565290b7784b2efc925dee900a9b11202ce7c6c30a967c3da3387"
+PKG_VERSION="6.1"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/"
 PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz"

packages/network/rfkill/package.mk

@@ -2,8 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rfkill"
-PKG_VERSION="0.5"
-PKG_SHA256="e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a"
+PKG_VERSION="1.0"
 PKG_LICENSE="GPL"
 PKG_SITE="https://wireless.wiki.kernel.org/en/users/documentation/rfkill"
 PKG_URL="https://www.kernel.org/pub/software/network/rfkill/$PKG_NAME-$PKG_VERSION.tar.xz"

packages/network/syncthing/changelog.txt

@@ -1 +0,0 @@
-initial release

packages/network/syncthing/package.mk

@@ -1,25 +1,18 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2023-present Fewtarius
 
 PKG_NAME="syncthing"
-PKG_VERSION="1.22.2"
-PKG_SHA256="211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f"
-PKG_REV="1"
+PKG_VERSION="1.23.1"
 PKG_ARCH="any"
 PKG_LICENSE="MPLv2"
 PKG_SITE="https://syncthing.net/"
 PKG_URL="https://github.com/syncthing/syncthing/releases/download/v${PKG_VERSION}/syncthing-source-v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
-PKG_SECTION="service/system"
 PKG_SHORTDESC="Syncthing: open source continuous file synchronization"
 PKG_LONGDESC="Syncthing (${PKG_VERSION}) replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
 PKG_TOOLCHAIN="manual"
 
-PKG_IS_ADDON="yes"
-PKG_ADDON_NAME="Syncthing"
-PKG_ADDON_TYPE="xbmc.service"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
-
 configure_target() {
   go_configure
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC} \
@@ -30,8 +23,9 @@ make_target() {
   HOME=${ROOT} ${GOLANG} build -a -ldflags "${LDFLAGS}" -o bin/syncthing -v ./cmd/syncthing
 }
 
-addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    cp -P ${PKG_BUILD}/bin/syncthing \
-        ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/bin
+  cp bin/syncthing ${INSTALL}/usr/bin
+  cp -rf ${PKG_DIR}/sources/start_syncthing.sh ${INSTALL}/usr/bin
+  chmod 0755 ${INSTALL}/usr/bin/*
 }

packages/network/syncthing/source/bin/syncthing-service

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-. /etc/profile
-oe_setup_addon service.system.syncthing
-
-STNODEFAULTFOLDER="1" syncthing -home=$ADDON_HOME           \
-                                -gui-address="$gui_address" \
-                                -logflags=0                 \
-                                -no-browser                 \
-                                -no-restart                 \
-                                &
-

packages/network/syncthing/source/default.py

@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-import subprocess
-import xbmc
-import xbmcaddon
-
-
-class Monitor(xbmc.Monitor):
-
-    def __init__(self, *args, **kwargs):
-        xbmc.Monitor.__init__(self)
-        self.id = xbmcaddon.Addon().getAddonInfo('id')
-
-    def onSettingsChanged(self):
-        subprocess.call(['systemctl', 'restart', self.id])
-
-
-if __name__ == '__main__':
-    Monitor().waitForAbort()

packages/network/syncthing/source/resources/language/English/strings.po

@@ -1,14 +0,0 @@
-# Kodi Media Center language file
-# Addon Name: syncthing
-# Addon id: service.system.syncthing
-# Addon Provider: awiouy at gmail dot com
-msgid ""
-msgstr ""
-
-msgctxt "#30000"
-msgid "GUI Address"
-msgstr ""
-
-msgctxt "#30001"
-msgid "GUI Address"
-msgstr ""

packages/network/syncthing/source/resources/settings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-   <category label="30000">
-      <setting id="gui_address" label="30001" type="text" default="0.0.0.0:8384" />
-   </category>
-</settings>
-

packages/network/syncthing/source/settings-default.xml

@@ -1,3 +0,0 @@
-<settings version="2">
-    <setting id="gui_address" default="true">0.0.0.0:8384</setting>
-</settings>

packages/network/syncthing/source/system.d/service.system.syncthing.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=Syncthing - Open Source Continuous File Synchronization
-Documentation=http://docs.syncthing.net/
-After=network.target
-Requires=network.target
-
-[Service]
-Type=forking
-ExecStart=/bin/sh /storage/.kodi/addons/service.system.syncthing/bin/syncthing-service
-Restart=on-failure
-SuccessExitStatus=3 4
-RestartForceExitStatus=3 4
-
-[Install]
-WantedBy=kodi.target
-

packages/network/syncthing/sources/start_syncthing.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+ROOTPASS=$(get_setting root.password)
+# Set the root user and password for SyncThing
+syncthing generate --gui-user root --gui-password ${ROOTPASS}
+xmlstarlet ed --inplace -u "//configuration/gui/address" -v ":8384" /storage/.config/syncthing/config.xml
+
+syncthing -no-browser -no-restart

packages/network/syncthing/system.d/syncthing.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Start SyncThing
+After=jelos.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/start_syncthing.sh
+
+[Install]
+WantedBy=jelos.service

packages/network/wireguard-tools/config/system.d/wireguard.service.sample

@@ -1,13 +0,0 @@
-[Unit]
-Description=WireGuard VPN Service
-After=network-online.target nss-lookup.target connman-vpn.service time-sync.target
-Wants=network-online.target nss-lookup.target connman-vpn.service time-sync.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/connmanctl connect vpn_service_name_goes_here
-ExecStop=/usr/bin/connmanctl disconnect vpn_service_name_goes_here
-
-[Install]
-WantedBy=multi-user.target

packages/network/wireguard-tools/config/wireguard/wireguard.config.sample

@@ -1,14 +0,0 @@
-[provider_wireguard]
-Type = WireGuard
-Name = WireGuard VPN Tunnel
-Host = 3.2.5.6
-Domain = my.home.network
-WireGuard.Address = 10.2.0.2/24
-WireGuard.ListenPort = 51820
-WireGuard.PrivateKey = qKIj010hDdWSjQQyVCnEgthLXusBgm3I6HWrJUaJymc=
-WireGuard.PublicKey = zzqUfWGIil6QxrAGz77HE5BGUEdD2PgHYnCg3CDKagE=
-WireGuard.PresharedKey = DfEYeVs04HS9XhKGM4/ZXHG3Qc4MFK2AJd8XouYDbRQ=
-WireGuard.DNS = 8.8.8.8, 1.1.1.1
-WireGuard.AllowedIPs = 0.0.0.0/0
-WireGuard.EndpointPort = 51820
-WireGuard.PersistentKeepalive = 25

packages/python/devel/pygobject/package.mk

@@ -24,6 +24,8 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
+  python_remove_source
+
   rm -rf ${INSTALL}/usr/bin
   rm -rf ${INSTALL}/usr/share/pygobject
 }

packages/python/devel/waf/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="waf"
-PKG_VERSION="2.0.24"
-PKG_SHA256="6b78a3594540b232a154f64c4eb7e21f28e4e073c7e1605e4b9977519a6cb89e"
+PKG_VERSION="2.0.25"
+PKG_SHA256="66cff7beed0e77db874e9232cc08874abb3e866c7f0f1f34ba2f959fde44fdd4"
 PKG_LICENSE="MIT"
 PKG_SITE="https://waf.io"
 PKG_URL="https://waf.io/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

packages/python/security/pycryptodome/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pycryptodome"
-PKG_VERSION="3.15.0"
-PKG_SHA256="10356f1e0a76d87688482d497a490e10759d1c7e915731d1932c95030bd48241"
+PKG_VERSION="3.16.0"
+PKG_SHA256="c8f6878f11e6164b663058246d2c3ecc3c445f9cbff03dea97cee80c4223b9ff"
 PKG_LICENSE="BSD"
 PKG_SITE="https://pypi.org/project/pycryptodome"
 PKG_URL="https://github.com/Legrandin/${PKG_NAME}/archive/v${PKG_VERSION}.tar.gz"

packages/python/system/dbussy/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dbussy"
-PKG_VERSION="71616a370d3f59ef1681d26f5df77c1545d5bc04"   # 2022-09-03
-PKG_SHA256="8ddae13387315c00bc316db1a2db8044073ad0d47f18d9840b3ba7f148b525ff"
+PKG_VERSION="691a8a8a1914416b7ea1545fb931d74f2e381f09"
+PKG_SHA256="857104ef2fd1978323d7c87b32c753d2d178b79adbd13f52cea23511f5195ded"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://gitlab.com/ldo/dbussy"
 PKG_URL="https://github.com/ldo/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz"

packages/python/system/simplejson/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="simplejson"
-PKG_VERSION="3.18.0"
-PKG_SHA256="58a429d2c2fa80834115b923ff689622de8f214cf0dc4afa9f59e824b444ab31"
+PKG_VERSION="3.18.1"
+PKG_SHA256="746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa"
 PKG_LICENSE="OSS"
 PKG_SITE="http://pypi.org/project/simplejson"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/sysutils/autostart/sources/common/006-brightness

@@ -17,4 +17,8 @@ then
   BRIGHTNESS=3
 fi
 
-printf "%.0f" $(echo "${BRIGHTNESS}") > /sys/class/backlight/$(brightness device)/brightness
+BRIGHTNESS_DEVICE="$(brightness device)"
+if [ -e "/sys/class/backlight/${BRIGHTNESS_DEVICE}/brightness" ]
+then
+  printf "%.0f" $(echo "${BRIGHTNESS}") > /sys/class/backlight/${BRIGHTNESS_DEVICE}/brightness
+fi

packages/sysutils/autostart/sources/common/008-network

@@ -11,7 +11,7 @@ avahi-set-host-name ${HOSTNAME}
 NETCHECK=$(systemctl status connman >/dev/null 2>&1)
 if [ "$?" = "0" ]
 then
-  systemctl restart connman
+  systemctl stop connman
 fi
 
 if [ "$(get_setting wifi.enabled)" == "0" ] || [ "$1" == "disable" ]
@@ -21,3 +21,4 @@ elif [ "$(get_setting wifi.enabled)" == "1" ] || [ "$1" == "enable" ]
 then
   nohup wifictl enable &
 fi
+

packages/sysutils/autostart/sources/daemons/007-syncthing

@@ -0,0 +1,3 @@
+STATE=$(get_setting syncthing.enabled)
+SVC="syncthing"
+DAEMONS=("syncthing")

packages/sysutils/busybox/config/busybox-host.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.35.0
-# Tue Sep 13 18:30:16 2022
+# Busybox version: 1.36.0
+# Tue Feb  7 18:27:37 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=0
 # CONFIG_FEATURE_NON_POSIX_CP is not set
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
@@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -326,6 +332,7 @@ CONFIG_CRC32=y
 # CONFIG_FEATURE_TR_EQUIV is not set
 # CONFIG_TRUE is not set
 # CONFIG_TRUNCATE is not set
+CONFIG_TSORT=y
 # CONFIG_TTY is not set
 # CONFIG_UNAME is not set
 CONFIG_UNAME_OSNAME=""
@@ -807,10 +814,12 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+CONFIG_SEEDRNG=y
 # CONFIG_SETFATTR is not set
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
+CONFIG_TREE=y
 # CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
@@ -983,6 +992,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1113,6 +1123,7 @@ CONFIG_BASH_IS_NONE=y
 # CONFIG_ASH_ECHO is not set
 # CONFIG_ASH_PRINTF is not set
 # CONFIG_ASH_TEST is not set
+# CONFIG_ASH_SLEEP is not set
 # CONFIG_ASH_HELP is not set
 # CONFIG_ASH_GETOPTS is not set
 # CONFIG_ASH_CMDCMD is not set

packages/sysutils/busybox/config/busybox-init.conf

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.35.0
-# Tue Sep 13 17:55:56 2022
+# Busybox version: 1.36.0
+# Tue Feb  7 18:24:37 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -9,7 +9,6 @@ CONFIG_HAVE_DOT_CONFIG=y
 # Settings
 #
 # CONFIG_DESKTOP is not set
-CONFIG_PLATFORM_LINUX=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_FEDORA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
@@ -94,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=0
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=0
 # CONFIG_FEATURE_NON_POSIX_CP is not set
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
@@ -124,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -339,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 # CONFIG_TRUE is not set
 # CONFIG_TRUNCATE is not set
+CONFIG_TSORT=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -832,10 +838,12 @@ CONFIG_NANDWRITE=y
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+CONFIG_SEEDRNG=y
 # CONFIG_SETFATTR is not set
 # CONFIG_SETSERIAL is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
+CONFIG_TREE=y
 # CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIATTACH is not set
@@ -1008,6 +1016,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1138,6 +1147,7 @@ CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 # CONFIG_ASH_HELP is not set
 CONFIG_ASH_GETOPTS=y
 # CONFIG_ASH_CMDCMD is not set

packages/sysutils/busybox/config/busybox-target.conf

@@ -1,14 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.35.0
-# Tue Sep 13 18:32:09 2022
+# Busybox version: 1.36.0
+# Tue Feb  7 18:36:29 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
 #
 # Settings
 #
-CONFIG_PLATFORM_LINUX=y
 CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_FEDORA_COMPAT is not set
@@ -94,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=0
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=0
 CONFIG_FEATURE_NON_POSIX_CP=y
 CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
@@ -124,6 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
+# CONFIG_LOOP_CONFIGURE is not set
+# CONFIG_NO_LOOP_CONFIGURE is not set
+CONFIG_TRY_LOOP_CONFIGURE=y
 
 #
 # Applets
@@ -339,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 # CONFIG_TRUNCATE is not set
+CONFIG_TSORT=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
 CONFIG_UNAME_OSNAME="GNU/Linux"
@@ -832,10 +838,12 @@ CONFIG_NANDWRITE=y
 # CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
+CONFIG_SEEDRNG=y
 # CONFIG_SETFATTR is not set
 CONFIG_SETSERIAL=y
 # CONFIG_STRINGS is not set
 CONFIG_TIME=y
+CONFIG_TREE=y
 # CONFIG_TS is not set
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
@@ -1008,6 +1016,7 @@ CONFIG_DHCPD_LEASES_FILE=""
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
 # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1138,6 +1147,7 @@ CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y

packages/sysutils/busybox/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
 
 PKG_NAME="busybox"
-PKG_VERSION="1.35.0"
+PKG_VERSION="1.36.0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2"

packages/sysutils/e2fsprogs/package.mk

@@ -3,11 +3,10 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.45.3"
-PKG_SHA256="90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595"
+PKG_VERSION="1.47.0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"
-PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/${PKG_NAME}/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="gcc:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain"
@@ -15,15 +14,15 @@ PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck
 PKG_BUILD_FLAGS="-parallel"
 
 if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
+  PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} diskdev_cmds"
 fi
 
-PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
-                         --bindir=$TOOLCHAIN/bin \
+PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN}/ \
+                         --bindir=${TOOLCHAIN}/bin \
                          --with-udev-rules-dir=no \
                          --with-crond-dir=no \
                          --with-systemd-unit-dir=no \
-                         --sbindir=$TOOLCHAIN/sbin \
+                         --sbindir=${TOOLCHAIN}/sbin \
                          --enable-verbose-makecmds \
                          --disable-symlink-install \
                          --disable-symlink-build \
@@ -70,48 +69,48 @@ pre_configure() {
                            --disable-fuse2fs \
                            --with-gnu-ld"
 
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT"
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT --enable-shared --disable-static"
 }
 
 post_makeinstall_target() {
-  make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install
+  make -C lib/et LIBMODE=644 DESTDIR=${SYSROOT_PREFIX} install
 
-  rm -rf $INSTALL/usr/sbin/badblocks
-  rm -rf $INSTALL/usr/sbin/blkid
-  rm -rf $INSTALL/usr/sbin/dumpe2fs
-  rm -rf $INSTALL/usr/sbin/e2freefrag
-  rm -rf $INSTALL/usr/sbin/e2undo
-  rm -rf $INSTALL/usr/sbin/e4defrag
-  rm -rf $INSTALL/usr/sbin/filefrag
-  rm -rf $INSTALL/usr/sbin/fsck
-  rm -rf $INSTALL/usr/sbin/logsave
-  rm -rf $INSTALL/usr/sbin/mklost+found
+  rm -rf ${INSTALL}/usr/sbin/badblocks
+  rm -rf ${INSTALL}/usr/sbin/blkid
+  rm -rf ${INSTALL}/usr/sbin/dumpe2fs
+  rm -rf ${INSTALL}/usr/sbin/e2freefrag
+  rm -rf ${INSTALL}/usr/sbin/e2undo
+  rm -rf ${INSTALL}/usr/sbin/e4defrag
+  rm -rf ${INSTALL}/usr/sbin/filefrag
+  rm -rf ${INSTALL}/usr/sbin/fsck
+  rm -rf ${INSTALL}/usr/sbin/logsave
+  rm -rf ${INSTALL}/usr/sbin/mklost+found
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/usr/sbin
-    cp e2fsck/e2fsck $INSTALL/usr/sbin
-    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext2
-    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext3
-    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4
-    ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4dev
+  mkdir -p ${INSTALL}/usr/sbin
+    cp e2fsck/e2fsck ${INSTALL}/usr/sbin
+    ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext2
+    ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext3
+    ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext4
+    ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext4dev
 
   if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then
-    cp misc/mke2fs $INSTALL/usr/sbin
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4dev
+    cp misc/mke2fs ${INSTALL}/usr/sbin
+    ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext2
+    ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext3
+    ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext4
+    ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext4dev
   fi
 }
 
 makeinstall_host() {
   make -C lib/et LIBMODE=644 install
   make -C lib/ext2fs LIBMODE=644 install
-  mkdir -p $TOOLCHAIN/sbin
-  cp e2fsck/e2fsck $TOOLCHAIN/sbin
-  cp misc/mke2fs $TOOLCHAIN/sbin
-  cp misc/tune2fs $TOOLCHAIN/sbin
-  mkdir -p $TOOLCHAIN/etc
-  cp misc/mke2fs.conf $TOOLCHAIN/etc
+  mkdir -p ${TOOLCHAIN}/sbin
+  cp e2fsck/e2fsck ${TOOLCHAIN}/sbin
+  cp misc/mke2fs ${TOOLCHAIN}/sbin
+  cp misc/tune2fs ${TOOLCHAIN}/sbin
+  mkdir -p ${TOOLCHAIN}/etc
+  cp misc/mke2fs.conf ${TOOLCHAIN}/etc
 }

packages/sysutils/e2fsprogs/patches/e2fsprogs-0001-remove-64bit-from-default-ext4-config.patch

@@ -1,11 +0,0 @@
---- a/misc/mke2fs.conf.in
-+++ b/misc/mke2fs.conf.in
-@@ -11,7 +11,7 @@
- 		features = has_journal
- 	}
- 	ext4 = {
--		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
-+		features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize
- 		inode_size = 256
- 	}
- 	small = {

packages/sysutils/entropy/package.mk

@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-PKG_NAME="entropy"
-PKG_VERSION="0"
-PKG_LICENSE="GPL"
-PKG_SITE=""
-PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="A simple way to add entropy at boot"
-PKG_TOOLCHAIN="manual"
-
-makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib/entropy
-    cp add-entropy $INSTALL/usr/lib/entropy
-    cp add-random-at-shutdown $INSTALL/usr/lib/entropy
-
-  chmod +x $INSTALL/usr/lib/entropy/*
-}
-
-post_install() {
-  enable_service add-entropy.service
-  enable_service add-random-at-shutdown.service
-}

packages/sysutils/entropy/sources/add-entropy

@@ -1,24 +0,0 @@
-#!/usr/bin/python
-
-import os
-import struct
-
-RNDADDENTROPY = 0x40085203
-import fcntl
-
-def add_entropy(fd, data):
-    add = struct.pack('ii', len(data)*8, len(data)) + data
-    fcntl.ioctl(fd, RNDADDENTROPY, add)
-
-if not os.path.isfile("/storage/.cache/random.data"):
-    os.system("dd if=/dev/urandom of=/storage/.cache/random.data count=4 >/dev/null")
-
-cache=os.open("/storage/.cache/random.data", os.O_RDONLY)
-
-rnd=os.open("/dev/random", os.O_RDWR)
-
-while True:
-    data=os.read(cache, 512)
-    if len(data) == 0:
-        break
-    add_entropy(rnd, data)

packages/sysutils/entropy/sources/add-random-at-shutdown

@@ -1,2 +0,0 @@
-#!/bin/sh
-dd if=/dev/urandom of=/storage/.cache/random.data count=4

packages/sysutils/entropy/system.d/add-entropy.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Add random entropy from file
-DefaultDependencies=no
-After=systemd-tmpfiles-setup.service
-Before=systemd-udevd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/entropy/add-entropy
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target

packages/sysutils/entropy/system.d/add-random-at-shutdown.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Save random entropy at shutdown
-DefaultDependencies=no
-Before=systemd-poweroff.service systemd-reboot.service systemd-halt.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/entropy/add-random-at-shutdown
-RemainAfterExit=yes
-
-[Install]
-WantedBy=poweroff.target reboot.target halt.target

packages/sysutils/kmod/package.mk

@@ -2,8 +2,7 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="kmod"
-PKG_VERSION="24"
-PKG_SHA256="610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397"
+PKG_VERSION="30"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.profusion.mobi/cgit.cgi/kmod.git/"
 PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz"

packages/sysutils/pciutils/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pciutils"
-PKG_VERSION="3.8.0"
+PKG_VERSION="3.9.0"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mj.ucw.cz/pciutils.shtml"

packages/sysutils/systemd/config/sleep.conf.d/sleep.conf.sample

@@ -1,3 +0,0 @@
-[Sleep]
-SuspendMode=false
-HibernateMode=false

packages/sysutils/systemd/config/system.d/cifs.mount.sample

@@ -1,50 +0,0 @@
-# This is a sample service script to mount CIFS/SAMBA shares.
-# Please read carefully the comments in this file. For production usage
-# you can remove all comments (lines beginning with "#") from this file.
-
-
-[Unit]
-# The description should be used to explain what this servicefile is for
-Description=test cifs mount script
-
-# if we do network mounts like here we *require* 'network-online.service'
-# which checks if the network is online
-Requires=network-online.service
-
-# our scripts must start *after* 'network-online.service', on timeout and if
-# 'network-online.service' fails we can not mount and this scripts fails too
-After=network-online.service
-
-# usually we mount networks shares because we want they avaible *before* XBMC starts.
-# so XBMC has access to this mounts from beginning. Note: this slows down the boot!
-Before=kodi.service
-
-
-[Mount]
-# The share we want mount
-What=//192.168.0.31/Music
-
-# Where we want mount this share
-Where=/storage/music2
-
-# Any options you usually use with the "-o" parameter in the mount command
-Options=username=myusername,password=mypassword
-
-# filesystem type
-Type=cifs
-
-
-[Install]
-# The target is used by 'systemctl enable <name_of_this_file.mount>' to link
-# this service to a runlevel for starting on boot. usually 'multi-user.target'
-# is ok here.
-WantedBy=multi-user.target
-
-# Important:
-# this file must be renamed to <mountpoint>.mount where <mountpoint>, is the FULL path
-# where the share will be mounted but slashes "/" MUST BE REPLACED with dashes "-" with .mount
-# as extension.
-# This means, if we want mount to "/storage/music2" (see above "Where=/storage/music2")
-# then this file must be renamed to 'storage-music2.mount' and can be enabled via ssh with the
-# command 'systemctl enable storage-music2.mount'
-

packages/sysutils/systemd/config/system.d/nfs.mount.sample

@@ -1,50 +0,0 @@
-# This is a sample service script to mount NFS shares.
-# Please read carefully the comments in this file. For production usage
-# you can remove all comments (lines beginning with "#") from this file.
-
-
-[Unit]
-# The description should be used to explain what this servicefile is for
-Description=test nfs mount script
-
-# if we do network mounts like here we *require* 'network-online.service'
-# which checks if the network is online
-Requires=network-online.service
-
-# our scripts must start *after* 'network-online.service', on timeout and if
-# 'network-online.service' fails we can not mount and this scripts fails too
-After=network-online.service
-
-# usually we mount networks shares because we want they avaible *before* XBMC starts.
-# so XBMC has access to this mounts from beginning. Note: this slows down the boot!
-Before=kodi.service
-
-
-[Mount]
-# The share we want mount
-What=192.168.0.31:/movies
-
-# Where we want mount this share
-Where=/storage/movies2
-
-# Any options you usually use with the "-o" parameter in the mount command
-Options=
-
-# filesystem type
-Type=nfs
-
-
-[Install]
-# The target is used by 'systemctl enable <name_of_this_file.mount>' to link
-# this service to a runlevel for starting on boot. usually 'multi-user.target'
-# is ok here.
-WantedBy=multi-user.target
-
-# Important:
-# this file must be renamed to <mountpoint>.mount where <mountpoint>, is the FULL path
-# where the share will be mounted but slashes "/" MUST BE REPLACED with dashes "-" with .mount
-# as extension.
-# This means, if we want mount to "/storage/movies2" (see above "Where=/storage/movies2")
-# then this file must be renamed to 'storage-movies2.mount' and can be enabled via ssh with the
-# command 'systemctl enable storage-movies2.mount'
-

packages/sysutils/systemd/config/system.d/openvpn.service.sample

@@ -1,44 +0,0 @@
-[Unit]
-Description=OpenVPN Autorun Service
-
-[Service]
-Type=forking
-Requires=network-online.service
-After=network-online.service
-ExecStart=/usr/sbin/openvpn --daemon --config /storage/.config/openvpn.config
-Restart=always
-RestartSec=15
-
-[Install]
-WantedBy=kodi.target
-
-# NOTES:
-#
-# 1) Edit /storage/.config/openvpn.config to the .config/.conf/.ovpn file
-# from your VPN service provider and test it works first by connecting at
-# the console:
-# 
-#   /usr/sbin/openvpn --daemon --config /storage/.config/openvpn.config
-#
-# 2) The openvpn.service file must be addeded to the active systemd config 
-# before it will work. This is done by running:
-#  
-#   systemctl enable openvpn.service
-# 
-# 3) If you suspend/resume your LibreELEC system you will need to stop and
-# restart the connection with a systemd *.power script, e.g.
-#
-#   mkdir -p /storage/.config/sleep.d
-#   nano /storage/.config/sleep.d/01-openvpn.power
-# 
-# Copy the sample script below. Remove # marks except for #!/bin/bash
-#
-#   #!/bin/sh
-#   case "$1" in
-#     pre)
-#     systemctl stop openvpn.service
-#     ;;
-#     post)
-#     systemctl start openvpn.service
-#     ;;
-#   esac

packages/sysutils/systemd/package.mk

@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="systemd"
-PKG_VERSION="251.7"
+PKG_VERSION="252.5"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
 PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy libidn2 wait-time-sync Python3:host jinja2:host"
+PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux libidn2 wait-time-sync Python3:host jinja2:host"
 PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts."
 
 PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \

packages/sysutils/systemd/patches/systemd-0400-hide-useless-shutdown-log-message.patch

@@ -1,46 +0,0 @@
-diff -rupN systemd-247.orig/src/shutdown/shutdown.c systemd-247.new/src/shutdown/shutdown.c
---- systemd-247.orig/src/shutdown/shutdown.c	2021-02-07 14:43:00.075206218 -0500
-+++ systemd-247.new/src/shutdown/shutdown.c	2021-02-07 14:43:52.515152573 -0500
-@@ -540,13 +540,13 @@ int main(int argc, char *argv[]) {
-                         log_error_errno(r, "Failed to switch root to \"/run/initramfs\": %m");
-         }
- 
--        if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
--                log_error("Failed to finalize%s%s%s%s%s ignoring.",
-+        /* if (need_umount || need_swapoff || need_loop_detach || need_dm_detach || need_md_detach)
-+                 log_error("Failed to finalize%s%s%s%s%s ignoring.",
-                           need_umount ? " file systems," : "",
-                           need_swapoff ? " swap devices," : "",
-                           need_loop_detach ? " loop devices," : "",
-                           need_dm_detach ? " DM devices," : "",
--                          need_md_detach ? " MD devices," : "");
-+                          need_md_detach ? " MD devices," : ""); */
- 
-         /* The kernel will automatically flush ATA disks and suchlike on reboot(), but the file systems need to be
-          * sync'ed explicitly in advance. So let's do this here, but not needlessly slow down containers. Note that we
-diff -rupN systemd-247.orig/src/shutdown/umount.c systemd-247.new/src/shutdown/umount.c
---- systemd-247.orig/src/shutdown/umount.c	2021-02-07 14:43:00.075206218 -0500
-+++ systemd-247.new/src/shutdown/umount.c	2021-02-07 14:58:13.851587985 -0500
-@@ -566,8 +566,8 @@ static int umount_with_timeout(MountPoin
-                  * filesystem less busy so the unmount might succeed (rather
-                  * then return EBUSY).*/
-                 r = umount2(m->path, MNT_FORCE);
--                if (r < 0)
--                        log_full_errno(umount_log_level, errno, "Failed to unmount %s: %m", m->path);
-+                /* if (r < 0)
-+                        log_full_errno(umount_log_level, errno, "Failed to unmount %s: %m", m->path); */
- 
-                 _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
-         }
-diff -rupN systemd-247.orig/src/volatile-root/volatile-root.c systemd-247.new/src/volatile-root/volatile-root.c
---- systemd-247.orig/src/volatile-root/volatile-root.c	2021-02-07 14:43:00.083206834 -0500
-+++ systemd-247.new/src/volatile-root/volatile-root.c	2021-02-07 14:58:50.713285895 -0500
-@@ -50,7 +50,7 @@ static int make_volatile(const char *pat
- 
-         r = umount_recursive(path, 0);
-         if (r < 0) {
--                log_error_errno(r, "Failed to unmount %s: %m", path);
-+                /* log_error_errno(r, "Failed to unmount %s: %m", path); */
-                 goto finish_umount;
-         }
- 

packages/sysutils/systemd/patches/systemd-0900-build-with-glibc-2.36.patch

@@ -0,0 +1,20 @@
+commit 134db60f65ecea9a5c6536541a74a6ff5e4167de
+Author: Rudi Heitbaum <rudi@heitbaum.com>
+Date:   Tue Jan 31 12:06:56 2023 +0000
+
+    glibc: Conditionally #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h
+index 0a53bdc38a..74ed9088bd 100644
+--- a/src/basic/linux/btrfs.h
++++ b/src/basic/linux/btrfs.h
+@@ -26,7 +26,9 @@ extern "C" {
+ 
+ #include <linux/types.h>
+ #include <linux/ioctl.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #define BTRFS_IOCTL_MAGIC 0x94
+ #define BTRFS_VOL_NAME_MAX 255

packages/sysutils/systemd/scripts/userconfig-setup

@@ -6,47 +6,42 @@
 
 . /etc/profile
 
-# Remove those sample files that we manage
-for sample in $(find /storage/.config -name '*.sample' 2>/dev/null); do
-  [ -f /usr/config/${sample:16} ] && rm -f ${sample}
-done
-
 if [ ! -e "/storage/.configured" ]
 then
   # Copy config files, but don't overwrite.  Only run if /storage is fresh
   ## cp -iRp /usr/config/* /storage/.config/ &>/dev/null
   ## ignore es_systems.cfg and switch to rsync
-  rsync -a --ignore-existing --exclude=es_systems.cfg /usr/config/* /storage/.config/
-  mkdir -p /storage/.config/emulationstation/themes
-  ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme
-  ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec
-  ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal
+  rsync -a --ignore-existing --exclude=es_systems.cfg /usr/config/* /storage/.config/ 2>&1 >/var/log/configure.log
+  mkdir -p /storage/.config/emulationstation/themes 2>&1 >>/var/log/configure.log
+  ln -s /usr/share/themes/es-theme-art-book-next /storage/.config/emulationstation/themes/system-theme 2>&1 >>/var/log/configure.log
+  ln -s /usr/share/themes/es-theme-minielec /storage/.config/emulationstation/themes/es-theme-minielec 2>&1 >>/var/log/configure.log
+  ln -s /usr/share/themes/es-theme-minimal /storage/.config/emulationstation/themes/es-theme-minimal 2>&1 >>/var/log/configure.log
 
   ### Link the game controller database so it is managed with OS updates.
-  rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt
-  ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt
+  rm -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt 2>&1 >>/var/log/configure.log
+  ln -s /usr/config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt 2>&1 >>/var/log/configure.log
 
   ### Remove and link es configs so they are managed with OS updates.
   for es_cfg in es_features.cfg es_systems.cfg
   do
-    ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg}
+    ln -s /usr/config/emulationstation/${es_cfg} /storage/.config/emulationstation/${es_cfg} 2>&1 >>/var/log/configure.log
   done
 
   ### Link the ES splash to the distribution splash
-  rm -f /storage/.config/emulationstation/resources/logo.png
-  ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png
+  rm -f /storage/.config/emulationstation/resources/logo.png 2>&1 >>/var/log/configure.log
+  ln -sf /usr/config/splash/splash.png /storage/.config/emulationstation/resources/logo.png 2>&1 >>/var/log/configure.log
 
-  mkdir -p /storage/.config/modprobe.d
-  touch /storage/.configured
+  mkdir -p /storage/.config/modprobe.d 2>&1 >>/var/log/configure.log
+  touch /storage/.configured 2>&1 >>/var/log/configure.log
 fi
 
 if [ ! -e "/storage/.cache/ld.so.cache" ]
 then
   ### Create library cache
-  ldconfig -X 
+  ldconfig -X 2>&1 >>/var/log/configure.log
 fi
 
-if [ ! -d "/storage/.config/emulationstation/locale/" ]
+if [ ! -d "/storage/.config/emulationstation/locale" ]
 then
-  rsync -a --delete /usr/config/locale/ /storage/.config/emulationstation/locale/
+  rsync -a --delete /usr/config/locale/ /storage/.config/emulationstation/locale/ 2>&1 >>/var/log/configure.log
 fi

packages/sysutils/usbutils/package.mk

@@ -2,15 +2,14 @@
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 
 PKG_NAME="usbutils"
-PKG_VERSION="008"
-PKG_SHA256="44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c"
+PKG_VERSION="015"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.linux-usb.org/"
-PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libusb systemd"
 PKG_LONGDESC="This package contains various utilities for inspecting and setting of devices connected to the USB bus."
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/lsusb.py
-  rm -rf $INSTALL/usr/bin/usbhid-dump
+  rm -rf ${INSTALL}/usr/bin/lsusb.py
+  rm -rf ${INSTALL}/usr/bin/usbhid-dump
 }

packages/sysutils/v4l-utils/config/rc_maps.cfg.sample

@@ -1,20 +0,0 @@
-# Keymaps table
-#
-# This table creates an association between a keycode file and a kernel
-# driver. It can be used to automatically override a keycode definition.
-#
-#
-# Format:
-#       driver - name of the driver provided via uevent - use * for any driver
-#       table -  RC keymap table, provided via uevent - use * for any table
-#       file - file name. If directory is not specified, it is first looked up
-#               in /storage/.config/rc_keymaps, then /usr/lib/udev/rc_keymaps
-#
-# For example:
-#
-# driver        table           file
-#
-# gpio-rc-recv  rc-streamzap    streamzap
-# gpio-rc-recv  *               justboom
-# *             rc-rc6-mce      rc6_mce_new
-# *             *               hauppauge_new

packages/textproc/expat/package.mk

@@ -1,15 +1,24 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-# Copyright (C) 2022-present Fewtarius
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="expat"
 PKG_VERSION="2.5.0"
+PKG_SHA256="ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe"
 PKG_LICENSE="OSS"
-PKG_SITE="http://expat.sourceforge.net/"
-PKG_URL="https://github.com/libexpat/libexpat/releases/download/R_${PKG_VERSION//./_}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_SITE="https://libexpat.github.io"
+PKG_URL="https://github.com/libexpat/libexpat/releases/download/R_${PKG_VERSION//./_}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Expat is an XML parser library written in C."
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
-PKG_CMAKE_OPTS_HOST="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
-
+PKG_CMAKE_OPTS_TARGET="-DEXPAT_BUILD_DOCS=OFF \
+                       -DEXPAT_BUILD_TOOLS=OFF \
+                       -DEXPAT_BUILD_EXAMPLES=OFF \
+                       -DEXPAT_BUILD_TESTS=OFF \
+                       -DEXPAT_SHARED_LIBS=ON"
+PKG_CMAKE_OPTS_HOST="-DEXPAT_BUILD_DOCS=OFF \
+                     -DEXPAT_BUILD_TOOLS=OFF \
+                     -DEXPAT_BUILD_EXAMPLES=OFF \
+                     -DEXPAT_BUILD_TESTS=OFF \
+                     -DEXPAT_SHARED_LIBS=ON"

packages/themes/es-theme-art-book-next/package.mk

@@ -4,7 +4,7 @@
 # Copyright (C) 2021 Fewtarius
 
 PKG_NAME="es-theme-art-book-next"
-PKG_VERSION="c66f9a4ef63c189411fd85c6c481dc7c68a193bb"
+PKG_VERSION="fec4fa95b0fc208584626e5dbc468a9fad55c6eb"
 PKG_ARCH="any"
 PKG_LICENSE="CUSTOM"
 PKG_SITE="https://github.com/anthonycaccese/art-book-next-batocera"

packages/tools/dtc/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="dtc"
-PKG_VERSION="1.6.0"
-PKG_SHA256="af720893485b02441f8812773484b286f969d1b8c98769d435a75c6ad524104b"
+PKG_VERSION="1.6.1"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/"
 PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${PKG_VERSION}.tar.gz"

packages/tools/sysutils/git/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 
 PKG_NAME="git"
-PKG_VERSION="2.39.0"
+PKG_VERSION="2.39.1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://git-scm.com/"

packages/ui/emulationstation/config/common/es_features.cfg

@@ -241,6 +241,13 @@
       </feature>
     </features>
   </emulator>
+  <emulator name="rpcs3sa">
+    <features>
+      <feature name="internal resolution">
+        <choice name="720x480" value="1"/>
+      </feature>
+    </features>
+  </emulator>
   <emulator name="retroarch" features="ratio, smooth, shaders, pixel_perfect, latency_reduction, game_translation">
     <cores>
       <core name="2048" features="netplay, rewind, autosave" />

packages/ui/emulationstation/config/common/es_systems.cfg

@@ -1549,6 +1549,25 @@
          </emulator>
       </emulators>
    </system>
+   <system>
+      <name>ps3</name>
+      <fullname>PlayStation 3</fullname>
+      <manufacturer>Sony</manufacturer>
+      <release>2006</release>
+      <hardware>console</hardware>
+      <path>/storage/roms/ps3</path>
+      <extension>.ps3 .PS3 .bin .BIN</extension>
+      <command>/usr/bin/runemu.sh %ROM% -P%SYSTEM% --core=%CORE% --emulator=%EMULATOR% --controllers="%CONTROLLERSCONFIG%"</command>
+      <platform>ps3</platform>
+      <theme>ps3</theme>
+      <emulators>
+         <emulator name="rpcs3sa">
+            <cores>
+               <core>rpcs3sa</core>
+            </cores>
+         </emulator>
+      </emulators>
+   </system>
    <system>
       <name>psp</name>
       <fullname>PlayStation Portable</fullname>

packages/ui/emulationstation/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="9d06419"
+PKG_VERSION="f8ad59d"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"

packages/virtual/emulators/package.mk

@@ -32,7 +32,7 @@ PKG_DEPENDS_TARGET="${PKG_EMUS} ${PKG_RETROARCH} ${LIBRETRO_CORES}"
 case "${DEVICE}" in
   handheld)
     PKG_DEPENDS_TARGET+=" dolphinsa cemu citra citrasa desmume lrps2 melondssa minivmac minivmacsa       \
-                        pcsx2sa play primehack yuzusa"
+                        pcsx2sa play primehack rpcs3sa yuzusa"
   ;;
   RK3588)
     PKG_DEPENDS_TARGET+=" aethersx2"