Merge pull request #16344 from dmanlfc/bmp-ports-30Aug

update ports to latest as of Aug 30, 2026

Author: dmanlfc

batocera-Changelog.md

@@ -34,6 +34,7 @@
 - Cannonball coin is now the Select button
 - Cannonball fullscreen on Wayland
 - Commander Genius fullscreen in Wayland
+- Commander Genius render resolution option not taking effect in-game
 - Jedi Knight Dark Forces 2 initial start to work fullscreen in certain conditions
 - Libretro-Hatarib not starting due to a compiled symbol issue
 - Mupen64 not starting fullscreen with Wayland
@@ -74,20 +75,24 @@
 - BigPEmu to 1.221
 - Blake Stone to v1.3.4
 - Box64 0.4.2
+- CatacombGL to Jun 20, 2026 build
 - Cemu to August 7th, 2026 build
 - CDogs to 2.4.0
 - CLK to 2026-07-23
 - Commander Genius to v3.6.3
-- CorsixTH to v0.70.0
+- CorsixTH to v0.70.1
 - DevilutionX to 1.5.5
 - Dhewm3 & Mods to 1.5.5
 - Dolphin-Emu to 2606
+- DXX-Rebirth to Aug 23, 2026 build
 - ECWolf to Feb 23, 2026 build
-- EDuke32 / Fury to Feb 03, 2026 build
+- EDuke32 / Fury to Aug 07, 2026 build
 - ETLegacy to v2.85.0
 - Flycast to v2.7
 - Groovy MAME to 0.289
-- IOQuake3 to Mar 9, 2026
+- Hurrican to Apr 5, 2026 build
+- Hydra Castle Labyrinth to Aug 11, 2026 build
+- IOQuake3 to Jul 16, 2026
 - Jazz2 to 3.8.0
 - Ledspicer to 0.7.6
 - Libretro-81 to April 20th, 2026 build
@@ -207,8 +212,9 @@
 - LinuxLoader to v3.0.10
 - Moonlight-QT to Jun 26, 2026 build
 - Mupen64Plus-Core to March 30th, 2026 build
+- OpenJazz to Mar 01, 2026 build
 - OpenMSX to Release 21
-- OpenJK to May 13th, 2026 build
+- OpenJK to Jul 11th, 2026 build
 - OpenJKDF2 to v0.9.9
 - PCSX2 to 2.8.0
 - Play to 0.77
@@ -224,11 +230,14 @@
 - TheXTech to v1.3.7.3-1
 - TRX to 1.10.2
 - Tsugaru to v20251206
+- Ur-Quan Masters to Aug 21, 2026 build
 - Vita3k to 10th of June build
-- VKQuake to 1.35.0
+- VKQuake to 1.36.0
+- vkQuake2 to Aug 5, 2026 build
 - VKQuake3 to 1.36
 - Winetricks to 20260125
 - X16emu to r49
+- Xash3D-FWGS (Half-Life engine + HLSDK mobile_hacks/dmc/opfor) to Aug 27, 2026 build
 - Xemu to v0.8.136
 - Xenia to v1.0.2844
 - Xenia Canary to August 29th, 2026 build

package/batocera/core/batocera-configgen/configgen/configgen/generators/cgenius/cgeniusGenerator.py

@@ -72,17 +72,18 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         # render resolution
         match system.config.get("cgenius_render"):
             case "240":
-                config["Video"]["gameHeight"] = "240"
-                config["Video"]["gameWidth"] = "320"
+                gameWidth, gameHeight = "320", "240"
             case "360":
-                config["Video"]["gameHeight"] = "360"
-                config["Video"]["gameWidth"] = "640"
+                gameWidth, gameHeight = "640", "360"
             case "480":
-                config["Video"]["gameHeight"] = "480"
-                config["Video"]["gameWidth"] = "640"
+                gameWidth, gameHeight = "640", "480"
             case _:
-                config["Video"]["gameHeight"] = "200"
-                config["Video"]["gameWidth"] = "320"
+                gameWidth, gameHeight = "320", "200"
+        for engineSection in ("Launcher", "Vorticon", "Galaxy", "Cosmos"):
+            if engineSection not in config:
+                config[engineSection] = {}
+            config[engineSection]["gameWidth"] = gameWidth
+            config[engineSection]["gameHeight"] = gameHeight
         # mouse
         config["Video"]["ShowCursor"] = system.config.get("cgenius_cursor", "false")
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/corsixth/corsixthGenerator.py

@@ -93,8 +93,8 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
             'hu_HU': 'hu',
             'pt_PT': 'pt',
             'pt_BR': 'br',
-            'zh_CN': 'zhs',
-            'zh_TW': 'zht',
+            'zh_CN': 'zh(s)',
+            'zh_TW': 'zh(t)',
             'ko_KR': 'ko',
             'nb_NO': 'nb',
             'nn_NO': 'nb',

package/batocera/core/batocera-configgen/configgen/configgen/generators/etlegacy/etlegacyGenerator.py

@@ -24,7 +24,7 @@ def getHotkeysContext(self) -> HotkeysContext:
     def generate(self, system, rom, playersControllers, metadata, guns, wheels, gameResolution):
 
         etLegacyDir = ROMS / "etlegacy" / "legacy"
-        etLegacyFile = "legacy_2.84-dirty.pk3"
+        etLegacyFile = "legacy_2.85-dirty.pk3"
         etLegacySource = Path("/usr/share/etlegacy") / etLegacyFile
         etLegacyDest = etLegacyDir / etLegacyFile
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/openjazz/openjazzGenerator.py

@@ -56,11 +56,12 @@ def _write_int(writer: IO[bytes], data: int, /) -> None:
 @dataclass(slots=True)
 class _OpenJazzConfig:
     path: Path
-    version: int = 6
+    version: int = 7
     video_width: int = 640
     video_height: int = 480
     fullscreen: bool = True
     video_scale: int = 1
+    scale_method: int = 0
     keys: list[int] = field(default_factory=lambda: [
         1073741906,  # Up
         1073741905,  # Down
@@ -148,18 +149,20 @@ class _OpenJazzConfig:
     many_birds: bool = False
     leave_unneeded: bool = False
     slow_motion: bool = False
-    scale_2x: bool = True
+    hud_fps: bool = False
 
     def save(self) -> None:
         _logger.info("Saving configuration")
         try:
             with self.path.open('wb') as f:
                 # Version
-                _write_char(f, 6)
+                _write_char(f, 7)
 
                 _write_short(f, self.video_width)
                 _write_short(f, self.video_height)
-                _write_char(f, (self.video_scale << 1) | self.fullscreen)
+                _write_char(f, self.fullscreen)
+                _write_char(f, self.video_scale)
+                _write_char(f, self.scale_method)
 
                 for key in self.keys:
                     _write_int(f, key)
@@ -183,7 +186,7 @@ def save(self) -> None:
 
                 _write_char(f, self.music_volume)
                 _write_char(f, self.sound_volume)
-                _write_char(f, self.many_birds | (self.leave_unneeded << 1) | (self.slow_motion << 2) | (self.scale_2x << 3))
+                _write_char(f, self.many_birds | (self.leave_unneeded << 1) | (self.slow_motion << 2) | (self.hud_fps << 3))
         except Exception:
             _logger.exception("Error saving configuration")
 
@@ -209,14 +212,9 @@ def load(cls, path: Path, /) -> Self:
                 video_width = _read_short(f)
                 video_height = _read_short(f)
 
-                video_options = _read_char(f)
-
-                fullscreen = bool(video_options & 1)
-
-                if video_options >= 10:
-                    video_options = 2
-
-                video_scale = video_options >> 1
+                fullscreen = bool(_read_char(f))
+                video_scale = _read_char(f)
+                scale_method = _read_char(f)
 
                 keys = [_read_int(f) for _ in range(_CONTROLS - 4)]
                 buttons = [_read_int(f) for _ in range(_CONTROLS)]
@@ -234,7 +232,7 @@ def load(cls, path: Path, /) -> Self:
                 many_birds = bool(opts & 1)
                 leave_unneeded = bool(opts & 2)
                 slow_motion = bool(opts & 4)
-                scale_2x = not bool(opts & 8)
+                hud_fps = bool(opts & 8)
 
                 return cls(
                     path,
@@ -243,6 +241,7 @@ def load(cls, path: Path, /) -> Self:
                     video_height=video_height,
                     fullscreen=fullscreen,
                     video_scale=video_scale,
+                    scale_method=scale_method,
                     keys=keys,
                     buttons=buttons,
                     axes=axes,
@@ -254,7 +253,7 @@ def load(cls, path: Path, /) -> Self:
                     many_birds=many_birds,
                     leave_unneeded=leave_unneeded,
                     slow_motion=slow_motion,
-                    scale_2x=scale_2x,
+                    hud_fps=hud_fps,
                 )
         except Exception:
             _logger.exception('Error loading configuration')
@@ -275,14 +274,15 @@ def print_config(self, cfg: _OpenJazzConfig, /):
         _logger.info("Resolution: %sx%s", cfg.video_width, cfg.video_height)
         _logger.info("Fullscreen: %s", cfg.fullscreen)
         _logger.info("Video Scale: %s", cfg.video_scale)
+        _logger.info("Scale Method: %s", cfg.scale_method)
         _logger.info("Character Name: %s", cfg.character_name)
         _logger.info("Character Colors: %s", cfg.character_colors)
         _logger.info("Music Volume: %s", cfg.music_volume)
         _logger.info("Sound Volume: %s", cfg.sound_volume)
         _logger.info("Many Birds: %s", cfg.many_birds)
         _logger.info("Leave Unneeded: %s", cfg.leave_unneeded)
         _logger.info("Slow Motion: %s", cfg.slow_motion)
-        _logger.info("Scale2x: %s", cfg.scale_2x)
+        _logger.info("HUD FPS: %s", cfg.hud_fps)
         _logger.info("Controls Configuration:")
         _logger.info("Keys: %s", cfg.keys)
         _logger.info("Buttons: %s", cfg.buttons)
@@ -336,6 +336,12 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         cfg.video_width = int(width_str)
         cfg.video_height = int(height_str)
 
+        # Scaler: 0=None, 1=Bilinear, 2=Scale2x, 3=hqx
+        cfg.scale_method = int(system.config.get("jazz_scaler", "0"))
+
+        # Integer pixel-scale factor (clamped 1-4 by the engine)
+        cfg.video_scale = int(system.config.get("jazz_video_scale", "1"))
+
         # Save the changes
         cfg.save()
 

package/batocera/core/batocera-configgen/configgen/configgen/generators/trx/trxGenerator.py

@@ -197,8 +197,19 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         # Download missing/outdated assets on demand
         self._setup_assets(trxRomPath)
 
+        # Detect mod from the launcher file's parent folder
+        valid_mods = {
+            "tr1", "tr1-ub", "tr1-demo-pc", "tr1-level",
+            "tr2", "tr2-gm", "tr2-level",
+            "tr3", "tr3-la", "tr3-level"
+        }
+        mod = rom.parent.name if rom.parent.name in valid_mods else "tr1"
+
+        # Each engine (TR1/TR2/TR3) keeps its own settings file, named TR<N>X.json5
+        engine_version = mod[2] if len(mod) > 2 and mod[2].isdigit() else "1"
+
         # Create or update display settings configuration
-        trxConfigPath = trxRomPath / "cfg" / "shell.json5"
+        trxConfigPath = trxRomPath / "cfg" / f"TR{engine_version}X.json5"
         mkdir_if_not_exists(trxConfigPath.parent)
         config_data = {}
 
@@ -227,14 +238,6 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         except Exception as e:
             _logger.debug("Error writing configuration file %s: %s", trxConfigPath, e)
 
-        # Detect mod from the launcher file's parent folder
-        valid_mods = {
-            "tr1", "tr1-ub", "tr1-demo-pc", "tr1-level",
-            "tr2", "tr2-gm", "tr2-level",
-            "tr3", "tr3-la", "tr3-level"
-        }
-        mod = rom.parent.name if rom.parent.name in valid_mods else "tr1"
-
         return Command.Command(
             array=[trx_bin_dest, "--mod", mod],
             env={

package/batocera/core/batocera-configgen/configgen/configgen/generators/xash3d_fwgs/xash3dFwgsGenerator.py

@@ -119,7 +119,7 @@ def generate(self, system, rom, playersControllers, metadata, guns, wheels, game
         commandArray.append('-game')
         commandArray.append(game)
 
-        commandArray.append('+showfps')
+        commandArray.append('+cl_showfps')
         commandArray.append('1' if system.config.show_fps else '0')
 
         self._maybeInitConfig(game)

package/batocera/ports/catacombgl/catacombgl.mk

@@ -3,8 +3,8 @@
 # catacombgl
 #
 ################################################################################
-
-CATACOMBGL_VERSION = 6c58d1fd17180deffee22220886858baa5f44d08
+# Version: Commits on Jun 20, 2026
+CATACOMBGL_VERSION = fc0e70bf69276939d8f2b02a9dd89817263095e5
 CATACOMBGL_SITE = $(call github,ArnoAnsems,CatacombGL,$(CATACOMBGL_VERSION))
 CATACOMBGL_LICENSE = GPLv3
 CATACOMBGL_LICENSE_FILES = COPYING.txt

package/batocera/ports/corsixth/corsixth.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CORSIXTH_VERSION = v0.70.0
+CORSIXTH_VERSION = v0.70.1
 CORSIXTH_SITE = $(call github,CorsixTH,CorsixTH,$(CORSIXTH_VERSION))
 CORSIXTH_DEPENDENCIES =  lua luafilesystem luasec lpeg luasocket libcurl
 CORSIXTH_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer ffmpeg rtmidi

package/batocera/ports/dxx-rebirth/dxx-rebirth.mk

@@ -3,8 +3,8 @@
 # dxx-rebirth (Descent 1 & 2) engine
 #
 ################################################################################
-# Version: Commits on May 25, 2025
-DXX_REBIRTH_VERSION = 7a84b3f307ac6f72fd440e55b149d7c2c942dfaf
+# Version: Commits on Aug 23, 2026
+DXX_REBIRTH_VERSION = cb0473dbd5fb6e261223080ba1e60b6d7a228954
 DXX_REBIRTH_SITE = https://github.com/dxx-rebirth/dxx-rebirth
 DXX_REBIRTH_SITE_METHOD=git
 DXX_REBIRTH_LICENSE = GPLv3