Merge pull request #1388 from JustEnoughLinuxOS/dev

PR for release
2023-05-02 12:14:41 -04:00 · 2023-05-02 12:14:41 -04:00 · f72d1ae661
commit f72d1ae661
parent 490db0965d 9aa0a54b25
56 changed files with 13858 additions and 5876 deletions
--- a/config/blocklist
+++ b/config/blocklist
@ -1,5 +1,3 @@
-ppsspp-sa # Manage PPSSPP manually for now.
-ppsspp-lr # Manage the libretro core manually as well.
 np2kai # Last major commit before hiatus is broken.
 vice-sa # Doesn't support updating with the script.
 dolphin-sa # Wayland patch is now broken upstream
--- a/distributions/JELOS/options
+++ b/distributions/JELOS/options
@ -40,9 +40,6 @@
 # build and install PulseAudio support (yes / no)
  PULSEAUDIO_SUPPORT="yes"

-# Fetch seconds since epoch for packages with no external sources.
-  AUTO_VERSION=$(date +%s)
-
 # Define package sets to clean based on the type of build being executed.
 # This should be updated to be more dynamic in the future.
  CLEAN_OS_BASE="initramfs system-utils modules quirks autostart splash jelos"
--- a/packages/compat/lib32/package.mk
+++ b/packages/compat/lib32/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)

 PKG_NAME="lib32"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="aarch64 x86_64"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain retroarch SDL2 libsndfile libmodplug"
--- a/packages/emulators/libretro/beetle-lynx-lr/package.mk
+++ b/packages/emulators/libretro/beetle-lynx-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="beetle-lynx-lr"
-PKG_VERSION="3667b2a0c7790f743d77a0c2ac17b14bce4cfec4"
+PKG_VERSION="9812bb4065e30c8ff3363432cbdb4a4c6c13d4d3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/fbneo-lr/package.mk
+++ b/packages/emulators/libretro/fbneo-lr/package.mk
@ -3,7 +3,7 @@
 # Maintenance 2020 351ELEC team (https://github.com/fewtarius/351ELEC)

 PKG_NAME="fbneo-lr"
-PKG_VERSION="b69daddc431c6c4e25958967cfebec440e89bf95"
+PKG_VERSION="e7a6ea32228ce34eb116137bfcf0ff1472d33d52"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Non-commercial"
--- a/packages/emulators/libretro/gambatte-lr/package.mk
+++ b/packages/emulators/libretro/gambatte-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="gambatte-lr"
-PKG_VERSION="b13159169d22fcb8b976f4e3ab8620b16aeca514"
+PKG_VERSION="9574b6ef5961dcadc3fb5601779b673147515073"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/libretro-database/package.mk
+++ b/packages/emulators/libretro/libretro-database/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="libretro-database"
-PKG_VERSION="1b93d53411a12a5aa0372076dfcfaca8e3bf173a"
+PKG_VERSION="6809e6aa4f4600fd91457cf5361d4543ccfae611"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/mupen64plus-nx-lr/package.mk
+++ b/packages/emulators/libretro/mupen64plus-nx-lr/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="mupen64plus-nx-lr"
-PKG_VERSION="4353b0aeeed0899133b6e148e258eb638627cda5"
+PKG_VERSION="90dae29e145f5ff07e753d602f2c40583e3afee7"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/libretro/mupen64plus-libretro-nx"
 PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
--- a/packages/emulators/libretro/ppsspp-lr/package.mk
+++ b/packages/emulators/libretro/ppsspp-lr/package.mk
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="ppsspp-lr"
-PKG_VERSION="74f9b55669e53b59ad942ff707f973a55d54c32b"
+PKG_VERSION="4a92275"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/hrydgard/ppsspp"
 PKG_URL="https://github.com/hrydgard/ppsspp.git"
--- a/packages/emulators/libretro/ppsspp-lr/patches/003-libretro-path-fix.patch
+++ b/packages/emulators/libretro/ppsspp-lr/patches/003-libretro-path-fix.patch
@ -1,31 +0,0 @@
-diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp
-index 9b4a20bd9..9a46971fd 100644
--- a/libretro/libretro.cpp
-+++ b/libretro/libretro.cpp
-@@ -993,15 +993,20 @@ void retro_init(void)
- 
-    retro_base_dir /= "PPSSPP";
- 
-   g_Config.currentDirectory = retro_base_dir;
-   g_Config.defaultCurrentDirectory = retro_base_dir;
-   g_Config.memStickDirectory = retro_save_dir;
-   g_Config.flash0Directory = retro_base_dir / "flash0";
-   g_Config.internalDataDirectory = retro_base_dir;
-+   g_Config.defaultCurrentDirectory = Path(getenv("HOME"));
-+   g_Config.memStickDirectory = g_Config.defaultCurrentDirectory / ".config/ppsspp";
-+   g_Config.flash0Directory = g_Config.memStickDirectory / "assets" / "flash0";
-+   g_Config.internalDataDirectory = g_Config.memStickDirectory;
-+
-+   //g_Config.currentDirectory = retro_base_dir;
-+   //g_Config.defaultCurrentDirectory = retro_base_dir;
-+   //g_Config.memStickDirectory = retro_save_dir;
-+   //g_Config.flash0Directory = retro_base_dir / "flash0";
-+   //g_Config.internalDataDirectory = retro_base_dir;
-    g_Config.bEnableNetworkChat = false;
-    g_Config.bDiscordPresence = false;
- 
-   VFSRegister("", new DirectoryAssetReader(retro_base_dir));
-+   VFSRegister("", new DirectoryAssetReader(g_Config.memStickDirectory / "assets"));
- 
-    host = new LibretroHost();
- }
--- a/packages/emulators/libretro/puae-lr/package.mk
+++ b/packages/emulators/libretro/puae-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="puae-lr"
-PKG_VERSION="9b065c0957416b81c06b2b78a9d021200b4262cb"
+PKG_VERSION="0df8271879aaca414ef5fe04d6f2e3cccbad42ec"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/scummvm-lr/package.mk
+++ b/packages/emulators/libretro/scummvm-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="scummvm-lr"
-PKG_VERSION="5873ee968885676902df2c6765f0f520680ba80e"
+PKG_VERSION="b5ca1b340e1a6249997fde8a60f366d039b868b4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
--- a/packages/emulators/libretro/slang-shaders/package.mk
+++ b/packages/emulators/libretro/slang-shaders/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="slang-shaders"
-PKG_VERSION="d001ba266c7682f218f6ee9c0a34f60b8bcfaca3"
+PKG_VERSION="d114c416864c85a8928abd2d7c42d8269f87fdce"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/emulators/libretro/stella-lr/package.mk
+++ b/packages/emulators/libretro/stella-lr/package.mk
@ -20,7 +20,7 @@
 ################################################################################

 PKG_NAME="stella-lr"
-PKG_VERSION="ed68467ff068a685739ffdd814b3398312dd28bc"
+PKG_VERSION="d6655fc9ab972c17dd0932870f4c1a5ae3319469"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/stella-emu/stella"
--- a/packages/emulators/standalone/duckstation-sa/package.mk
+++ b/packages/emulators/standalone/duckstation-sa/package.mk
@ -16,7 +16,7 @@ case ${DEVICE} in
    PKG_CMAKE_OPTS_TARGET+=" -DUSE_DRMKMS=ON -DENABLE_EGL=ON -DUSE_MALI=OFF"
  ;;
  *)
-    PKG_VERSION="991f7312b25ee9d3dc98b39d1944314db026f954"
+    PKG_VERSION="4cbb6e224787b5ae90b38d3cadffc4ccbe5754f0"
    PKG_PATCH_DIRS+=" wayland"
  ;;
 esac
--- a/packages/emulators/standalone/flycast-sa/package.mk
+++ b/packages/emulators/standalone/flycast-sa/package.mk
@ -4,7 +4,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="flycast-sa"
-PKG_VERSION="d3a3cab425b402b39e71751fa0b064a4d687a666"
+PKG_VERSION="5f161df06b0c206d0a43494a8435b545e6d2748a"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/emulators/standalone/hatarisa/package.mk
+++ b/packages/emulators/standalone/hatarisa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2018-present 5schatten (https://github.com/5schatten)

 PKG_NAME="hatarisa"
-PKG_VERSION="6b23ff07bbdf3455c7efce95cc7acbd3c02c30bf"
+PKG_VERSION="024cc3f4551389093b231e40469b693c3b741eb2"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hatari/hatari"
 PKG_URL="https://github.com/hatari/hatari/archive/${PKG_VERSION}.tar.gz"
--- a/packages/emulators/standalone/pico-8/package.mk
+++ b/packages/emulators/standalone/pico-8/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="pico-8"
-PKG_VERSION="df9e395f5d85a1ad7eae2f96080b07d18742ffbd"
+PKG_VERSION="a6f85683668c8ff1acb687861f9e18e73bafee79"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE=""
--- a/packages/emulators/standalone/ppsspp-sa/package.mk
+++ b/packages/emulators/standalone/ppsspp-sa/package.mk
@ -4,6 +4,9 @@
 PKG_NAME="ppsspp-sa"
 PKG_REV="1"
 PKG_ARCH="any"
+PKG_SITE="https://github.com/hrydgard/ppsspp"
+PKG_URL="${PKG_SITE}.git"
+PKG_VERSION="4a92275"
 PKG_LICENSE="GPLv2"
 PKG_DEPENDS_TARGET="toolchain ffmpeg libzip SDL2 zlib zip"
 PKG_SHORTDESC="PPSSPPDL"
@ -12,19 +15,6 @@ GET_HANDLER_SUPPORT="git"

 PKG_PATCH_DIRS+="${DEVICE}"

-case ${DEVICE} in
- RK35*)
-        PKG_VERSION="40386bca08d33c2d6584d6e7da4efee9bfeb3f96"
-	PKG_SITE="https://github.com/hrydgard/ppsspp"
-        PKG_URL="${PKG_SITE}.git"
-  ;;
-  *)
-	PKG_VERSION="be83355"
-	PKG_SITE="https://github.com/hrydgard/ppsspp"
-        PKG_URL="${PKG_SITE}.git"
-  ;;
-esac
-
 PKG_CMAKE_OPTS_TARGET=" -DUSE_SYSTEM_FFMPEG=OFF \
                        -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_SYSTEM_NAME=Linux \
--- a/packages/emulators/standalone/ppsspp-sa/patches/001-exit-to-jelos.patch
+++ b/packages/emulators/standalone/ppsspp-sa/patches/001-exit-to-jelos.patch
@ -1,55 +0,0 @@
-MRFIXIT: Add the option to exit the emulator completely from the pause screen
-Fewtarius: Update for 351ELEC
--- a/UI/PauseScreen.h
-+++ b/UI/PauseScreen.h
-@@ -40,6 +40,7 @@
- private:
- 	UI::EventReturn OnGameSettings(UI::EventParams &e);
- 	UI::EventReturn OnExitToMenu(UI::EventParams &e);
-+	UI::EventReturn OnExitToBatocera(UI::EventParams &e);
- 	UI::EventReturn OnReportFeedback(UI::EventParams &e);
-
- 	UI::EventReturn OnRewind(UI::EventParams &e);
--- a/UI/PauseScreen.cpp
-+++ b/UI/PauseScreen.cpp
-@@ -386,6 +386,8 @@
- 		rightColumnItems->Add(new Choice(mm->T("Exit")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
- 	} else {
- 		rightColumnItems->Add(new Choice(pa->T("Exit to menu")))->OnClick.Handle(this, &GamePauseScreen::OnExitToMenu);
-+		rightColumnItems->Add(new Spacer(25.0));
-+		rightColumnItems->Add(new Choice(pa->T("Exit to JELOS")))->OnClick.Handle(this, &GamePauseScreen::OnExitToBatocera);
- 	}
- }
-
-@@ -437,6 +439,31 @@
- 	return UI::EVENT_DONE;
- }
-
-+UI::EventReturn GamePauseScreen::OnExitToBatocera(UI::EventParams &e) {
-+	if (g_Config.bPauseMenuExitsEmulator) {
-+		System_SendMessage("finish", "");
-+	} else {
-+		TriggerFinish(DR_OK);
-+	}
-+
-+	System_SendMessage("event", "exitprogram");
-+
-+	// Request the framework to exit cleanly.
-+	System_SendMessage("finish", "");
-+
-+	// However, let's make sure the config was saved, since it may not have been.
-+	g_Config.Save("MainScreen::OnExit");
-+
-+#ifdef __ANDROID__
-+#ifdef ANDROID_NDK_PROFILER
-+	moncleanup();
-+#endif
-+#endif
-+
-+	UpdateUIState(UISTATE_EXIT);
-+	return UI::EVENT_DONE;
-+}
-+
- UI::EventReturn GamePauseScreen::OnReportFeedback(UI::EventParams &e) {
- 	screenManager()->push(new ReportScreen(gamePath_));
- 	return UI::EVENT_DONE;
--- a/packages/emulators/standalone/ppsspp-sa/patches/002-fullscreen_drm.patch
+++ b/packages/emulators/standalone/ppsspp-sa/patches/002-fullscreen_drm.patch
@ -1,13 +1,14 @@
-diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
--- PPSSPPSDL.orig/SDL/SDLMain.cpp	2022-12-10 09:06:22.351896562 -0500
-+++ PPSSPPSDL/SDL/SDLMain.cpp	2022-12-10 09:07:31.488519195 -0500
-@@ -460,11 +460,11 @@ void ToggleFullScreenIfFlagSet(SDL_Windo
+diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
+index d81157d83..28db181b4 100644
+--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
+@@ -539,11 +539,11 @@ void UpdateWindowState(SDL_Window *window) {
 
 		Uint32 window_flags = SDL_GetWindowFlags(window);
- 		if (g_ToggleFullScreenType == -1) {
+ 		if (g_windowState.toggleFullScreenType == -1) {
 -			window_flags ^= SDL_WINDOW_FULLSCREEN_DESKTOP;
 +			window_flags ^= SDL_WINDOW_FULLSCREEN;
- 		} else if (g_ToggleFullScreenType == 1) {
+ 		} else if (g_windowState.toggleFullScreenType == 1) {
 -			window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 +			window_flags |= SDL_WINDOW_FULLSCREEN;
 		} else {
@ -16,7 +17,7 @@ diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
 		}
 		SDL_SetWindowFullscreen(window, window_flags);
 	}
-@@ -570,7 +570,7 @@ int main(int argc, char *argv[]) {
+@@ -654,7 +654,7 @@ int main(int argc, char *argv[]) {
 	Uint32 mode = 0;
 	for (int i = 1; i < argc; i++) {
 		if (!strcmp(argv[i],"--fullscreen")) {
@ -25,7 +26,7 @@ diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
 			g_Config.iForceFullScreen = 1;
 		} else if (set_xres == -2)
 			set_xres = parseInt(argv[i]);
-@@ -643,19 +643,19 @@ int main(int argc, char *argv[]) {
+@@ -727,19 +727,19 @@ int main(int argc, char *argv[]) {
 
 	// Force fullscreen if the resolution is too low to run windowed.
 	if (g_DesktopWidth < 480 * 2 && g_DesktopHeight < 272 * 2) {
@ -45,10 +46,10 @@ diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
 
 -	if (mode & SDL_WINDOW_FULLSCREEN_DESKTOP) {
 +	if (mode & SDL_WINDOW_FULLSCREEN) {
- 		pixel_xres = g_DesktopWidth;
- 		pixel_yres = g_DesktopHeight;
+ 		g_display.pixel_xres = g_DesktopWidth;
+ 		g_display.pixel_yres = g_DesktopHeight;
 		if (g_Config.iForceFullScreen == -1)
-@@ -726,7 +726,7 @@ int main(int argc, char *argv[]) {
+@@ -807,7 +807,7 @@ int main(int argc, char *argv[]) {
 
 	// Use the setting from the config when initing the window.
 	if (g_Config.UseFullScreen())
--- a/packages/emulators/standalone/ppsspp-sa/patches/003-disable-mouse.patch
+++ b/packages/emulators/standalone/ppsspp-sa/patches/003-disable-mouse.patch
@ -1,20 +1,11 @@
-diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
--- PPSSPPSDL.orig/SDL/SDLMain.cpp	2022-06-06 07:03:21.558185006 -0400
-+++ PPSSPPSDL/SDL/SDLMain.cpp	2022-06-06 07:29:43.562901323 -0400
-@@ -781,9 +781,7 @@ int main(int argc, char *argv[]) {
- 		printf("Init from thread error: '%s'\n", error_message.c_str());
- 	}
- 
-#ifdef MOBILE_DEVICE
- 	SDL_ShowCursor(SDL_DISABLE);
-#endif
- 
- 	if (!useEmuThread) {
- 		NativeInitGraphics(graphicsContext);
-@@ -874,12 +872,7 @@ int main(int argc, char *argv[]) {
- 						g_Config.iForceFullScreen = -1;
+diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp
+index d81157d83..3eaf5af42 100644
+--- a/SDL/SDLMain.cpp
+++ b/SDL/SDLMain.cpp
+@@ -996,12 +996,7 @@ int main(int argc, char *argv[]) {
+ 						g_Config.iWindowWidth = new_width;
+ 						g_Config.iWindowHeight = new_height;
 					}
- 
 -					// Hide/Show cursor correctly toggling fullscreen
 -					if (lastUIState == UISTATE_INGAME && fullscreen && !g_Config.bShowTouchControls) {
 -						SDL_ShowCursor(SDL_DISABLE);
@ -25,7 +16,7 @@ diff -rupN PPSSPPSDL.orig/SDL/SDLMain.cpp PPSSPPSDL/SDL/SDLMain.cpp
 					break;
 				}
 
-@@ -1142,10 +1135,7 @@ int main(int argc, char *argv[]) {
+@@ -1295,10 +1290,7 @@ int main(int argc, char *argv[]) {
 #if !defined(MOBILE_DEVICE)
 		if (lastUIState != GetUIState()) {
 			lastUIState = GetUIState();
--- a/packages/emulators/standalone/ppsspp-sa/patches/AMD64/004-no-vulkan-logspam.patch
+++ b/packages/emulators/standalone/ppsspp-sa/patches/AMD64/004-no-vulkan-logspam.patch
@ -1,21 +0,0 @@
-From 335788a932b56149a3204aeda6c885c9136ea4aa Mon Sep 17 00:00:00 2001
-From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
-Date: Thu, 16 Feb 2023 19:34:44 -0800
-Subject: [PATCH] Vulkan: Remove logspam.
-
---
- Common/GPU/Vulkan/VulkanContext.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Common/GPU/Vulkan/VulkanContext.cpp b/Common/GPU/Vulkan/VulkanContext.cpp
-index 23b0f8adb036..676860285219 100644
--- a/Common/GPU/Vulkan/VulkanContext.cpp
-+++ b/Common/GPU/Vulkan/VulkanContext.cpp
-@@ -1663,7 +1663,6 @@ void VulkanDeleteList::PerformDeletes(VulkanContext *vulkan, VmaAllocator alloca
- 	}
- 	imagesWithAllocs_.clear();
- 	for (auto &imageView : imageViews_) {
-		INFO_LOG(G3D, "deleting imageview %p", imageView);
- 		vkDestroyImageView(device, imageView, nullptr);
- 	}
- 	imageViews_.clear();
--- a/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh
+++ b/packages/emulators/standalone/ppsspp-sa/scripts/start_ppsspp.sh
@ -19,4 +19,4 @@ fi

 ARG=${1//[\\]/}
 export SDL_AUDIODRIVER=alsa          
-${EMUPERF} ppsspp "${ARG}"
+${EMUPERF} ppsspp --pause-menu-exit "${ARG}"
--- a/packages/emulators/standalone/retroarch/package.mk
+++ b/packages/emulators/standalone/retroarch/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present 351ELEC (https://github.com/351ELEC)

 PKG_NAME="retroarch"
-PKG_VERSION="c400fa761c80ede03494445d5ca8fe0d214896fa"
+PKG_VERSION="b2ff44553146b7489581ea719029a773a809ca58"
 PKG_SITE="https://github.com/libretro/RetroArch"
 PKG_URL="${PKG_SITE}.git"
 PKG_LICENSE="GPLv3"
--- a/packages/emulators/standalone/ryujinx-sa/package.mk
+++ b/packages/emulators/standalone/ryujinx-sa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2023-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="ryujinx-sa"
-PKG_VERSION="1.1.725"
+PKG_VERSION="1.1.743"
 PKG_ARCH="x86_64"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/Ryujinx"
--- a/packages/emulators/standalone/scummvmsa/package.mk
+++ b/packages/emulators/standalone/scummvmsa/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="scummvmsa"
-PKG_VERSION="68bc11b73d5ab830129132566285276e0ba7e5f3"
+PKG_VERSION="ca48af197cf3971d10252930585835f1375b7614"
 PKG_REV="1"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://github.com/scummvm/scummvm"
--- a/packages/emulators/standalone/xemu-sa/package.mk
+++ b/packages/emulators/standalone/xemu-sa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="xemu-sa"
-PKG_VERSION="v0.7.86"
+PKG_VERSION="v0.7.87"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/xemu-project/xemu"
--- a/packages/emulators/standalone/yuzu-sa/package.mk
+++ b/packages/emulators/standalone/yuzu-sa/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present BrooksyTech (https://github.com/brooksytech)

 PKG_NAME="yuzu-sa"
-PKG_VERSION="d60018358366304db271c76d64ee753f7dde14b4"
+PKG_VERSION="47938541c25528d1122e15b87dc0113bbbe94d13"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/yuzu-emu/yuzu"
--- a/packages/emulators/tools/gamecontrollerdb/sources/gamecontrollerdb.txt
+++ b/packages/emulators/tools/gamecontrollerdb/sources/gamecontrollerdb.txt
--- a/packages/emulators/tools/gamecontrollerdb/package.mk
+++ b/packages/emulators/tools/gamecontrollerdb/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)

 PKG_NAME="gamecontrollerdb"
-PKG_VERSION="01cca2e77f9bf9f1432be04f876f287eb78297fe"
+PKG_VERSION="38bda816dc786f18493876f7bc30bc12dfd2636a"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_DEPENDS_TARGET="toolchain SDL2"
@ -18,9 +18,9 @@ make_target() {

 makeinstall_target() {
  mkdir -p ${INSTALL}/usr/config/SDL-GameControllerDB
-  if [ -f "${PKG_DIR}/sources/gamecontrollerdb.txt" ]
+  if [ -f "${PKG_DIR}/config/gamecontrollerdb.txt" ]
  then
-    cat ${PKG_DIR}/sources/gamecontrollerdb.txt >${INSTALL}/usr/config/SDL-GameControllerDB/gamecontrollerdb.txt
+    cat ${PKG_DIR}/config/gamecontrollerdb.txt >${INSTALL}/usr/config/SDL-GameControllerDB/gamecontrollerdb.txt
  fi
  cat ${PKG_BUILD}/gamecontrollerdb.txt >>${INSTALL}/usr/config/SDL-GameControllerDB/gamecontrollerdb.txt
 }
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -0,0 +1,19 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+
+MYDEVICE=$(get_setting system.audiodevice)
+if [ -z "${MYDEVICE}" ]
+then
+  ### Set the audio device.
+  set-audio set "ALC269VB (1:0)"
+  set-audio esset "Master"
+fi
+
+### Disables speaker output when headphones are connected.
+alsactl restore -f /storage/.config/asound.state
+/usr/bin/amixer -c 1 sset "Auto-Mute Mode" Enabled
+alsactl store -f /storage/.config/asound.state
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -0,0 +1,17 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+if [ ! -d "/storage/.config/profile.d" ]
+then
+  mkdir -p /storage/.config/profile.d
+fi
+
+cat <<EOF >/storage/.config/profile.d/002-fancontrol
+DEVICE_HAS_FAN=true
+DEVICE_PWM_FAN="/sys/devices/platform/oxp-platform/hwmon/hwmon5/pwm1"
+DEVICE_TEMP_SENSOR="/sys/class/hwmon/hwmon2/temp1_input /sys/class/hwmon/hwmon3/temp1_input /sys/class/hwmon/hwmon4/temp1_input /sys/class/hwmon/hwmon5/temp1_input"
+EOF
+
--- a/packages/hardware/quirks/devices/AYANEO
+++ b/packages/hardware/quirks/devices/AYANEO
@ -0,0 +1,8 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+FPDEVICE=$(lsusb | awk '/2541:0236/ {print sprintf("%1d-", $2) sprintf("%1d",substr($4, 1, length($4)-1))}')
+echo "${FPDEVICE}" >/sys/bus/usb/drivers/usb/unbind
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -8,27 +8,14 @@
 set-audio set "CUSTOM (UNMANAGED)"
 set-audio esset "Master"

-cat <<EOF >/storage/.config/asound.conf
-ctl.!default {
-  type hw
-  card 0
-}
+amixer sset 'FRDDR_A SINK 1 SEL' 'OUT 1'
+amixer sset 'FRDDR_A SRC 1 EN' 'on'
+amixer sset 'TDMOUT_B SRC SEL' 'IN 0'

+cat <<EOF >/storage/.config/asound.conf
 pcm.!default {
 	type plug
-	slave.pcm "softvol"
-}
-
-pcm.softvol {
-    type softvol
-    slave.pcm "dmixer"
-    control {
-        name "Pre-Amp"
-        card 0
-    }
-    min_dB -5.0
-    max_dB 20.0
-    resolution 6
+	slave.pcm "dmixer"
 }

 pcm.dmixer  {
@ -39,7 +26,7 @@ pcm.dmixer  {
 	    period_time 0
 	    period_size 4096
 	    buffer_size 131072
-	    rate 176400
+	    rate 96000
 	}
 	bindings {
 	    0 0
@ -55,24 +42,24 @@ state.Ultra {
 	control.1 {
 		iface MIXER
 		name 'Master Playback Volume'
-		value.0 255
-		value.1 255
+		value.0 223
+		value.1 223
 		comment {
 			access 'read write'
 			type INTEGER
 			count 2
-			range '0 - 255'
+			range '0 - 252'
 			dbmin -9500
 			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
+			dbvalue.0 -1094
+			dbvalue.1 -1094
 		}
 	}
 	control.2 {
 		iface MIXER
 		name 'Master Capture Volume'
-		value.0 255
-		value.1 255
+		value.0 226
+		value.1 226
 		comment {
 			access 'read write'
 			type INTEGER
@ -80,15 +67,15 @@ state.Ultra {
 			range '0 - 255'
 			dbmin -9500
 			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
+			dbvalue.0 -1081
+			dbvalue.1 -1081
 		}
 	}
 	control.3 {
 		iface MIXER
 		name 'Mic Capture Gain'
-		value.0 15
-		value.1 15
+		value.0 6
+		value.1 6
 		comment {
 			access 'read write'
 			type INTEGER
@ -96,8 +83,8 @@ state.Ultra {
 			range '0 - 15'
 			dbmin -1800
 			dbmax 2700
-			dbvalue.0 2700
-			dbvalue.1 2700
+			dbvalue.0 0
+			dbvalue.1 0
 		}
 	}
 	control.4 {
@ -243,24 +230,6 @@ state.Ultra {
 		}
 	}
 	control.15 {
-		iface MIXER
-		name 'TODDR_A SRC SEL'
-		value 'IN 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'IN 0'
-			item.1 'IN 1'
-			item.2 'IN 2'
-			item.3 'IN 3'
-			item.4 'IN 4'
-			item.5 'IN 5'
-			item.6 'IN 6'
-			item.7 'IN 7'
-		}
-	}
-	control.16 {
 		iface MIXER
 		name 'Playback Mux'
 		value SPK
@ -272,33 +241,7 @@ state.Ultra {
 			item.1 SPK
 		}
 	}
-	control.17 {
-		iface MIXER
-		name 'TDMIN_B SRC SEL'
-		value 'IN 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'IN 0'
-			item.1 'IN 1'
-			item.2 'IN 2'
-			item.3 'IN 3'
-			item.4 'IN 4'
-			item.5 'IN 5'
-			item.6 'IN 6'
-			item.7 'IN 7'
-			item.8 'IN 8'
-			item.9 'IN 9'
-			item.10 'IN 10'
-			item.11 'IN 11'
-			item.12 'IN 12'
-			item.13 'IN 13'
-			item.14 'IN 14'
-			item.15 'IN 15'
-		}
-	}
-	control.18 {
+	control.16 {
 		iface MIXER
 		name 'TDMOUT_B SRC SEL'
 		value 'IN 0'
@ -312,8 +255,6 @@ state.Ultra {
 		}
 	}
 }
+
 EOF
 fi
-
-alsactl init
-alsactl -U --file /usr/lib/autostart/quirks/Hardkernel\ ODROID-GO-Ultra/asound.gou restore
--- a/packages/hardware/quirks/devices/Hardkernel
+++ b/packages/hardware/quirks/devices/Hardkernel
@ -1,261 +0,0 @@
-state.Ultra {
-	control.1 {
-		iface MIXER
-		name 'Master Playback Volume'
-		value.0 255
-		value.1 255
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-			dbmin -9500
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.2 {
-		iface MIXER
-		name 'Master Capture Volume'
-		value.0 255
-		value.1 255
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-			dbmin -9500
-			dbmax 0
-			dbvalue.0 0
-			dbvalue.1 0
-		}
-	}
-	control.3 {
-		iface MIXER
-		name 'Mic Capture Gain'
-		value.0 15
-		value.1 15
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 15'
-			dbmin -1800
-			dbmax 2700
-			dbvalue.0 2700
-			dbvalue.1 2700
-		}
-	}
-	control.4 {
-		iface MIXER
-		name 'TDMOUT_B Lane 0 Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-		}
-	}
-	control.5 {
-		iface MIXER
-		name 'TDMOUT_B Lane 1 Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-		}
-	}
-	control.6 {
-		iface MIXER
-		name 'TDMOUT_B Lane 2 Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-		}
-	}
-	control.7 {
-		iface MIXER
-		name 'TDMOUT_B Lane 3 Volume'
-		value.0 0
-		value.1 0
-		comment {
-			access 'read write'
-			type INTEGER
-			count 2
-			range '0 - 255'
-		}
-	}
-	control.8 {
-		iface MIXER
-		name 'TDMOUT_B Gain Enable Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.9 {
-		iface MIXER
-		name 'FRDDR_A SRC 1 EN Switch'
-		value true
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.10 {
-		iface MIXER
-		name 'FRDDR_A SRC 2 EN Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.11 {
-		iface MIXER
-		name 'FRDDR_A SRC 3 EN Switch'
-		value false
-		comment {
-			access 'read write'
-			type BOOLEAN
-			count 1
-		}
-	}
-	control.12 {
-		iface MIXER
-		name 'FRDDR_A SINK 1 SEL'
-		value 'OUT 1'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'OUT 0'
-			item.1 'OUT 1'
-			item.2 'OUT 2'
-			item.3 'OUT 3'
-			item.4 'OUT 4'
-			item.5 'OUT 5'
-			item.6 'OUT 6'
-			item.7 'OUT 7'
-		}
-	}
-	control.13 {
-		iface MIXER
-		name 'FRDDR_A SINK 2 SEL'
-		value 'OUT 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'OUT 0'
-			item.1 'OUT 1'
-			item.2 'OUT 2'
-			item.3 'OUT 3'
-			item.4 'OUT 4'
-			item.5 'OUT 5'
-			item.6 'OUT 6'
-			item.7 'OUT 7'
-		}
-	}
-	control.14 {
-		iface MIXER
-		name 'FRDDR_A SINK 3 SEL'
-		value 'OUT 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'OUT 0'
-			item.1 'OUT 1'
-			item.2 'OUT 2'
-			item.3 'OUT 3'
-			item.4 'OUT 4'
-			item.5 'OUT 5'
-			item.6 'OUT 6'
-			item.7 'OUT 7'
-		}
-	}
-	control.15 {
-		iface MIXER
-		name 'TODDR_A SRC SEL'
-		value 'IN 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'IN 0'
-			item.1 'IN 1'
-			item.2 'IN 2'
-			item.3 'IN 3'
-			item.4 'IN 4'
-			item.5 'IN 5'
-			item.6 'IN 6'
-			item.7 'IN 7'
-		}
-	}
-	control.16 {
-		iface MIXER
-		name 'Playback Mux'
-		value SPK
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 HP
-			item.1 SPK
-		}
-	}
-	control.17 {
-		iface MIXER
-		name 'TDMIN_B SRC SEL'
-		value 'IN 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'IN 0'
-			item.1 'IN 1'
-			item.2 'IN 2'
-			item.3 'IN 3'
-			item.4 'IN 4'
-			item.5 'IN 5'
-			item.6 'IN 6'
-			item.7 'IN 7'
-			item.8 'IN 8'
-			item.9 'IN 9'
-			item.10 'IN 10'
-			item.11 'IN 11'
-			item.12 'IN 12'
-			item.13 'IN 13'
-			item.14 'IN 14'
-			item.15 'IN 15'
-		}
-	}
-	control.18 {
-		iface MIXER
-		name 'TDMOUT_B SRC SEL'
-		value 'IN 0'
-		comment {
-			access 'read write'
-			type ENUMERATED
-			count 1
-			item.0 'IN 0'
-			item.1 'IN 1'
-			item.2 'IN 2'
-		}
-	}
-}
--- a/packages/hardware/quirks/package.mk
+++ b/packages/hardware/quirks/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="quirks"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="apache2"
 PKG_SITE=""
--- a/packages/jelos/package.mk
+++ b/packages/jelos/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="jelos"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="apache2"
 PKG_SITE=""
--- a/packages/jelos/profile.d/02-distribution
+++ b/packages/jelos/profile.d/02-distribution
@ -79,4 +79,5 @@ log() {
  MESSAGE=${*#${1}}
  MESSAGE=${MESSAGE# }
  logger -t ${SOURCE} "${MESSAGE}"
+  echo "$(date) ${SOURCE}: ${MESSAGE}" >>/var/log/messages
 }
--- a/packages/jelos/sources/scripts/automount
+++ b/packages/jelos/sources/scripts/automount
@ -17,6 +17,17 @@ then
  exit 0
 fi

+load_modules() {
+  for MODULE in exfat vfat
+  do
+    lsmod | grep ${MODULE} 2>/dev/null
+    if [ ! $? = 0 ]
+    then
+      modprobe ${MODULE} 2>/dev/null
+    fi
+  done
+}
+
 mount_games() {
      NULL=$(cat /proc/mounts | grep -v -e "/var/media" 2>/dev/null | grep ${1})
      if [ ! "$?" = "0" ] && \
@ -24,7 +35,7 @@ mount_games() {
         [ ! -e "/storage/.please_resize_me" ]
      then
        log $0 "Mounting ${1} on /storage/roms"
-        mount ${1} /storage/roms >/dev/null 2>&1
+        /usr/bin/busybox mount ${1} /storage/roms >/dev/null 2>&1
        /usr/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/jelos-dirs.conf >/dev/null 2>&1
      fi
 }
@ -36,7 +47,7 @@ find_games() {
      /usr/bin/busybox mkdir -p /storage/roms >/dev/null 2>&1
    fi

-    for DEV in $(blkid | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r)
+    for DEV in $(for dev in mmcblk[0-9] sd[a-z] nvme[0-9]; do blkid | grep ${dev} | awk 'BEGIN {FS=":"}; /ext4/ || /fat/ {print $1}' | sort -r; done)
    do
      ROOTDEV=$(echo ${DEV} | sed -e "s#^/.*/##g" -e "s#p[0-9].*\$##g")
      SIZE=$(awk '/'${ROOTDEV}'$/ {print $3}' /proc/partitions)
@ -66,6 +77,8 @@ find_games() {
  fi
 }

+load_modules
+
 if [ -e "${GAMES_DEVICE}" ]
 then
  mount_games ${GAMES_DEVICE}
--- a/packages/jelos/system.d/jelos-automount.service
+++ b/packages/jelos/system.d/jelos-automount.service
@ -6,7 +6,9 @@ After=systemd-tmpfiles-setup.service
 [Service]
 Type=oneshot
 Environment=HOME=/storage
-ExecStart=-/bin/sh -c ". /etc/profile; exec /bin/sh /usr/bin/automount; exec systemd-tmpfiles --create"
+EnvironmentFile=/etc/profile
+ExecStart=/usr/bin/automount
+ExecStartPost=systemd-tmpfiles --create /usr/lib/tmpfiles.d/jelos-dirs.conf
 RemainAfterExit=yes

 [Install]
--- a/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk
+++ b/packages/kernel/linux-firmware/RTL8821CS-firmware/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="RTL8821CS-firmware"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="www.jelos.org"
 PKG_LONGDESC="Realtek RTL8821CS Linux firmware"
--- a/packages/kernel/linux/package.mk
+++ b/packages/kernel/linux/package.mk
@ -4,7 +4,7 @@

 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_VERSION="6.1.26"
+PKG_VERSION="6.1.27"
 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"
--- a/packages/kernel/linux/patches/AMD64/002-ayaneo-sensors.patch
+++ b/packages/kernel/linux/patches/AMD64/002-ayaneo-sensors.patch
@ -1,101 +1,6 @@
-From mboxrd@z Thu Jan  1 00:00:00 1970
-Return-Path: <linux-kernel-owner@kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
-	aws-us-west-2-korg-lkml-1.web.codeaurora.org
-Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
-	by smtp.lore.kernel.org (Postfix) with ESMTP id EEFD6C4332F
-	for <linux-kernel@archiver.kernel.org>; Wed, 14 Dec 2022 15:48:10 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-        id S238903AbiLNPsJ (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
-        Wed, 14 Dec 2022 10:48:09 -0500
-Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50528 "EHLO
-        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-        with ESMTP id S238850AbiLNPrd (ORCPT
-        <rfc822;linux-kernel@vger.kernel.org>);
-        Wed, 14 Dec 2022 10:47:33 -0500
-Received: from mail-oo1-xc34.google.com (mail-oo1-xc34.google.com [IPv6:2607:f8b0:4864:20::c34])
-        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEC4A27FE6;
-        Wed, 14 Dec 2022 07:47:17 -0800 (PST)
-Received: by mail-oo1-xc34.google.com with SMTP id f184-20020a4a58c1000000b004a3c01646a0so2310106oob.12;
-        Wed, 14 Dec 2022 07:47:17 -0800 (PST)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=gmail.com; s=20210112;
-        h=content-transfer-encoding:mime-version:references:in-reply-to
-         :message-id:date:subject:cc:to:from:from:to:cc:subject:date
-         :message-id:reply-to;
-        bh=MB+cjJ0APVSPLYKSXokJmYfJJzb5hyUnGFn3uvrOCQs=;
-        b=VknEFKrJmu9Pr/B/X9LlnnHGqp1nZzP9w+qqAkBG+UBa5JNhLLcWpOlBltqY/z9/7+
-         yd/oHDf6H8tbtxDUCWGQbI2O9B7Cq+P/cB0vV0cIuUDigV1N/ZMx5dtjATaUcwo+Zrjl
-         pmdtVyaS8CoZuYBs9Kqfs1DR/B5acRfI25qWN6pkBgKx8b1DrswACaCx29NwOzKrtjYj
-         GMdHgzxZIefyoePCFeX3IxhD5rOIoyFRtUMWQ3yPdmM/KVlwUPT8od2t7PxnIcfW4PLG
-         3ztosdgEWlInX6BtPzv4V7SZx3DXs5KGg3hQsA93dc30TbVwo8p0iGSxREgbbRITpz74
-         IU+g==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20210112;
-        h=content-transfer-encoding:mime-version:references:in-reply-to
-         :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
-         :subject:date:message-id:reply-to;
-        bh=MB+cjJ0APVSPLYKSXokJmYfJJzb5hyUnGFn3uvrOCQs=;
-        b=gJSFFXFO0IF56KU5C3PhOBBKUC5CCCJX0g1n6EL4TWuaRxI6spTFWE1dC9LqtvM4uh
-         bkdrpXOGgHSCGK7ZtQiqjwb7SrmbgC4HgikinJc/bS0fbF/fFrpmVSF+OKaz2JeJNJAt
-         7Veor+PQn8vK91kTmKT6J9oJ8OZ3EKPmjTgdhDBI2+Fy4NO7U+tBPurecFA7M3yu+gGH
-         PDkKs5qW48VfmpzovIyvDw1bVWwUp+AIj6W0ht9AIKKsWaNbF5LsshLyRF4TR34Q00r1
-         MBWR3ysNw0cAMO/HN7ESaTVCimbcZrACYh9gUxnhbF4CdgTOQo625JjsESmqhVEvjseC
-         QFFA==
-X-Gm-Message-State: ANoB5plWAiyiI7vMPOkGQW+T6H38IIy8U9DdPTldcBUkaNvcBJ+RiUqa
-        fWsx0XmVox36DHMI8L5ivtk=
-X-Google-Smtp-Source: AA0mqf4haL+cQbuRxCnem1h+c5sf2MFQ7DNmFMcC4n1xjH0BM9e9aVMOR8ADEbdobsXs41hj7MitqA==
-X-Received: by 2002:a4a:e511:0:b0:4a0:9e4e:11ac with SMTP id r17-20020a4ae511000000b004a09e4e11acmr11549450oot.7.1671032837009;
-        Wed, 14 Dec 2022 07:47:17 -0800 (PST)
-Received: from localhost.localdomain (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20])
-        by smtp.gmail.com with ESMTPSA id v9-20020a4ae049000000b004a3543fbfbbsm2386367oos.14.2022.12.14.07.47.16
-        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
-        Wed, 14 Dec 2022 07:47:16 -0800 (PST)
-From:   "Derek J. Clark" <derekjohn.clark@gmail.com>
-To:     linux@roeck-us.net
-Cc:     "Derek J. Clark" <derekjohn.clark@gmail.com>,
-        Jean Delvare <jdelvare@suse.com>,
-        Jonathan Corbet <corbet@lwn.net>,
-        =?UTF-8?q?Joaqu=C3=ADn=20Ignacio=20Aramend=C3=ADa?= 
-        <samsagax@gmail.com>, linux-hwmon@vger.kernel.org,
-        linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
-Subject: [PATCH v2] hwmon: (oxp-sensors) Add AYANEO AIR and AIR Pro
-Date:   Wed, 14 Dec 2022 07:47:13 -0800
-Message-Id: <20221214154713.100648-1-derekjohn.clark@gmail.com>
-X-Mailer: git-send-email 2.38.1
-In-Reply-To: <Y5lBue87IXkhNs42@debian.me>
-References: <Y5lBue87IXkhNs42@debian.me>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-
-Add support for the AYANEO AIR and AYANEO AIR Pro models of handheld
-devices. These devices use the same EC registers and logic as the One X
-Player mini AMD. Previous AYANEO models are not supported as they use a
-different EC and do not have the necessary fan speed write enable and
-setting registers. Tihe driver is tested on Aya Neo AIR while AIR Pro
-model EC functionality and DMI data were verified using command line
-tools by another user.
-
-The added devices are:
- AYANEO AIR (AMD 5560U)
- AYANEO AIR Pro (AMD 5560U)
- AYANEO AIR Pro (AMD 5825U)
-
-Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
---
- Documentation/hwmon/oxp-sensors.rst | 19 ++++++----
- MAINTAINERS                         |  1 +
- drivers/hwmon/oxp-sensors.c         | 54 ++++++++++++++++++++++++-----
- 3 files changed, 59 insertions(+), 15 deletions(-)
-
-diff --git a/Documentation/hwmon/oxp-sensors.rst b/Documentation/hwmon/oxp-sensors.rst
-index 39c588ec5c50..a53c961065b2 100644
--- a/Documentation/hwmon/oxp-sensors.rst
-+++ b/Documentation/hwmon/oxp-sensors.rst
+diff -rupN linux-6.1.27.orig/Documentation/hwmon/oxp-sensors.rst linux-6.1.27/Documentation/hwmon/oxp-sensors.rst
+--- linux-6.1.27.orig/Documentation/hwmon/oxp-sensors.rst	2023-05-02 01:46:52.201812789 +0000
+++ linux-6.1.27/Documentation/hwmon/oxp-sensors.rst	2023-05-02 01:46:58.725674940 +0000
@@ -3,18 +3,21 @@
 Kernel driver oxp-sensors
 =========================
@ -134,22 +39,9 @@ index 39c588ec5c50..a53c961065b2 100644
  - OneXPlayer AMD
  - OneXPlayer mini AMD
  - OneXPlayer mini AMD PRO
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 90220659206c..8bce95170f12 100644
--- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -15346,6 +15346,7 @@ F:	drivers/mtd/nand/onenand/
- F:	include/linux/mtd/onenand*.h
- 
- ONEXPLAYER FAN DRIVER
-+M:	Derek John Clark <derekjohn.clark@gmail.com>
- M:	Joaquín Ignacio Aramendía <samsagax@gmail.com>
- L:	linux-hwmon@vger.kernel.org
- S:	Maintained
-diff --git a/drivers/hwmon/oxp-sensors.c b/drivers/hwmon/oxp-sensors.c
-index f84ec8f8eda9..7adc0199ea66 100644
--- a/drivers/hwmon/oxp-sensors.c
-+++ b/drivers/hwmon/oxp-sensors.c
+diff -rupN linux-6.1.27.orig/drivers/hwmon/oxp-sensors.c linux-6.1.27/drivers/hwmon/oxp-sensors.c
+--- linux-6.1.27.orig/drivers/hwmon/oxp-sensors.c	2023-05-02 01:46:52.213812535 +0000
+++ linux-6.1.27/drivers/hwmon/oxp-sensors.c	2023-05-02 12:03:27.665299741 +0000
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
@ -169,37 +61,45 @@ index f84ec8f8eda9..7adc0199ea66 100644
  * Fan control is provided via pwm interface in the range [0-255].
  * Old AMD boards use [0-100] as range in the EC, the written value is
  * scaled to accommodate for that. Newer boards like the mini PRO and
-@@ -42,6 +42,8 @@ static bool unlock_global_acpi_lock(void)
+@@ -42,6 +42,9 @@ static bool unlock_global_acpi_lock(void
 
 enum oxp_board {
 	aok_zoe_a1 = 1,
 +	aya_neo_air,
 +	aya_neo_air_pro,
+	aya_neo_air_plus,
 	oxp_mini_amd,
 	oxp_mini_amd_pro,
 };
-@@ -60,6 +62,20 @@ static const struct dmi_system_id dmi_table[] = {
- 		},
- 		.driver_data = (void *) &(enum oxp_board) {aok_zoe_a1},
+@@ -62,6 +65,27 @@ static const struct dmi_system_id dmi_ta
 	},
-+	{
-+		.matches = {
+ 	{
+ 		.matches = {
 +			DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
-+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "AIR"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AIR"),
 +		},
 +		.driver_data = (void *) &(enum oxp_board) {aya_neo_air},
 +	},
 +	{
 +		.matches = {
 +			DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
-+			DMI_EXACT_MATCH(DMI_BOARD_NAME, "AIR Pro"),
+			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AIR Pro"),
 +		},
 +		.driver_data = (void *) &(enum oxp_board) {aya_neo_air_pro},
 +	},
- 	{
- 		.matches = {
+        {
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AIR Plus"),
+                },
+                .driver_data = (void *) &(enum oxp_board) {aya_neo_air_plus},
+        },
+	{
+		.matches = {
 			DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
-@@ -161,8 +177,19 @@ static int oxp_platform_read(struct device *dev, enum hwmon_sensor_types type,
+ 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONE XPLAYER"),
+ 		},
+@@ -161,8 +185,20 @@ static int oxp_platform_read(struct devi
 			ret = read_from_ec(OXP_SENSOR_PWM_REG, 1, val);
 			if (ret)
 				return ret;
@ -209,6 +109,7 @@ index f84ec8f8eda9..7adc0199ea66 100644
 +				break;
 +			case aya_neo_air:
 +			case aya_neo_air_pro:
+			case aya_neo_air_plus:
 +			case oxp_mini_amd:
 				*val = (*val * 255) / 100;
 +				break;
@ -220,7 +121,7 @@ index f84ec8f8eda9..7adc0199ea66 100644
 			return 0;
 		case hwmon_pwm_enable:
 			return read_from_ec(OXP_SENSOR_PWM_ENABLE_REG, 1, val);
-@@ -191,8 +218,19 @@ static int oxp_platform_write(struct device *dev, enum hwmon_sensor_types type,
+@@ -191,8 +227,20 @@ static int oxp_platform_write(struct dev
 		case hwmon_pwm_input:
 			if (val < 0 || val > 255)
 				return -EINVAL;
@ -230,6 +131,7 @@ index f84ec8f8eda9..7adc0199ea66 100644
 +				break;
 +			case aya_neo_air:
 +			case aya_neo_air_pro:
+			case aya_neo_air_plus:
 +			case oxp_mini_amd:
 				val = (val * 100) / 255;
 +				break;
@ -241,6 +143,30 @@ index f84ec8f8eda9..7adc0199ea66 100644
 			return write_to_ec(dev, OXP_SENSOR_PWM_REG, val);
 		default:
 			break;
-- 
-2.38.1
-
+diff -rupN linux-6.1.27.orig/MAINTAINERS linux-6.1.27/MAINTAINERS
+--- linux-6.1.27.orig/MAINTAINERS	2023-05-02 01:46:52.217812450 +0000
+++ linux-6.1.27/MAINTAINERS	2023-05-02 01:46:58.729674855 +0000
+@@ -15348,6 +15348,7 @@ F:	drivers/mtd/nand/onenand/
+ F:	include/linux/mtd/onenand*.h
+ 
+ ONEXPLAYER FAN DRIVER
+M:	Derek John Clark <derekjohn.clark@gmail.com>
+ M:	Joaquín Ignacio Aramendía <samsagax@gmail.com>
+ L:	linux-hwmon@vger.kernel.org
+ S:	Maintained
+diff -rupN linux-6.1.27.orig/MAINTAINERS.orig linux-6.1.27/MAINTAINERS.orig
+--- linux-6.1.27.orig/MAINTAINERS.orig	2023-05-01 20:39:26.912428456 +0000
+++ linux-6.1.27/MAINTAINERS.orig	2023-05-02 01:46:41.170045608 +0000
+@@ -15347,6 +15347,12 @@ S:	Maintained
+ F:	drivers/mtd/nand/onenand/
+ F:	include/linux/mtd/onenand*.h
+ 
+ONEXPLAYER FAN DRIVER
+M:	Joaquín Ignacio Aramendía <samsagax@gmail.com>
+L:	linux-hwmon@vger.kernel.org
+S:	Maintained
+F:	drivers/hwmon/oxp-sensors.c
+
+ ONION OMEGA2+ BOARD
+ M:	Harvey Hunt <harveyhuntnexus@gmail.com>
+ L:	linux-mips@vger.kernel.org
--- a/packages/kernel/linux/patches/AMD64/005-ayaneo-display-quirks.patch
+++ b/packages/kernel/linux/patches/AMD64/005-ayaneo-display-quirks.patch
@ -1,7 +1,7 @@
-diff -rupN linux-6.1.6.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux-6.1.6/drivers/gpu/drm/drm_panel_orientation_quirks.c
--- linux-6.1.6.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c	2023-01-19 14:54:26.353935375 -0500
-+++ linux-6.1.6/drivers/gpu/drm/drm_panel_orientation_quirks.c	2023-01-22 06:24:30.604966825 -0500
-@@ -164,12 +164,24 @@ static const struct dmi_system_id orient
+diff -rupN linux-6.1.27.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux-6.1.27/drivers/gpu/drm/drm_panel_orientation_quirks.c
+--- linux-6.1.27.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c	2023-05-01 20:39:27.772375276 +0000
+++ linux-6.1.27/drivers/gpu/drm/drm_panel_orientation_quirks.c	2023-05-01 20:49:16.920849540 +0000
+@@ -170,16 +170,28 @@ static const struct dmi_system_id orient
 		  DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"),
 		},
 		.driver_data = (void *)&lcd800x1280_rightside_up,
@ -31,7 +31,12 @@ diff -rupN linux-6.1.6.orig/drivers/gpu/drm/drm_panel_orientation_quirks.c linux
 	}, {	/* AYA NEO AIR */
 		.matches = {
 		  DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYANEO"),
-@@ -182,6 +194,12 @@ static const struct dmi_system_id orient
+-		  DMI_MATCH(DMI_BOARD_NAME, "AIR"),
+		  DMI_MATCH(DMI_PRODUCT_NAME, "AIR"),
+ 		},
+ 		.driver_data = (void *)&lcd1080x1920_leftside_up,
+ 	}, {	/* AYA NEO NEXT */
+@@ -188,6 +200,12 @@ static const struct dmi_system_id orient
 		  DMI_MATCH(DMI_BOARD_NAME, "NEXT"),
 		},
 		.driver_data = (void *)&lcd800x1280_rightside_up,
--- a/packages/misc/modules/package.mk
+++ b/packages/misc/modules/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="modules"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="custom"
 PKG_SITE=""
--- a/packages/sysutils/autostart/package.mk
+++ b/packages/sysutils/autostart/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="autostart"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="apache2"
 PKG_SITE=""
--- a/packages/sysutils/powerstate/package.mk
+++ b/packages/sysutils/powerstate/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2022-present Fewtarius

 PKG_NAME="powerstate"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_DEPENDS_TARGET="systemd"
--- a/packages/sysutils/ryzenadj/package.mk
+++ b/packages/sysutils/ryzenadj/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="ryzenadj"
-PKG_VERSION="32c89f84ac218d64e424a2aafc1151601d2520be"
+PKG_VERSION="45a867c573754704608bcce0db6059005435f833"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FlyGoat/RyzenAdj"
 PKG_URL="${PKG_SITE}.git"
--- a/packages/sysutils/sleep/package.mk
+++ b/packages/sysutils/sleep/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="sleep"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_DEPENDS_TARGET="systemd"
--- a/packages/sysutils/system-utils/package.mk
+++ b/packages/sysutils/system-utils/package.mk
@ -1,7 +1,7 @@
 # Copyright (C) 2021-present Fewtarius

 PKG_NAME="system-utils"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="mix"
 PKG_DEPENDS_TARGET="toolchain sleep"
--- a/packages/sysutils/udevil/system.d/udevil-mount@.service
+++ b/packages/sysutils/udevil/system.d/udevil-mount@.service
@ -1,5 +1,6 @@
 [Unit]
 Description=Udevil mount service
+After=jelos-automount.service

 [Service]
 Type=oneshot
--- a/packages/ui/splash/package.mk
+++ b/packages/ui/splash/package.mk
@ -2,7 +2,7 @@
 # Copyright (C) 2020-present Fewtarius

 PKG_NAME="splash"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_ARCH="any"
 PKG_LICENSE="apache2"
 PKG_SITE=""
--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="initramfs"
-PKG_VERSION="${AUTO_VERSION}"
+PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
--- a/projects/Amlogic/packages/linux/package.mk
+++ b/projects/Amlogic/packages/linux/package.mk
@ -19,7 +19,7 @@ PKG_PATCH_DIRS+="${DEVICE}"

 case ${DEVICE} in
  S922X*)
-    PKG_VERSION="6.1.26"
+    PKG_VERSION="6.1.27"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
  ;;
 esac
--- a/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch
+++ b/projects/Amlogic/packages/linux/patches/000-ogu-linux.patch