Merge remote-tracking branch 'origin/master' into usb-bochs

Cacodemon345 · Oct 9, 2024 · 3e1a89c · 3e1a89c
2 parents 50cd8d4 + 0958783
commit 3e1a89c
Show file tree

Hide file tree

Showing 711 changed files with 67,076 additions and 40,000 deletions.
diff --git a/.ci/AppImageBuilder.yml b/.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

diff --git a/.ci/Jenkinsfile b/.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 {

diff --git a/.ci/build.sh b/.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"
@@ -535,6 +538,14 @@ 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 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.
@@ -605,7 +616,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
 	do
 		libpkgs="$libpkgs $pkg:$arch_deb"
 		length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)

diff --git a/.ci/dependencies_macports.txt b/.ci/dependencies_macports.txt
@@ -15,3 +15,4 @@ fluidsynth
 ghostscript
 libslirp
 vde2
+libsndfile
diff --git a/.ci/dependencies_msys.txt b/.ci/dependencies_msys.txt
@@ -13,3 +13,4 @@ fluidsynth
 qt5-static
 qt5-translations
 vulkan-headers
+libsndfile
diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml
@@ -40,10 +40,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -88,7 +88,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
 
       - name: Configure CMake
         run: >-

diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml
@@ -40,10 +40,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -76,9 +76,7 @@ jobs:
         run: >-
           brew install
           ninja
-          freetype
           sdl2
-          libpng
           rtmidi
           openal-soft
           fluidsynth
@@ -90,7 +88,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
 
       - name: Configure CMake
         run: >-
@@ -124,3 +122,102 @@ jobs:
         with:
           name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-x86_64-gha${{ github.run_number }}'
           path: build/artifacts/**
+
+  macos14-arm64:
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, arm64"
+
+    runs-on: macos-14
+
+#    env:
+#      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
+
+    strategy:
+      fail-fast: true
+      matrix:
+        build:
+#          - name: Regular
+#            preset: regular
+          - name: Debug
+            preset: dev_debug
+            slug: -Debug
+          - name: Dev
+            preset: development
+            slug: -Dev
+        dynarec:
+#          - name: ODR
+#            new: off
+#            slug: -ODR
+          - name: NDR
+            new: on
+            slug: -NDR
+        ui:
+          - name: SDL GUI
+            qt: off
+            static: on
+            src-packages: >-
+              libsndfile
+          - name: Qt GUI
+            qt: on
+            slug: -Qt
+            packages: >-
+              qt@5
+            src-packages: >-
+              libsndfile
+
+    steps:
+      - name: Install source dependencies
+        run: >-
+          brew reinstall -s
+          ${{ matrix.ui.src-packages }}
+
+      - name: Install dependencies
+        run: >-
+          brew install
+          ninja
+          sdl2
+          rtmidi
+          openal-soft
+          fluidsynth
+          libslirp
+          ${{ matrix.ui.packages }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+#      - name: Install sonar-scanner and build-wrapper
+#        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
+
+      - name: Configure CMake
+        run: >-
+          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
+          --toolchain ./cmake/llvm-macos-aarch64.cmake
+          -D NEW_DYNAREC=${{ matrix.dynarec.new }}
+          -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
+          -D Qt5_ROOT=$(brew --prefix qt@5)
+          -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
+          -D OpenAL_ROOT=$(brew --prefix openal-soft)
+
+      - name: Build
+        run: |
+          cmake --build build
+
+#      - name: Run sonar-scanner
+#        if: 0
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#        run: |
+#          sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+
+      - name: Generate package
+        run: |
+          cmake --install build
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-macOS-arm64-gha${{ github.run_number }}'
+          path: build/artifacts/**
diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
@@ -44,10 +44,10 @@ jobs:
 #          - name: Regular
 #            preset: regular
           - name: Debug
-            preset: debug
+            preset: dev_debug
             slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR
@@ -111,7 +111,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v2
+        uses: SonarSource/sonarcloud-github-c-cpp@5c3c39143e381909307f6903f13774b275ed956d
 
       - name: Configure CMake
         run: >-

diff --git a/.github/workflows/codeql_linux.yml b/.github/workflows/codeql_linux.yml
@@ -47,7 +47,7 @@ jobs:
 #            preset: debug
 #            slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: dev_debug
             slug: -Dev
         dynarec:
           - name: ODR

diff --git a/.github/workflows/codeql_macos.yml b/.github/workflows/codeql_macos.yml
@@ -47,7 +47,7 @@ jobs:
 #            preset: debug
 #            slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: dev_debug
             slug: -Dev
         dynarec:
           - name: ODR
@@ -70,9 +70,7 @@ jobs:
         run: >-
           brew install
           ninja
-          freetype
           sdl2
-          libpng
           rtmidi
           openal-soft
           fluidsynth

diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml
@@ -51,7 +51,7 @@ jobs:
 #            preset: debug
 #            slug: -Debug
           - name: Dev
-            preset: experimental
+            preset: dev_debug
             slug: -Dev
         dynarec:
           - name: ODR