Merge pull request REG-Linux#652 from REG-Linux/bump-kernel-dosbox-x-…

…citra Bump kernels, citra, dosbox-x, fix SDL 2.30.8
MillerTechnologyPeru · Oct 2, 2024 · 1062773 · 1062773
2 parents ee0d598 + d42c72a
commit 1062773
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 24 deletions.
diff --git a/board/patches/sdl2/002-drm-conn.patch b/board/patches/sdl2/002-drm-conn.patch
@@ -10,10 +10,10 @@ index 7223a5a..0972cb9 100644
 
      hint = SDL_GetHint(SDL_HINT_KMSDRM_DEVICE_INDEX);
      if (hint && *hint) {
-@@ -118,13 +119,28 @@ get_driindex(void)
-                                      resources->count_connectors,
+@@ -120,12 +120,27 @@
                                       resources->count_encoders,
                                       resources->count_crtcs);
+
 +			// batocera
 +			{
 +			  FILE* fdDrmConn;
@@ -27,12 +27,11 @@ index 7223a5a..0972cb9 100644
 +			  }
 +			}
 +			//
-
                          if (resources->count_connectors > 0 &&
                              resources->count_encoders > 0 &&
                              resources->count_crtcs > 0) {
                              available = -ENOENT;
-                             for (i = 0; i < resources->count_connectors; i++) {
+                             for (i = 0; i < resources->count_connectors && available < 0; i++) {
 -                                drmModeConnector *conn =
 +			        drmModeConnector *conn;
 +				if(i != drmConn) continue;

diff --git a/board/x86/linux_patches/20-ayn-loki-zero-orientation.patch b/board/x86/linux_patches/20-ayn-loki-zero-orientation.patch
diff --git a/buildroot b/buildroot
diff --git a/configs/reglinux-x86_64.board b/configs/reglinux-x86_64.board
@@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12"
 BR2_KERNEL_HEADERS_AS_KERNEL=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_patches"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

diff --git a/configs/reglinux-x86_64_v3.board b/configs/reglinux-x86_64_v3.board
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_BATOCERA_PATH)/board/fsoverlay $(BR2_EXTERNAL
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12"
 BR2_KERNEL_HEADERS_AS_KERNEL=y
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_BATOCERA_PATH)/board/x86/linux_patches"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y

diff --git a/package/emulators/citra/citra.mk b/package/emulators/citra/citra.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-CITRA_VERSION = r5115f64
+# Version: r608383e - Commits on Sep 27, 2024
+CITRA_VERSION = r608383e
 CITRA_SITE = https://github.com/PabloMK7/citra.git
 CITRA_SITE_METHOD=git
 CITRA_GIT_SUBMODULES=YES

diff --git a/package/emulators/dosbox-x/dosbox-x.mk b/package/emulators/dosbox-x/dosbox-x.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOSBOX_X_VERSION = dosbox-x-v2024.07.01
+DOSBOX_X_VERSION = dosbox-x-v2024.10.01
 DOSBOX_X_SITE = $(call github,joncampbell123,dosbox-x,$(DOSBOX_X_VERSION))
 DOSBOX_X_DEPENDENCIES = sdl2 sdl2_net fluidsynth zlib libpng libogg libvorbis linux-headers
 DOSBOX_X_LICENSE = GPLv2