From bc3b656e522e4ae248800b5258890927e0ac782e Mon Sep 17 00:00:00 2001
From: brooksytech <1673861+brooksytech@users.noreply.github.com>
Date: Fri, 1 Mar 2024 16:38:50 +0000
Subject: [PATCH] Bump RK kernel to 6.6.7, Bump Mesa, Add mupen64plus-sa to
 RK3588

---
 packages/graphics/mesa/package.mk           | 4 ++--
 packages/virtual/emulators/package.mk       | 2 +-
 projects/Rockchip/packages/linux/package.mk | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index ff80d4af0..11ba25b6c 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -17,13 +17,13 @@ case ${DEVICE} in
 	PKG_GIT_CLONE_BRANCH="csf"
   ;;
   RK33*|RK3566) #Using upstream dev for panfrost
-	PKG_VERSION="ad5fbc440767ee020ebf761bd7f3aaba0895c92d"
+	PKG_VERSION="0b953bdbb81439c3d812631282429feeaf393db8"
 	PKG_SITE="https://gitlab.freedesktop.org/mesa/mesa"
 	PKG_URL="${PKG_SITE}.git"
 	PKG_PATCH_DIRS+=" panfrost"
   ;;
   *)
-	PKG_VERSION="24.0.1"
+	PKG_VERSION="24.0.2"
 	PKG_SITE="http://www.mesa3d.org/"
 	PKG_URL="https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-${PKG_VERSION}/mesa-mesa-${PKG_VERSION}.tar.gz"
   ;;
diff --git a/packages/virtual/emulators/package.mk b/packages/virtual/emulators/package.mk
index ac13a0473..0043d59ed 100644
--- a/packages/virtual/emulators/package.mk
+++ b/packages/virtual/emulators/package.mk
@@ -39,7 +39,7 @@ case "${DEVICE}" in
   ;;
   RK358*)
     [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 desmume-lr gpsp-lr pcsx_rearmed-lr"
-    PKG_EMUS+=" amiberry aethersx2-sa dolphin-sa drastic-sa melonds-sa nanoboyadvance-sa box64 scummvmsa   \
+    PKG_EMUS+=" amiberry aethersx2-sa dolphin-sa drastic-sa melonds-sa mupen64plus-sa nanoboyadvance-sa box64 scummvmsa   \
                yabasanshiro-sa portmaster beetle-saturn-lr"
     LIBRETRO_CORES+=" uae4arm beetle-psx-lr bsnes-lr bsnes-hd-lr citra-lr dolphin-lr pcsx_rearmed-lr"
     PKG_RETROARCH+=" retropie-shaders"
diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk
index 6823b6ebf..9f0b31137 100644
--- a/projects/Rockchip/packages/linux/package.mk
+++ b/projects/Rockchip/packages/linux/package.mk
@@ -28,7 +28,7 @@ case ${DEVICE} in
     PKG_GIT_CLONE_BRANCH="panfork-6.1"
   ;;
   RK3399|RK3326|RK-ARMV8-A)
-    PKG_VERSION="6.7.6"
+    PKG_VERSION="6.7.7"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v6.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
   ;;
   RK356*)