Bring up to par with master.

.ci/build.sh

@@ -338,7 +338,8 @@ strip_binary=strip
 if is_windows
 then
 	# Switch into the correct MSYSTEM if required.
-	msys=MINGW$arch
+	msys=UCRT$arch
+	[ ! -d "/$msys" ] && msys=MINGW$arch
 	[ ! -d "/$msys" ] && msys=CLANG$arch
 	if [ -d "/$msys" ]
 	then

.github/pull_request_template.md

@@ -9,6 +9,8 @@ Checklist
 * [ ] I have discussed this with core contributors already
 * [ ] This pull request requires changes to the ROM set
   * [ ] I have opened a roms pull request - https://github.com/86Box/roms/pull/changeme/
+* [ ] This pull request requires changes to the asset set
+  * [ ] I have opened an assets pull request - https://github.com/86Box/assets/pull/changeme/
 
 References
 ==========

.github/workflows/cmake_windows_msys2.yml

@@ -69,21 +69,21 @@ jobs:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
 #            slug: "-MSYS64"
-          - msystem: MINGW64
-            prefix: mingw-w64-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
-            slug: "-64"
-            runner: windows-2022
+#          - msystem: MINGW64
+#            prefix: mingw-w64-x86_64
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "MINGW64"
+#            runner: windows-2022
 #          - msystem: CLANG64
 #            prefix: mingw-w64-clang-x86_64
 #            toolchain: ./cmake/llvm-win32-x86_64.cmake
 #            slug: "CLANG64"
 #            runner: windows-2022
-#          - msystem: UCRT64
-#            prefix: mingw-w64-ucrt-x86_64
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
-#            slug: "UCRT64"
-#            runner: windows-2022
+          - msystem: UCRT64
+            prefix: mingw-w64-ucrt-x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: "-64"
+            runner: windows-2022
           - msystem: CLANGARM64
             toolchain: ./cmake/flags-gcc-aarch64.cmake
             slug: -arm64

.github/workflows/codeql_windows_msys2.yml

@@ -83,21 +83,21 @@ jobs:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
 #            slug: "-MSYS64"
-          - msystem: MINGW64
-            prefix: mingw-w64-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
-            slug: "-64"
-            runner: windows-2022
+#          - msystem: MINGW64
+#            prefix: mingw-w64-x86_64
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "MINGW64"
+#            runner: windows-2022
 #          - msystem: CLANG64
 #            prefix: mingw-w64-clang-x86_64
 #            toolchain: ./cmake/llvm-win32-x86_64.cmake
 #            slug: "CLANG64"
 #            runner: windows-2022
-#          - msystem: UCRT64
-#            prefix: mingw-w64-ucrt-x86_64
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
-#            slug: "UCRT64"
-#            runner: windows-2022
+          - msystem: UCRT64
+            prefix: mingw-w64-ucrt-x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: "-64"
+            runner: windows-2022
 #          - msystem: CLANGARM64
 #            toolchain: ./cmake/flags-gcc-aarch64.cmake
 #            slug: -arm64

CMakeLists.txt

@@ -36,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 5.2
+    VERSION 6.0
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
@@ -186,6 +186,7 @@ cmake_dependent_option(WACOM          "Wacom Input Devices"
 cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"        ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(NETSWITCH      "Network Switch Support"                   ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(VFIO           "Virtual Function I/O"                     ON    "DEV_BRANCH"  OFF)
+cmake_dependent_option(SOFTMODEM      "AC'97 Softmodem"                          ON    "DEV_BRANCH"  OFF)
 
 # Ditto but for Qt
 if(QT)

README-UNIX-MODE-WITH-OSD.txt

@@ -0,0 +1,78 @@
+UNIX MODE WITH OSD
+
+86Box supports running on the linux framebuffer without QT and without X, making the pc appear as a nearly native old machine.
+
+running it that way is already supported but when doing it, 86box loses all menu and all abilities to mount floppies and CDs, it also becomes the owner of the entire pc with no way of quitting it or changing virtual console.
+
+to overcome this, an on screen display menu is available that allows doing everything the textual console (src/unix/unix.c) does;
+mount/unmount all supported media like floppy and cd
+hard reset the machine
+quit 86box
+seeing the current performance %
+
+key bindings:
+Right Control + F11 opens the osd
+
+while is open:
+arrows up, down moves the cursor
+enter does the action, at mount options it enters a list of appropriate files (*.img, *.iso)
+ESC goes back to main or closes the OSD
+
+current limitations:
+	OSD can mount images to first floppy and first cd, secondary devices are not supported
+	it does not show if an image is mounted or not
+	the option "version" does actully print it, but it can't be seen beacuse its printed under 86box display
+	extremely long filenames can overflow the blue window
+	the title does actually overflow the window width :)
+
+These are the steps to install a machine fully dedicated to 86Box and tuned to make it appear almost native.
+This works almost the same for on a Raspberry Pi
+
+
+1) install a vanilla Debian Trixie with netinst and without any graphical environment, or a "server" distro for RPI
+   depending on the machine speed, this will make boot time extremely short
+
+2) apt update if necessary
+
+3) install git and almost all required packages
+	apt install git build-essential cmake extra-cmake-modules pkg-config ninja-build libfreetype-dev libsdl2-dev libpng-dev libopenal-dev librtmidi-dev libfluidsynth-dev libsndfile1-dev libserialport-dev libevdev-dev libxkbcommon-dev libxkbcommon-x11-dev libslirp-dev
+
+4) setup git and clone
+	git@github.com:86Box/86Box.git
+	git@github.com:86Box/roms.git
+
+5) build (128 => super speed, too much for a 2GB machine)
+	cd 86Box
+	mkdir build
+	cd build
+	cmake .. --preset regular -D QT=OFF -D PREFER_STATIC=ON
+	cmake --build regular -j 128
+	cd ../../
+	ln -s 86Box/build/regular/src/86Box 86Box.exe
+
+6) boot
+	as root so it can take complete ownership of the linux framebuffer
+
+7) notes:
+- 86Box will complain to be unable to find readline, this is fine, we don't need the command line at all
+- ALSOFT will complain it can't connect to PipeWire, no problem, sounds will come from standard ALSA
+
+8) additional steps
+	add a new udev rule to automount any USB key to a known location so files in it can be listed in the OSD floppy/cd mount options
+
+	create /etc/udev/rules.d/99-automount.rules
+
+	with:
+	ACTION=="add", ENV{ID_BUS}=="usb", ENV{ID_TYPE}=="disk", ENV{ID_FS_TYPE}=="exfat", RUN+="/usr/bin/systemd-mount --no-block --automount=yes --collect /dev/%k '/mnt'"
+
+	replicate this line for each filesystem you expect the usb key to be formatted, in this example "exfat"
+	this is going to conflict if multiple keys are inserted, don't do it
+
+final step
+	configure some 86box vm using another pc with the GUI
+	copy the VM definitions to this new pc and manually launch 86box from the textual command line
+	optionally craft a boot menu to be shown in place of the login prompt or setup 86box as a debiasn service, it will start at boot
+	just make sure the pc will be accessible via ssh or some other way, autobooting 86box canà make difficult terminating it
+
+
+

bumpversion.sh

@@ -43,23 +43,33 @@ pretty_date() {
 
 # Patch files.
 patch_file() {
-	# Stop if the file doesn't exist.
-	[ ! -e "$1" ] && return
+	# Parse arguments.
+	desc="$1"
+	shift
+	pattern="$1"
+	shift
 
-	# Patch file.
-	if sed -i -r -e "$3" "$1"
-	then
-		echo "[-] Patched $2 on $1"
-	else
-		echo "[!] Patching $2 on $1 failed"
-	fi
+	# Patch the specified files.
+	for file in "$@"
+	do
+		# Skip file if it doesn't exist.
+		[ ! -e "$file" ] && continue
+
+		# Patch file.
+		if sed -i -r -e "$pattern" "$file"
+		then
+			echo "[-] Patched $desc in $file"
+		else
+			echo "[!] Patching $desc in $file failed"
+		fi
+	done
 }
-patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/'
-patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/'
-patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
-patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
-patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
-patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
-patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'
-patch_file debian/changelog 'changelog date' 's/>  .+/>  '"$(date -R)"'/'
-patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/'
+patch_file VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' CMakeLists.txt
+patch_file version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' vcpkg.json
+patch_file Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' src/unix/assets/*.spec
+patch_file '%global romver' 's/(^%global\ romver\s+)[^\s]+/\1'"$romversion"'/' src/unix/assets/*.spec
+patch_file 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' src/unix/assets/*.spec
+patch_file 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' src/unix/assets/*.spec
+patch_file release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/' src/unix/assets/*.metainfo.xml
+patch_file 'changelog date' 's/>  .+/>  '"$(date -R)"'/' debian/changelog
+patch_file 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/' debian/changelog

debian/changelog

@@ -1,5 +1,5 @@
-86box (5.2) UNRELEASED; urgency=medium
+86box (6.0) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Thu, 18 Sep 2025 04:25:57 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Sun, 26 Oct 2025 17:41:47 +0100