Merge pull request #454 from ROCKNIX/dev

Sync main with dev for release

Author: r3claimer

packages/audio/wireplumber/package.mk

@@ -38,6 +38,10 @@ EOF
 
   cat > ${INSTALL}/usr/share/wireplumber/bluetooth.lua.d/89-disable-bluez-hfphsp-backend.lua << EOF
 bluez_monitor.properties["bluez5.hfphsp-backend"] = "none"
+EOF
+
+  cat > ${INSTALL}/usr/share/wireplumber/main.lua.d/50-libcamera-config.lua << EOF
+libcamera_monitor.enabled = false
 EOF
 }
 

packages/emulators/libretro/retroarch/retroarch-joypads/gamepads/odroidgo3_joypad.cfg

@@ -4,21 +4,21 @@ input_device_display_name = "Odroid GO Super"
 
 input_b_btn = "0"
 input_y_btn = "3"
-input_select_btn = "12"
-input_start_btn = "13"
+input_select_btn = "8"
+input_start_btn = "9"
 input_a_btn = "1"
 input_x_btn = "2"
 input_l_btn = "4"
 input_r_btn = "5"
 input_l2_btn = "6"
 input_r2_btn = "7"
-input_l3_btn = "15"
-input_r3_btn = "16"
+input_l3_btn = "10"
+input_r3_btn = "11"
 
-input_up_btn = "8"
-input_down_btn = "9"
-input_left_btn = "10"
-input_right_btn = "11"
+input_up_btn = "12"
+input_down_btn = "13"
+input_left_btn = "14"
+input_right_btn = "15"
 
 input_l_x_plus_axis = "+0"
 input_l_x_minus_axis = "-0"
@@ -31,8 +31,8 @@ input_r_y_plus_axis = "+3"
 input_r_y_minus_axis = "-3"
 
 # Hotkeys
-input_enable_hotkey_btn = "12"
-input_exit_emulator_btn = "13"
+input_enable_hotkey_btn = "8"
+input_exit_emulator_btn = "9"
 
 input_menu_toggle_btn = "2"
 input_fps_toggle_btn = "3"

packages/kernel/linux/package.mk

@@ -35,7 +35,7 @@ case ${DEVICE} in
     PKG_PATCH_DIRS+=" mainline"
     ;;
   *)
-    PKG_VERSION="6.10.4"
+    PKG_VERSION="6.9.12"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS+=" mainline"
     ;;

packages/virtual/emulators/package.mk

@@ -53,7 +53,7 @@ case "${DEVICE}" in
   ;;
   S922X)
     [ "${ENABLE_32BIT}" == "true" ] && EMUS_32BIT="box86 pcsx_rearmed-lr wine"
-    PKG_EMUS+=" aethersx2-sa box64 dolphin-sa drastic-sa portmaster yabasanshiro-sa"
+    PKG_EMUS+=" aethersx2-sa box64 dolphin-sa drastic-sa portmaster scummvmsa yabasanshiro-sa"
     LIBRETRO_CORES+=" beetle-psx-lr bsnes-lr bsnes-hd-lr dolphin-lr geolith-lr flycast-lr uae4arm"
     [ "${USE_MALI}" != "no" ] && PKG_EMUS+=" lime3ds-sa"
     PKG_RETROARCH+=" retropie-shaders"
@@ -894,15 +894,8 @@ makeinstall_target() {
   add_es_system pokemini
 
   ### ScummVM
-  case ${DEVICE} in
-    S922X)
-      add_emu_core scummvm retroarch scummvm true
-    ;;
-    *)
-      add_emu_core scummvm scummvmsa scummvm true
-      add_emu_core scummvm retroarch scummvm false
-    ;;
-  esac
+  add_emu_core scummvm scummvmsa scummvm true
+  add_emu_core scummvm retroarch scummvm false
   add_es_system scummvm
   install_script "Start ScummVM.sh"