Darkmode

.ci/AppImageBuilder.yml

@@ -59,6 +59,7 @@ AppDir:
     - libqt5widgets5 # if QT:BOOL=ON
     - libsixel1 # if CLI:BOOL=ON
     - libslirp0
+    - libsndfile1
     - libsndio7.0 # if OPENAL:BOOL=ON
     - libvdeplug-dev # -dev also pulls in libvdeplug2. -dev is required to get the proper .so symlink to the library
     - libx11-6 # if QT:BOOL=ON
@@ -71,6 +72,7 @@ AppDir:
     - libxkbcommon-x11-0 # if QT:BOOL=ON
     - qtwayland5 # if QT:BOOL=ON
     - zlib1g
+    - libserialport0
   files:
     exclude:
     - etc

.ci/Jenkinsfile

@@ -20,11 +20,12 @@ def repository = ['https://github.com/86Box/86Box.git', scm.userRemoteConfigs[0]
 def commitBrowser = ['https://github.com/86Box/86Box/commit/%s', null]
 def branch = ['master', scm.branches[0].name]
 def buildType = ['beta', 'alpha']
+def tarballFlags = ['', '-s']
 def buildBranch = env.JOB_BASE_NAME.contains('-') ? 1 : 0
 
 def osArchs = [
-	'Windows': ['32', '64'],
-	'Linux': ['x86', 'x86_64', 'arm32', 'arm64'],
+	'Windows': ['64'],
+	'Linux': ['x86_64', 'arm64'],
 	'macOS': ['x86_64+x86_64h+arm64']
 ]
 
@@ -238,7 +239,7 @@ pipeline {
 								dir("${env.WORKSPACE_TMP}/output") {
 									/* Run source tarball creation process. */
 									def packageName = "${env.JOB_BASE_NAME}-Source$buildSuffix"
-									if (runBuild("-s \"$packageName\"") == 0) {
+									if (runBuild("-s \"$packageName\" ${tarballFlags[buildBranch]}") == 0) {
 										/* Archive resulting artifacts. */
 										archiveArtifacts artifacts: "$packageName*"
 									} else {

.ci/build.sh

@@ -208,7 +208,7 @@ cmake_flags_extra=
 if [ -z "$package_name" -a -z "$tarball_name" ] || [ -n "$package_name" -a -z "$arch" ]
 then
 	echo '[!] Usage: build.sh -b {package_name} {architecture} [-t] [cmake_flags...]'
-	echo '           build.sh -s {source_tarball_name}'
+	echo '           build.sh -s {source_tarball_name} [-t]'
 	echo 'Dep. tree: build.sh -p [archive_tmp/path/to/binary]'
 	exit 100
 fi
@@ -228,7 +228,10 @@ then
 	[ ! -d "$cwd" ] && mkdir -p "$cwd"
 
 	# Save current HEAD commit to VERSION.
-	git log --stat -1 > VERSION || rm -f VERSION
+	if [ $strip -eq 0 ]
+	then
+		git log --stat -1 > VERSION || rm -f VERSION
+	fi
 
 	# Archive source.
 	make_tar "$cwd/$tarball_name.tar"
@@ -522,6 +525,9 @@ then
 		cmake_flags_extra="$cmake_flags_extra -D MOLTENVK=ON -D \"MOLTENVK_INCLUDE_DIR=$macports\""
 	fi
 
+	# Enable Libserialport 
+		cmake_flags_extra="$cmake_flags_extra -D \"LIBSERIALPORT_ROOT=$macports\""
+
 	# Install dependencies only if we're in a new build and/or MacPorts prefix.
 	if check_buildtag "$(basename "$macports")"
 	then
@@ -535,6 +541,20 @@ then
 			sudo sed -i -e 's/-no-feature-vulkan/-feature-vulkan/g' "$qt5_portfile"
 			sudo sed -i -e 's/configure.env-append MAKE=/configure.env-append VULKAN_SDK=${prefix} MAKE=/g' "$qt5_portfile"
 		fi
+
+		# Patch openal-soft to use 1.23.1 on all targets instead of 1.24.1 on >=10.15 only,
+		# to prevent a symlink mismatch from having different versions on x86_64 and arm64.
+		# See: https://github.com/macports/macports-ports/commit/9b4903fc9c76769d476079e404c9a3b8a225f8aa
+		openal_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/audio/openal-soft/Portfile"
+		sudo sed -i -e 's/if {${os.platform} ne "darwin" || ${os.major} >= 19}/if {0}/g' "$openal_portfile"
+
+		# Patch wget to remove libproxy support, as it depends on shared-mime-info which
+		# fails to build for a 10.13 target, which we have to do despite wget only being
+		# a host dependency. MacPorts issue 69406 strongly implies this will not be fixed.
+		wget_portfile="$macports/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/net/wget/Portfile"
+		sudo sed -i -e 's/--enable-libproxy/--disable-libproxy/g' "$wget_portfile"
+		sudo sed -i -e 's/port:libproxy//g' "$wget_portfile"
+
 		while :
 		do
 			# Attempt to install dependencies.
@@ -582,7 +602,7 @@ else
         grep -q " bullseye " /etc/apt/sources.list || echo [!] WARNING: System not running the expected Debian version
 
 	# Establish general dependencies.
-	pkgs="cmake ninja-build pkg-config git wget p7zip-full extra-cmake-modules wayland-protocols tar gzip file appstream"
+	pkgs="cmake ninja-build pkg-config git wget p7zip-full extra-cmake-modules wayland-protocols tar gzip file appstream qttranslations5-l10n"
 	if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
 	then
 		pkgs="$pkgs build-essential"
@@ -605,7 +625,7 @@ else
 	# ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
 	libpkgs=""
 	longest_libpkg=0
-	for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libxkbcommon-x11-dev libglib2.0-dev libslirp-dev libfaudio-dev libaudio-dev libjack-jackd2-dev libpipewire-0.3-dev libsamplerate0-dev libsndio-dev libvdeplug-dev libfluidsynth-dev
+	for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libxkbcommon-x11-dev libglib2.0-dev libslirp-dev libfaudio-dev libaudio-dev libjack-jackd2-dev libpipewire-0.3-dev libsamplerate0-dev libsndio-dev libvdeplug-dev libfluidsynth-dev libsndfile1-dev libserialport-dev
 	do
 		libpkgs="$libpkgs $pkg:$arch_deb"
 		length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)

.ci/dependencies_macports.txt

@@ -15,3 +15,5 @@ fluidsynth
 ghostscript
 libslirp
 vde2
+libsndfile
+libserialport

.ci/dependencies_msys.txt

@@ -12,3 +12,6 @@ libslirp
 fluidsynth
 qt5-static
 qt5-translations
+vulkan-headers
+libsndfile
+libserialport

.editorconfig

@@ -5,34 +5,11 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-# Disabled for now since not all editors support setting a tab_width value different from indent_size
-# Relevant VSCode extension issue: https://github.com/editorconfig/editorconfig-vscode/issues/190
-# [*.rc]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
-# [Makefile.*]
-# indent_style = space
-# indent_size = 4
-# tab_width = 4
-
 [*.manifest]
-indent_style = space
 indent_size = 2
 
 [*.yml]
-indent_style = space
 indent_size = 2
 
-[**/CMakeLists.txt]
-indent_style = space
-indent_size = 4
-
-[*.cmake]
-indent_style = space
-indent_size = 4
-
-[*.json]
-indent_style = space
-indent_size = 4
+[*.ui]
+indent_size = 1

.gitattributes

@@ -3,12 +3,28 @@
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
+#  Code
 *.c text
 *.cc text
 *.cpp text
 *.h text
 *.hpp text
+
+#  CMake scripts
+CMakeLists.txt text
+*.cmake text
+
+#  Windows resource scripts and manifests
 *.rc text
+*.manifest text
+
+#  Translation files
+*.po text
+
+#  Qt XML files
+*.ui text
+*.ts text
+*.qrc text
 
 
 # Declare files that will always have CRLF line endings on checkout.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
+        ## Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      options:
+        - label: I **have searched** the issue tracker and **was unable** to find an [open](../issues?q=is%3Aissue+is%3Aopen) or [closed](../issues?q=is%3Aissue+is%3Aclosed) issue matching what I'm seeing. 
+          required: true
+        - label: I **have verified** that the issue is happening in the **[latest nightly build](https://ci.86box.net/job/86Box/lastSuccessfulBuild/artifact/)**, or the latest commit, if building from source.
+          required: true
   - type: textarea
     attributes:
       label: What happened?
@@ -25,20 +33,13 @@ body:
     attributes:
       label: Operating system
       description: What is your host operating system?
-      placeholder: e.g. Windows 10
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: CPU
-      description: What is your host CPU?
-      placeholder: e.g. AMD Ryzen 5 5600G
+      placeholder: e.g. Windows 11 24H2
     validations:
       required: true
   - type: input
     attributes:
       label: 86Box version
-      description: What version of 86Box are you running? (Saying "Latest from Jenkins" is not helpful.)
+      description: What version of 86Box are you running? (Please ensure you have updated to the [latest build](https://ci.86box.net/job/86Box/lastSuccessfulBuild/artifact/) before reporting. Merely saying "Latest from Jenkins" is not helpful.)
       placeholder: e.g. v4.0 build 5000
     validations:
       required: true
@@ -47,13 +48,13 @@ body:
       label: Build architecture
       description: 86Box for what architecture are you using?
       options: 
-        - Linux - ARM (32-bit) 
-        - Linux - ARM (64-bit) 
-        - Linux - x64 (64-bit) 
-        - Linux - x86 (32-bit) 
-        - macOS - Universal (Intel and Apple Silicon) 
         - Windows - x64 (64-bit) 
+        - macOS - Universal (Intel and Apple Silicon) 
+        - Linux - x64 (64-bit) 
+        - Linux - ARM (64-bit) 
         - Windows - x86 (32-bit)
+        - Linux - ARM (32-bit) 
+        - Linux - x86 (32-bit) 
     validations:
       required: true
   - type: checkboxes
@@ -63,18 +64,7 @@ body:
       options:
         - label: New recompiler
         - label: Debug build
-  - type: dropdown
-    attributes:
-      label: Download source
-      description: Where did you download 86Box from?
-      options:
-        - Official website (Jenkins, GitHub)
-        - Manager auto-update
-        - I built 86Box myself (please tell us more about your build configuration)
-        - I got 86Box from a third party repository (please tell us where)
-    validations:
-      required: true
   - type: textarea
     attributes:
       label: Additional context
-      description: Is there anything else you want to tell us?
+      description: Is there anything else you want to tell us? If you build 86Box from source, please post your build configuration here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Machine Request
-    url:  https://github.com/86Box/86Box/issues/3577#issue-comment-box
-    about: Please submit machine addition requests under this tracking issue.
+    url:  https://github.com/86Box/86Box/discussions/4823#issue-comment-box
+    about: Please submit machine addition requests in this discussion thread.
   - name: Feature Request or Question
     url:  https://github.com/86Box/86Box/discussions
     about: Please submit feature requests and ask questions here.