Debugger: Don't jump to PC if the breakpoint code paused the core

This reverts commit 92b9390c51.

.github/workflows/cron_update_base_translation.yml

@@ -17,7 +17,7 @@ jobs:
         run: ./.github/workflows/scripts/common/update_base_translation.sh
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
         with:
           title: "Qt: Update Base Translation"
           commit-message: "[ci skip] Qt: Update Base Translation."

.github/workflows/cron_update_controller_db.yml

@@ -19,7 +19,7 @@ jobs:
           mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
         with:
           title: "PAD: Update to latest controller database"
           commit-message: "[ci skip] PAD: Update to latest controller database."

.github/workflows/macos_build.yml

@@ -35,7 +35,7 @@ jobs:
     name: ${{ inputs.jobName }}
     runs-on: ${{ inputs.os }}
     # Set some sort of timeout in the event of run-away builds.  We are limited on concurrent jobs so, get rid of them.
-    timeout-minutes: 90
+    timeout-minutes: 120
     env:
       POWERSHELL_TELEMETRY_OPTOUT: 1
       CCACHE_BASEDIR: ${{ github.workspace }}
@@ -160,7 +160,7 @@ jobs:
 
       - name: Sign the Application
         if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }}
-        uses: indygreg/apple-code-sign-action@v1.1
+        uses: indygreg/apple-code-sign-action@44d0985b7f4363198e80b6fea63ac3e9dd3e9957
         with:
           input_path: 'PCSX2.app'
           p12_file: cert.p12

.github/workflows/release_cut_new.yml

@@ -40,7 +40,7 @@ jobs:
       # Docs - https://github.com/mathieudutour/github-tag-action
       - name: Bump Version and Push Tag
         id: tag_version
-        uses: mathieudutour/github-tag-action@v6.2
+        uses: mathieudutour/github-tag-action@a22cf08638b34d5badda920f9daf6e72c477b07b
         with:
           github_token: ${{ github.token }}
           tag_prefix: v
@@ -68,7 +68,7 @@ jobs:
           mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md
 
       - name: Create a GitHub Release (Manual)
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
         if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
         with:
           body_path: ./release-notes.md
@@ -77,7 +77,7 @@ jobs:
           tag_name: ${{ steps.tag_version.outputs.new_tag }}
 
       - name: Create a GitHub Release (Push)
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
         if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
         with:
           body_path: ./release-notes.md

.github/workflows/scripts/linux/build-dependencies-qt.sh

@@ -15,7 +15,7 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 fi
 
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBJPEG=9f
+LIBJPEGTURBO=3.1.0
 LIBPNG=1.6.45
 LIBWEBP=1.5.0
 LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
@@ -34,7 +34,7 @@ cd deps-build
 
 cat > SHASUMS <<EOF
 fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370  libpng-$LIBPNG.tar.xz
 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
 0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
@@ -55,7 +55,7 @@ EOF
 
 curl -L \
 	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
-	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
@@ -93,16 +93,14 @@ cmake --build build --parallel
 ninja -C build install
 cd ..
 
-echo "Building libjpeg..."
-rm -fr "jpeg-$LIBJPEG"
-tar xf "jpegsrc.v$LIBJPEG.tar.gz"
-cd "jpeg-$LIBJPEG"
-mkdir build
-cd build
-../configure --prefix="$INSTALLDIR" --disable-static --enable-shared
-make "-j$NPROCS"
-make install
-cd ../..
+echo "Building libjpegturbo..."
+rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
+tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
+cd "libjpeg-turbo-$LIBJPEGTURBO"
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja
+cmake --build build --parallel
+ninja -C build install
+cd ..
 
 echo "Building LZ4..."
 rm -fr "lz4-$LZ4"

.github/workflows/scripts/macos/build-dependencies-universal.sh

@@ -44,11 +44,11 @@ SDL=SDL3-3.2.8
 ZSTD=1.5.7
 LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
 LIBPNG=1.6.45
-LIBJPEG=9f
+LIBJPEGTURBO=3.1.0
 LIBWEBP=1.5.0
 FFMPEG=6.0
 MOLTENVK=1.2.9
-QT=6.7.2
+QT=6.7.3
 KDDOCKWIDGETS=2.2.1
 
 SHADERC=2024.1
@@ -82,14 +82,14 @@ eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar
 0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370  libpng-$LIBPNG.tar.xz
 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
-04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
-c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
-e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
-fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
-58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
-9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
 eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
 aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
@@ -104,7 +104,7 @@ curl -C - -L \
 	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
 	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
@@ -203,21 +203,12 @@ merge_binaries $(realpath build) $(realpath build-arm64)
 make -C build install
 cd ..
 
-echo "Installing libjpeg..."
-rm -fr "jpeg-$LIBJPEG"
-tar xf "jpegsrc.v$LIBJPEG.tar.gz"
-cd "jpeg-$LIBJPEG"
-mkdir build
-cd build
-../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
-make "-j$NPROCS"
-cd ..
-mkdir build-arm64
-cd build-arm64
-../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="aarch64-apple-darwin" CFLAGS="-arch arm64"
-make "-j$NPROCS"
-cd ..
-merge_binaries $(realpath build) $(realpath build-arm64)
+echo "Installing libjpegturbo..."
+rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
+tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
+cd "libjpeg-turbo-$LIBJPEGTURBO"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build-arm64
+make -C build "-j$NPROCS"
 make -C build install
 cd ..
 

.github/workflows/scripts/macos/build-dependencies.sh

@@ -26,11 +26,11 @@ SDL=SDL3-3.2.8
 ZSTD=1.5.7
 LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
 LIBPNG=1.6.45
-LIBJPEG=9f
+LIBJPEGTURBO=3.1.0
 LIBWEBP=1.5.0
 FFMPEG=6.0
 MOLTENVK=1.2.9
-QT=6.7.2
+QT=6.7.3
 KDDOCKWIDGETS=2.2.1
 
 SHADERC=2024.1
@@ -62,14 +62,14 @@ eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar
 0728800155f3ed0a0c87e03addbd30ecbe374f7b080678bbca1506051d50dec3  $LZ4.tar.gz
 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370  libpng-$LIBPNG.tar.xz
 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
-04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b  jpegsrc.v$LIBJPEG.tar.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
 f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
-c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599  qtbase-everywhere-src-$QT.tar.xz
-e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6  qtimageformats-everywhere-src-$QT.tar.xz
-fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01  qtsvg-everywhere-src-$QT.tar.xz
-58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a  qttools-everywhere-src-$QT.tar.xz
-9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9  qttranslations-everywhere-src-$QT.tar.xz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
 eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
 aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
@@ -84,7 +84,7 @@ curl -L \
 	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://github.com/lz4/lz4/archive/$LZ4.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://ijg.org/files/jpegsrc.v$LIBJPEG.tar.gz" \
+	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
 	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
@@ -156,16 +156,14 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
-echo "Installing libjpeg..."
-rm -fr "jpeg-$LIBJPEG"
-tar xf "jpegsrc.v$LIBJPEG.tar.gz"
-cd "jpeg-$LIBJPEG"
-mkdir build
-cd build
-../configure --prefix="$INSTALLDIR" --disable-static --enable-shared --host="x86_64-apple-darwin" CFLAGS="-arch x86_64"
-make "-j$NPROCS"
-make install
-cd ../..
+echo "Installing libjpegturbo..."
+rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
+tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
+cd "libjpeg-turbo-$LIBJPEGTURBO"
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build
+make -C build "-j$NPROCS"
+make -C build install
+cd ..
 
 echo "Installing WebP..."
 rm -fr "libwebp-$LIBWEBP"
@@ -183,8 +181,8 @@ rm -fr "freetype-$FREETYPE"
 tar xf "freetype-$FREETYPE.tar.xz"
 cd "freetype-$FREETYPE"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build
-cmake --build build --parallel
-cmake --install build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
 echo "Building HarfBuzz..."
@@ -192,8 +190,8 @@ rm -fr "harfbuzz-$HARFBUZZ"
 tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
-cmake --build build --parallel
-cmake --install build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
 echo "Building FreeType with HarfBuzz..."
@@ -201,8 +199,8 @@ rm -fr "freetype-$FREETYPE"
 tar xf "freetype-$FREETYPE.tar.xz"
 cd "freetype-$FREETYPE"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build
-cmake --build build --parallel
-cmake --install build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
 # MoltenVK already builds universal binaries, nothing special to do here.
@@ -333,8 +331,8 @@ tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
 patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch"
 cmake "${CMAKE_COMMON[@]}" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build
-cmake --build build --parallel
-cmake --install build
+make -C build "-j$NPROCS"
+make -C build install
 cd ..
 
 echo "Cleaning up..."

.github/workflows/scripts/windows/build-dependencies-arm64.bat

@@ -44,7 +44,7 @@ cd "%BUILDDIR%"
 
 set FREETYPE=2.13.3
 set HARFBUZZ=10.0.1
-set LIBJPEG=9f
+set LIBJPEGTURBO=3.1.0
 set LIBPNG=1645
 set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
 set QT=6.8.2
@@ -64,7 +64,7 @@ set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
 call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 8adf9f5a4b6022aa2744f45c89ce347df46fea8403e99f01d650b11c417d0aa8 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1645.zip a66c4b1350b67776e90263e2550933067cd9ccbd318db489f84dcc0d2b033249 || goto error
-call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
 call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 7f8ff5c8246db4145301bc122601a5f8cef25ee2c326eddb3e88668849c61ddf || goto error
@@ -109,11 +109,10 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
 
-echo Building libjpeg...
-rmdir /S /Q "jpeg-%LIBJPEG%"
-%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
-cd "jpeg-%LIBJPEG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+echo Building libjpegturbo...
+rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%"
+tar -xf "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" || goto error
+cd "libjpeg-turbo-%LIBJPEGTURBO%" || goto error
 cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error

.github/workflows/scripts/windows/build-dependencies.bat

@@ -42,7 +42,7 @@ cd "%BUILDDIR%"
 
 set FREETYPE=2.13.3
 set HARFBUZZ=10.0.1
-set LIBJPEG=9f
+set LIBJPEGTURBO=3.1.0
 set LIBPNG=1645
 set LZ4=b8fd2d15309dd4e605070bd4486e26b6ef814e29
 set QT=6.8.2
@@ -62,7 +62,7 @@ set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7
 call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 8adf9f5a4b6022aa2744f45c89ce347df46fea8403e99f01d650b11c417d0aa8 || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1645.zip a66c4b1350b67776e90263e2550933067cd9ccbd318db489f84dcc0d2b033249 || goto error
-call :downloadfile "jpegsr%LIBJPEG%.zip" https://ijg.org/files/jpegsr%LIBJPEG%.zip 6255da8c89e09d694e6800688c76145eb6870a76ac0d36c74fccd61b3940aafa || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/%LZ4%.zip" 0c33119688d6b180c7e760b0acd70059222389cfd581632623784bee27e51a31 || goto error
 call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 7f8ff5c8246db4145301bc122601a5f8cef25ee2c326eddb3e88668849c61ddf || goto error
@@ -106,11 +106,10 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
 
-echo Building libjpeg...
-rmdir /S /Q "jpeg-%LIBJPEG%"
-%SEVENZIP% x "jpegsr%LIBJPEG%.zip" || goto error
-cd "jpeg-%LIBJPEG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\libjpeg-cmake.patch" || goto error
+echo Building libjpegturbo...
+rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%"
+tar -xf "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" || goto error
+cd "libjpeg-turbo-%LIBJPEGTURBO%" || goto error
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error

.github/workflows/scripts/windows/libjpeg-cmake.patch

@@ -1,422 +0,0 @@
-diff -ruN jpeg-9f/CMakeLists.txt jpeg-9f-new/CMakeLists.txt
---- jpeg-9f/CMakeLists.txt	1970-01-01 10:00:00.000000000 +1000
-+++ jpeg-9f-new/CMakeLists.txt	2024-03-23 21:29:37.969221600 +1000
-@@ -0,0 +1,110 @@
-+# CMake configuration for IJG libjpeg
-+# Modified from https://github.com/csparker247/jpeg-cmake/blob/develop/resources/CMakeLists.txt
-+# To install, copy this file and jconfig.h.in into a libjpeg source directory
-+# Adapted from LuaDist's CMakeLists
-+# https://github.com/LuaDist/libjpeg/blob/master/CMakeLists.txt
-+
-+cmake_minimum_required(VERSION 3.5)
-+
-+### Setup the project ###
-+file(READ "configure.ac" ac)
-+string(REGEX MATCH "AC_INIT\\(\\[libjpeg\\],\ \\[([0-9]*\\.[0-9]*\\.[0-9]*)\\]\\)" _ ${ac})
-+set(version ${CMAKE_MATCH_1})
-+project(libjpeg VERSION ${version} LANGUAGES C)
-+set(C_STANDARD 99)
-+
-+### Include extra packages ###
-+include(CMakeDependentOption)
-+include(GNUInstallDirs)
-+
-+### Options ###
-+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-+option(BUILD_STATIC_LIBS "Build static libraries" ON)
-+
-+# Make sure we build at least one library
-+if(NOT(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS))
-+  message(FATAL_ERROR "Both static and shared libraries are disabled. Nothing will be built.")
-+endif()
-+
-+### Configure jconfig.h ###
-+include(ConfigureJConfig.cmake)
-+
-+### Build the object library ###
-+set(PUBLIC_HDRS
-+  jconfig.h
-+  jerror.h
-+  jmorecfg.h
-+  jpeglib.h
-+)
-+
-+set(SRCS
-+  jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c
-+  jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c
-+  jcparam.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c jdarith.c
-+  jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdinput.c
-+  jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdpostct.c jdsample.c jdtrans.c
-+  jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c jidctint.c
-+  jmemmgr.c jmemnobs.c jquant1.c jquant2.c jutils.c
-+)
-+
-+### Create static and shared libs ###
-+if(BUILD_SHARED_LIBS)
-+  add_library(libjpeg SHARED ${SRCS})
-+  target_compile_definitions(libjpeg PRIVATE COMPILING_LIBJPEG)
-+  target_include_directories(libjpeg
-+    PUBLIC
-+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-+      $<INSTALL_INTERFACE:include>
-+  )
-+  set_target_properties(libjpeg
-+    PROPERTIES
-+      VERSION ${PROJECT_VERSION_MAJOR}
-+      POSITION_INDEPENDENT_CODE ON
-+      CLEAN_DIRECT_OUTPUT ON
-+      PUBLIC_HEADER "${PUBLIC_HDRS}"
-+  )
-+  install(TARGETS libjpeg
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+  )
-+endif()
-+
-+if(BUILD_STATIC_LIBS)
-+  add_library(libjpeg_static STATIC $<TARGET_OBJECTS:jpeg_objs>)
-+  target_include_directories(libjpeg_static
-+    PUBLIC
-+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-+      $<INSTALL_INTERFACE:include>
-+  )
-+  set_target_properties(libjpeg_static
-+    PROPERTIES
-+      OUTPUT_NAME jpeg
-+      VERSION ${PROJECT_VERSION_MAJOR}
-+      POSITION_INDEPENDENT_CODE ON
-+      CLEAN_DIRECT_OUTPUT ON
-+      PUBLIC_HEADER "${PUBLIC_HDRS}"
-+  )
-+  install(TARGETS libjpeg_static
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+  )
-+endif()
-+
-+# Configure and install pkg-config and libtool files
-+if(BUILD_STATIC_LIBS OR BUILD_SHARED_LIBS)
-+  # Compute the la file's weird version number
-+  math(EXPR JPEG_CONF_VER_MAJOR "${PROJECT_VERSION_MAJOR} + ${PROJECT_VERSION_MINOR}")
-+  set(JPEG_LIB_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-+  set(JPEG_LIB_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-+
-+  # Configure and install
-+  configure_file(libjpeg.pc.cmakein libjpeg.pc @ONLY)
-+  install(FILES
-+    ${CMAKE_CURRENT_BINARY_DIR}/libjpeg.pc
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
-+  )
-+endif()
-+
-diff -ruN jpeg-9f/ConfigureJConfig.cmake jpeg-9f-new/ConfigureJConfig.cmake
---- jpeg-9f/ConfigureJConfig.cmake	1970-01-01 10:00:00.000000000 +1000
-+++ jpeg-9f-new/ConfigureJConfig.cmake	2024-03-23 21:09:37.223882900 +1000
-@@ -0,0 +1,95 @@
-+include(CheckIncludeFile)
-+include(CheckSymbolExists)
-+include(CheckTypeSize)
-+
-+# Define this if your system has an ANSI-conforming <stddef.h> file.
-+check_include_file(stddef.h HAVE_STDDEF_H)
-+
-+# Define this if your system has an ANSI-conforming <stdlib.h> file.
-+check_include_file(stdlib.h HAVE_STDLIB_H)
-+
-+# Does your compiler support function prototypes?
-+# (If not, you also need to use ansi2knr, see install.txt)
-+set(HAVE_PROTOTYPES true CACHE BOOL "Does your compiler support function prototypes?")
-+
-+# Does your compiler support the declaration "unsigned char" ?
-+# How about "unsigned short" ?
-+check_type_size("unsigned char" UNSIGNED_CHAR LANGUAGE C)
-+check_type_size("unsigned short" UNSIGNED_SHORT LANGUAGE C)
-+
-+# Define "void" as "char" if your compiler doesn't know about type void.
-+# NOTE: be sure to define void such that "void *" represents the most general
-+# pointer type, e.g., that returned by malloc().
-+# NOT IMPLEMENTED: Modify in jconfig.h.in #
-+
-+# Define "const" as empty if your compiler doesn't know the "const" keyword.
-+# NOT IMPLEMENTED: Modify in jconfig.h.in #
-+
-+# Define this if an ordinary "char" type is unsigned.
-+# If you're not sure, leaving it undefined will work at some cost in speed.
-+# If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
-+set(CHAR_IS_UNSIGNED false CACHE BOOL "char type is unsigned")
-+
-+# Define this if your system does not have an ANSI/SysV <string.h>,
-+# but does have a BSD-style <strings.h>.
-+set(NEED_BSD_STRINGS false CACHE BOOL "Use BSD <strings.h>. Use only if system lacks ANSI/SysV <strings.h>")
-+
-+# Define this if your system does not provide typedef size_t in any of the
-+# ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
-+# <sys/types.h> instead.
-+set(NEED_SYS_TYPES_H false CACHE BOOL "size_t defined in <sys/types.h>")
-+
-+# For 80x86 machines, you need to define NEED_FAR_POINTERS,
-+# unless you are using a large-data memory model or 80386 flat-memory mode.
-+# On less brain-damaged CPUs this symbol must not be defined.
-+# (Defining this symbol causes large data structures to be referenced through
-+# "far" pointers and to be allocated with a special version of malloc.)
-+set(NEED_FAR_POINTERS false CACHE BOOL "Reference large data structures through 'far' pointers allocated with a special version of malloc")
-+
-+# Define this if your linker needs global names to be unique in less
-+# than the first 15 characters.
-+set(NEED_SHORT_EXTERNAL_NAMES false CACHE BOOL "Global names must be unique in less than the first 15 characters")
-+
-+# Although a real ANSI C compiler can deal perfectly well with pointers to
-+# unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
-+# and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
-+# define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
-+# actually get "missing structure definition" warnings or errors while
-+# compiling the JPEG code.
-+set(INCOMPLETE_TYPES_BROKEN false CACHE BOOL "Disable pointers to unspecified structures")
-+
-+# Define "boolean" as unsigned char, not enum, on Windows systems.
-+# NOT IMPLEMENTED: Modify in jconfig.h.in #
-+
-+# The following options affect code selection within the JPEG library,
-+# but they don't need to be visible to applications using the library.
-+# To minimize application namespace pollution, the symbols won't be
-+# defined unless JPEG_INTERNALS has been defined.
-+#
-+
-+# Define this if your compiler implements ">>" on signed values as a logical
-+# (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
-+# which is the normal and rational definition.
-+set(RIGHT_SHIFT_IS_UNSIGNED false CACHE BOOL "Compiler implements >> on signed values as a logical (unsigned) shift")
-+
-+# The remaining options do not affect the JPEG library proper,
-+# but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
-+# Other applications can ignore these.
-+#
-+
-+mark_as_advanced(FORCE
-+  HAVE_PROTOTYPES
-+  HAVE_UNSIGNED_CHAR
-+  HAVE_UNSIGNED_SHORT
-+  CHAR_IS_UNSIGNED
-+  HAVE_STDDEF_H
-+  HAVE_STDLIB_H
-+  NEED_BSD_STRINGS
-+  NEED_SYS_TYPES_H
-+  NEED_FAR_POINTERS
-+  NEED_SHORT_EXTERNAL_NAMES
-+  INCOMPLETE_TYPES_BROKEN
-+  RIGHT_SHIFT_IS_UNSIGNED
-+)
-+
-+configure_file(jconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/jconfig.h)
-diff -ruN jpeg-9f/jconfig.h.in jpeg-9f-new/jconfig.h.in
---- jpeg-9f/jconfig.h.in	1970-01-01 10:00:00.000000000 +1000
-+++ jpeg-9f-new/jconfig.h.in	2024-03-23 21:06:05.204994600 +1000
-@@ -0,0 +1,173 @@
-+/*
-+ * jconfig.h.in
-+ *
-+ * Copyright (C) 1991-1994, Thomas G. Lane.
-+ * Modified 2009-2013 by Guido Vollbeding.
-+ * This file is part of the Independent JPEG Group's software.
-+ * For conditions of distribution and use, see the accompanying README file.
-+ *
-+ * This file is a modification of jconfig.txt from libjpeg. In addition to
-+ * documenting the configuration options that are required to customize the
-+ * JPEG software for a particular system, it is used by jpeg-cmake to configure
-+ * jconfig.h
-+ */
-+
-+
-+/*
-+ * These symbols indicate the properties of your machine or compiler.
-+ * #define the symbol if yes, #undef it if no.
-+ */
-+
-+/* Does your compiler support function prototypes?
-+ * (If not, you also need to use ansi2knr, see install.txt)
-+ */
-+#cmakedefine HAVE_PROTOTYPES
-+
-+/* Does your compiler support the declaration "unsigned char" ?
-+ * How about "unsigned short" ?
-+ */
-+#cmakedefine HAVE_UNSIGNED_CHAR
-+#cmakedefine HAVE_UNSIGNED_SHORT
-+
-+/* Define "void" as "char" if your compiler doesn't know about type void.
-+ * NOTE: be sure to define void such that "void *" represents the most general
-+ * pointer type, e.g., that returned by malloc().
-+ */
-+/* #define void char */
-+
-+/* Define "const" as empty if your compiler doesn't know the "const" keyword.
-+ */
-+/* #define const */
-+
-+/* Define this if an ordinary "char" type is unsigned.
-+ * If you're not sure, leaving it undefined will work at some cost in speed.
-+ * If you defined HAVE_UNSIGNED_CHAR then the speed difference is minimal.
-+ */
-+#cmakedefine CHAR_IS_UNSIGNED
-+
-+/* Define this if your system has an ANSI-conforming <stddef.h> file.
-+ */
-+#cmakedefine HAVE_STDDEF_H
-+
-+/* Define this if your system has an ANSI-conforming <stdlib.h> file.
-+ */
-+#cmakedefine HAVE_STDLIB_H
-+
-+/* Define this if your system does not have an ANSI/SysV <string.h>,
-+ * but does have a BSD-style <strings.h>.
-+ */
-+#cmakedefine NEED_BSD_STRINGS
-+
-+/* Define this if your system does not provide typedef size_t in any of the
-+ * ANSI-standard places (stddef.h, stdlib.h, or stdio.h), but places it in
-+ * <sys/types.h> instead.
-+ */
-+#cmakedefine NEED_SYS_TYPES_H
-+
-+/* For 80x86 machines, you need to define NEED_FAR_POINTERS,
-+ * unless you are using a large-data memory model or 80386 flat-memory mode.
-+ * On less brain-damaged CPUs this symbol must not be defined.
-+ * (Defining this symbol causes large data structures to be referenced through
-+ * "far" pointers and to be allocated with a special version of malloc.)
-+ */
-+#cmakedefine NEED_FAR_POINTERS
-+
-+/* Define this if your linker needs global names to be unique in less
-+ * than the first 15 characters.
-+ */
-+#cmakedefine NEED_SHORT_EXTERNAL_NAMES
-+
-+/* Although a real ANSI C compiler can deal perfectly well with pointers to
-+ * unspecified structures (see "incomplete types" in the spec), a few pre-ANSI
-+ * and pseudo-ANSI compilers get confused.  To keep one of these bozos happy,
-+ * define INCOMPLETE_TYPES_BROKEN.  This is not recommended unless you
-+ * actually get "missing structure definition" warnings or errors while
-+ * compiling the JPEG code.
-+ */
-+#cmakedefine INCOMPLETE_TYPES_BROKEN
-+
-+/* Define "boolean" as unsigned char, not enum, on Windows systems.
-+ */
-+#ifdef _WIN32
-+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-+typedef unsigned char boolean;
-+#endif
-+#ifndef FALSE			/* in case these macros already exist */
-+#define FALSE	0		/* values of boolean */
-+#endif
-+#ifndef TRUE
-+#define TRUE	1
-+#endif
-+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-+#endif
-+
-+
-+/*
-+ * The following options affect code selection within the JPEG library,
-+ * but they don't need to be visible to applications using the library.
-+ * To minimize application namespace pollution, the symbols won't be
-+ * defined unless JPEG_INTERNALS has been defined.
-+ */
-+
-+#ifdef JPEG_INTERNALS
-+
-+/* Define this if your compiler implements ">>" on signed values as a logical
-+ * (unsigned) shift; leave it undefined if ">>" is a signed (arithmetic) shift,
-+ * which is the normal and rational definition.
-+ */
-+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED
-+
-+
-+#endif /* JPEG_INTERNALS */
-+
-+
-+/*
-+ * The remaining options do not affect the JPEG library proper,
-+ * but only the sample applications cjpeg/djpeg (see cjpeg.c, djpeg.c).
-+ * Other applications can ignore these.
-+ */
-+
-+#ifdef JPEG_CJPEG_DJPEG
-+
-+/* These defines indicate which image (non-JPEG) file formats are allowed. */
-+
-+#cmakedefine BMP_SUPPORTED		/* BMP image file format */
-+#cmakedefine GIF_SUPPORTED		/* GIF image file format */
-+#cmakedefine PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-+#cmakedefine RLE_SUPPORTED		/* Utah RLE image file format */
-+#cmakedefine TARGA_SUPPORTED		/* Targa image file format */
-+
-+/*
-+ * This defines the default output format for djpeg. Must be one of the FMT_*
-+ * enums found in djpeg.c or djpegalt.c
-+ */
-+#cmakedefine DEFAULT_FMT @DEFAULT_FMT@
-+
-+/* Define this if you want to name both input and output files on the command
-+ * line, rather than using stdout and optionally stdin.  You MUST do this if
-+ * your system can't cope with binary I/O to stdin/stdout.  See comments at
-+ * head of cjpeg.c or djpeg.c.
-+ */
-+#cmakedefine TWO_FILE_COMMANDLINE
-+
-+/* Define this if your system needs explicit cleanup of temporary files.
-+ * This is crucial under MS-DOS, where the temporary "files" may be areas
-+ * of extended memory; on most other systems it's not as important.
-+ */
-+#cmakedefine NEED_SIGNAL_CATCHER
-+
-+/* By default, we open image files with fopen(...,"rb") or fopen(...,"wb").
-+ * This is necessary on systems that distinguish text files from binary files,
-+ * and is harmless on most systems that don't.  If you have one of the rare
-+ * systems that complains about the "b" spec, define this symbol.
-+ */
-+#cmakedefine DONT_USE_B_MODE
-+
-+/* Define this if you want percent-done progress reports from cjpeg/djpeg.
-+ */
-+#cmakedefine PROGRESS_REPORT
-+
-+/* Define this if you *don't* want overwrite confirmation */
-+#cmakedefine NO_OVERWRITE_CHECK
-+
-+#endif /* JPEG_CJPEG_DJPEG */
-diff -ruN jpeg-9f/jmorecfg.h jpeg-9f-new/jmorecfg.h
---- jpeg-9f/jmorecfg.h	2022-03-31 19:41:26.000000000 +1000
-+++ jpeg-9f-new/jmorecfg.h	2024-03-23 21:20:25.514814400 +1000
-@@ -244,8 +244,13 @@
- #define LOCAL(type)		static type
- /* a function referenced thru EXTERNs: */
- #define GLOBAL(type)		type
-+
- /* a reference to a GLOBAL function: */
--#define EXTERN(type)		extern type
-+#ifdef COMPILING_LIBJPEG
-+#define EXTERN(type)		__declspec(dllexport) extern type
-+#else
-+#define EXTERN(type)		__declspec(dllimport) extern type
-+#endif
- 
- 
- /* This macro is used to declare a "method", that is, a function pointer.
-diff -ruN jpeg-9f/libjpeg.pc.cmakein jpeg-9f-new/libjpeg.pc.cmakein
---- jpeg-9f/libjpeg.pc.cmakein	1970-01-01 10:00:00.000000000 +1000
-+++ jpeg-9f-new/libjpeg.pc.cmakein	2024-03-23 21:06:13.922695100 +1000
-@@ -0,0 +1,10 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+
-+Name: libjpeg
-+Description: Reads and writes JPEG files
-+Version: @JPEG_LIB_VERSION_MAJOR@.@JPEG_LIB_VERSION_MINOR@.0
-+Libs: -L${libdir} -ljpeg
-+Cflags: -I${includedir}

.github/workflows/triage_pr.yml

@@ -12,7 +12,7 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: xTVaser/first-interaction@v1.2.4
+    - uses: xTVaser/first-interaction@d62d6eb3c1215eae9f9d6dbfabf12d6725834cb3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         debug-mode: false

.github/workflows/windows_build_qt.yml

@@ -168,7 +168,7 @@ jobs:
             !./bin/**/*.lib
 
       - name: Install the Breakpad Symbol Generator
-        uses: baptiste0928/cargo-install@v3
+        uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3
         with:
           crate: dump_syms
 

3rdparty/cpuinfo/src/arm/mach/init.c

@@ -101,17 +101,35 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 	return cpuinfo_uarch_unknown;
 }
 
-static void decode_package_name(char* package_name) {
+/* Small bodge until cpuinfo merges PR #246 */
+static int read_package_name_from_brand_string(char* package_name) {
+	size_t size;
+	if (sysctlbyname("machdep.cpu.brand_string", NULL, &size, NULL, 0) != 0) {
+	sysctlfail:
+		cpuinfo_log_warning("sysctlbyname(\"machdep.cpu.brand_string\") failed: %s", strerror(errno));
+		return false;
+	}
+
+	char* brand_string = alloca(size);
+	if (sysctlbyname("machdep.cpu.brand_string", brand_string, &size, NULL, 0) != 0)
+		goto sysctlfail;
+	cpuinfo_log_debug("machdep.cpu.brand_string: %s", brand_string);
+
+	strlcpy(package_name, brand_string, CPUINFO_PACKAGE_NAME_MAX);
+	return true;
+}
+
+static int decode_package_name_from_hw_machine(char* package_name) {
 	size_t size;
 	if (sysctlbyname("hw.machine", NULL, &size, NULL, 0) != 0) {
 		cpuinfo_log_warning("sysctlbyname(\"hw.machine\") failed: %s", strerror(errno));
-		return;
+		return false;
 	}
 
 	char* machine_name = alloca(size);
 	if (sysctlbyname("hw.machine", machine_name, &size, NULL, 0) != 0) {
 		cpuinfo_log_warning("sysctlbyname(\"hw.machine\") failed: %s", strerror(errno));
-		return;
+		return false;
 	}
 	cpuinfo_log_debug("hw.machine: %s", machine_name);
 
@@ -119,7 +137,7 @@ static void decode_package_name(char* package_name) {
 	uint32_t major = 0, minor = 0;
 	if (sscanf(machine_name, "%9[^,0123456789]%" SCNu32 ",%" SCNu32, name, &major, &minor) != 3) {
 		cpuinfo_log_warning("parsing \"hw.machine\" failed: %s", strerror(errno));
-		return;
+		return false;
 	}
 
 	uint32_t chip_model = 0;
@@ -224,7 +242,9 @@ static void decode_package_name(char* package_name) {
 	}
 	if (chip_model != 0) {
 		snprintf(package_name, CPUINFO_PACKAGE_NAME_MAX, "Apple A%" PRIu32 "%c", chip_model, suffix);
+		return true;
 	}
+	return false;
 }
 
 void cpuinfo_arm_mach_init(void) {
@@ -275,7 +295,8 @@ void cpuinfo_arm_mach_init(void) {
 			.core_start = i * cores_per_package,
 			.core_count = cores_per_package,
 		};
-		decode_package_name(packages[i].name);
+		if (!read_package_name_from_brand_string(packages[i].name))
+			decode_package_name_from_hw_machine(packages[i].name);
 	}
 
 	const uint32_t cpu_family = get_sys_info_by_name("hw.cpufamily");

bin/docs/ThirdPartyLicenses.html

@@ -1221,43 +1221,32 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre>
 
-<h3>libjpeg - <a href="https://ijg.org/">https://ijg.org/</a></h3>
+<h3>libjpeg-turbo - <a href="https://github.com/libjpeg-turbo/libjpeg-turbo">https://github.com/libjpeg-turbo/libjpeg-turbo/</a></h3>
 <pre>
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS", and you,
-its user, assume the entire risk as to its quality and accuracy.
+Copyright (C)2009-2024 D. R. Commander. All Rights Reserved.
+Copyright (C)2015 Viktor Szathmáry. All Rights Reserved.
 
-This software is copyright (C) 1991-2024, Thomas G. Lane, Guido Vollbeding.
-All Rights Reserved except as specified below.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list
+of conditions and the following disclaimer in the documentation and/or other materials
+provided with the distribution. Neither the name of the libjpeg-turbo Project nor the
+names of its contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
 
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
-
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-</pre>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</pre>
 
 <h3>LLVM - <a href="https://github.com/llvm/llvm-project">https://github.com/llvm/llvm-project</a></h3>
 <pre>                                 Apache License
@@ -3419,5 +3408,635 @@ https://www.gnu.org/licenses/why-not-lgpl.html.
 
 </pre>
 
+<h3>KDDockWidgets - <a href="https://github.com/KDAB/KDDockWidgets">https://github.com/KDAB/KDDockWidgets</a></h3>
+<pre>
+  GNU GENERAL PUBLIC LICENSE
+
+  Version 3, 29 June 2007
+  
+  Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
+  
+  Everyone is permitted to copy and distribute verbatim copies of this license
+  document, but changing it is not allowed.
+  
+  Preamble
+  
+  The GNU General Public License is a free, copyleft license for software and
+  other kinds of works.
+  
+  The licenses for most software and other practical works are designed to take
+  away your freedom to share and change the works. By contrast, the GNU General
+  Public License is intended to guarantee your freedom to share and change all
+  versions of a program--to make sure it remains free software for all its users.
+  We, the Free Software Foundation, use the GNU General Public License for most
+  of our software; it applies also to any other work released this way by its
+  authors. You can apply it to your programs, too.
+  
+  When we speak of free software, we are referring to freedom, not price. Our
+  General Public Licenses are designed to make sure that you have the freedom
+  to distribute copies of free software (and charge for them if you wish), that
+  you receive source code or can get it if you want it, that you can change
+  the software or use pieces of it in new free programs, and that you know you
+  can do these things.
+  
+  To protect your rights, we need to prevent others from denying you these rights
+  or asking you to surrender the rights. Therefore, you have certain responsibilities
+  if you distribute copies of the software, or if you modify it: responsibilities
+  to respect the freedom of others.
+  
+  For example, if you distribute copies of such a program, whether gratis or
+  for a fee, you must pass on to the recipients the same freedoms that you received.
+  You must make sure that they, too, receive or can get the source code. And
+  you must show them these terms so they know their rights.
+  
+  Developers that use the GNU GPL protect your rights with two steps: (1) assert
+  copyright on the software, and (2) offer you this License giving you legal
+  permission to copy, distribute and/or modify it.
+  
+  For the developers' and authors' protection, the GPL clearly explains that
+  there is no warranty for this free software. For both users' and authors'
+  sake, the GPL requires that modified versions be marked as changed, so that
+  their problems will not be attributed erroneously to authors of previous versions.
+  
+  Some devices are designed to deny users access to install or run modified
+  versions of the software inside them, although the manufacturer can do so.
+  This is fundamentally incompatible with the aim of protecting users' freedom
+  to change the software. The systematic pattern of such abuse occurs in the
+  area of products for individuals to use, which is precisely where it is most
+  unacceptable. Therefore, we have designed this version of the GPL to prohibit
+  the practice for those products. If such problems arise substantially in other
+  domains, we stand ready to extend this provision to those domains in future
+  versions of the GPL, as needed to protect the freedom of users.
+  
+  Finally, every program is threatened constantly by software patents. States
+  should not allow patents to restrict development and use of software on general-purpose
+  computers, but in those that do, we wish to avoid the special danger that
+  patents applied to a free program could make it effectively proprietary. To
+  prevent this, the GPL assures that patents cannot be used to render the program
+  non-free.
+  
+  The precise terms and conditions for copying, distribution and modification
+  follow.
+  
+  TERMS AND CONDITIONS
+  
+     0. Definitions.
+  
+     "This License" refers to version 3 of the GNU General Public License.
+  
+  "Copyright" also means copyright-like laws that apply to other kinds of works,
+  such as semiconductor masks.
+  
+  "The Program" refers to any copyrightable work licensed under this License.
+  Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals
+  or organizations.
+  
+  To "modify" a work means to copy from or adapt all or part of the work in
+  a fashion requiring copyright permission, other than the making of an exact
+  copy. The resulting work is called a "modified version" of the earlier work
+  or a work "based on" the earlier work.
+  
+  A "covered work" means either the unmodified Program or a work based on the
+  Program.
+  
+  To "propagate" a work means to do anything with it that, without permission,
+  would make you directly or secondarily liable for infringement under applicable
+  copyright law, except executing it on a computer or modifying a private copy.
+  Propagation includes copying, distribution (with or without modification),
+  making available to the public, and in some countries other activities as
+  well.
+  
+  To "convey" a work means any kind of propagation that enables other parties
+  to make or receive copies. Mere interaction with a user through a computer
+  network, with no transfer of a copy, is not conveying.
+  
+  An interactive user interface displays "Appropriate Legal Notices" to the
+  extent that it includes a convenient and prominently visible feature that
+  (1) displays an appropriate copyright notice, and (2) tells the user that
+  there is no warranty for the work (except to the extent that warranties are
+  provided), that licensees may convey the work under this License, and how
+  to view a copy of this License. If the interface presents a list of user commands
+  or options, such as a menu, a prominent item in the list meets this criterion.
+  
+     1. Source Code.
+  
+  The "source code" for a work means the preferred form of the work for making
+  modifications to it. "Object code" means any non-source form of a work.
+  
+  A "Standard Interface" means an interface that either is an official standard
+  defined by a recognized standards body, or, in the case of interfaces specified
+  for a particular programming language, one that is widely used among developers
+  working in that language.
+  
+  The "System Libraries" of an executable work include anything, other than
+  the work as a whole, that (a) is included in the normal form of packaging
+  a Major Component, but which is not part of that Major Component, and (b)
+  serves only to enable use of the work with that Major Component, or to implement
+  a Standard Interface for which an implementation is available to the public
+  in source code form. A "Major Component", in this context, means a major essential
+  component (kernel, window system, and so on) of the specific operating system
+  (if any) on which the executable work runs, or a compiler used to produce
+  the work, or an object code interpreter used to run it.
+  
+  The "Corresponding Source" for a work in object code form means all the source
+  code needed to generate, install, and (for an executable work) run the object
+  code and to modify the work, including scripts to control those activities.
+  However, it does not include the work's System Libraries, or general-purpose
+  tools or generally available free programs which are used unmodified in performing
+  those activities but which are not part of the work. For example, Corresponding
+  Source includes interface definition files associated with source files for
+  the work, and the source code for shared libraries and dynamically linked
+  subprograms that the work is specifically designed to require, such as by
+  intimate data communication or control flow between those subprograms and
+  other parts of the work.
+  
+  The Corresponding Source need not include anything that users can regenerate
+  automatically from other parts of the Corresponding Source.
+  
+     The Corresponding Source for a work in source code form is that same work.
+  
+     2. Basic Permissions.
+  
+  All rights granted under this License are granted for the term of copyright
+  on the Program, and are irrevocable provided the stated conditions are met.
+  This License explicitly affirms your unlimited permission to run the unmodified
+  Program. The output from running a covered work is covered by this License
+  only if the output, given its content, constitutes a covered work. This License
+  acknowledges your rights of fair use or other equivalent, as provided by copyright
+  law.
+  
+  You may make, run and propagate covered works that you do not convey, without
+  conditions so long as your license otherwise remains in force. You may convey
+  covered works to others for the sole purpose of having them make modifications
+  exclusively for you, or provide you with facilities for running those works,
+  provided that you comply with the terms of this License in conveying all material
+  for which you do not control copyright. Those thus making or running the covered
+  works for you must do so exclusively on your behalf, under your direction
+  and control, on terms that prohibit them from making any copies of your copyrighted
+  material outside their relationship with you.
+  
+  Conveying under any other circumstances is permitted solely under the conditions
+  stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+  
+     3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+  
+  No covered work shall be deemed part of an effective technological measure
+  under any applicable law fulfilling obligations under article 11 of the WIPO
+  copyright treaty adopted on 20 December 1996, or similar laws prohibiting
+  or restricting circumvention of such measures.
+  
+  When you convey a covered work, you waive any legal power to forbid circumvention
+  of technological measures to the extent such circumvention is effected by
+  exercising rights under this License with respect to the covered work, and
+  you disclaim any intention to limit operation or modification of the work
+  as a means of enforcing, against the work's users, your or third parties'
+  legal rights to forbid circumvention of technological measures.
+  
+     4. Conveying Verbatim Copies.
+  
+  You may convey verbatim copies of the Program's source code as you receive
+  it, in any medium, provided that you conspicuously and appropriately publish
+  on each copy an appropriate copyright notice; keep intact all notices stating
+  that this License and any non-permissive terms added in accord with section
+  7 apply to the code; keep intact all notices of the absence of any warranty;
+  and give all recipients a copy of this License along with the Program.
+  
+  You may charge any price or no price for each copy that you convey, and you
+  may offer support or warranty protection for a fee.
+  
+     5. Conveying Modified Source Versions.
+  
+  You may convey a work based on the Program, or the modifications to produce
+  it from the Program, in the form of source code under the terms of section
+  4, provided that you also meet all of these conditions:
+  
+  a) The work must carry prominent notices stating that you modified it, and
+  giving a relevant date.
+  
+  b) The work must carry prominent notices stating that it is released under
+  this License and any conditions added under section 7. This requirement modifies
+  the requirement in section 4 to "keep intact all notices".
+  
+  c) You must license the entire work, as a whole, under this License to anyone
+  who comes into possession of a copy. This License will therefore apply, along
+  with any applicable section 7 additional terms, to the whole of the work,
+  and all its parts, regardless of how they are packaged. This License gives
+  no permission to license the work in any other way, but it does not invalidate
+  such permission if you have separately received it.
+  
+  d) If the work has interactive user interfaces, each must display Appropriate
+  Legal Notices; however, if the Program has interactive interfaces that do
+  not display Appropriate Legal Notices, your work need not make them do so.
+  
+  A compilation of a covered work with other separate and independent works,
+  which are not by their nature extensions of the covered work, and which are
+  not combined with it such as to form a larger program, in or on a volume of
+  a storage or distribution medium, is called an "aggregate" if the compilation
+  and its resulting copyright are not used to limit the access or legal rights
+  of the compilation's users beyond what the individual works permit. Inclusion
+  of a covered work in an aggregate does not cause this License to apply to
+  the other parts of the aggregate.
+  
+     6. Conveying Non-Source Forms.
+  
+  You may convey a covered work in object code form under the terms of sections
+  4 and 5, provided that you also convey the machine-readable Corresponding
+  Source under the terms of this License, in one of these ways:
+  
+  a) Convey the object code in, or embodied in, a physical product (including
+  a physical distribution medium), accompanied by the Corresponding Source fixed
+  on a durable physical medium customarily used for software interchange.
+  
+  b) Convey the object code in, or embodied in, a physical product (including
+  a physical distribution medium), accompanied by a written offer, valid for
+  at least three years and valid for as long as you offer spare parts or customer
+  support for that product model, to give anyone who possesses the object code
+  either (1) a copy of the Corresponding Source for all the software in the
+  product that is covered by this License, on a durable physical medium customarily
+  used for software interchange, for a price no more than your reasonable cost
+  of physically performing this conveying of source, or (2) access to copy the
+  Corresponding Source from a network server at no charge.
+  
+  c) Convey individual copies of the object code with a copy of the written
+  offer to provide the Corresponding Source. This alternative is allowed only
+  occasionally and noncommercially, and only if you received the object code
+  with such an offer, in accord with subsection 6b.
+  
+  d) Convey the object code by offering access from a designated place (gratis
+  or for a charge), and offer equivalent access to the Corresponding Source
+  in the same way through the same place at no further charge. You need not
+  require recipients to copy the Corresponding Source along with the object
+  code. If the place to copy the object code is a network server, the Corresponding
+  Source may be on a different server (operated by you or a third party) that
+  supports equivalent copying facilities, provided you maintain clear directions
+  next to the object code saying where to find the Corresponding Source. Regardless
+  of what server hosts the Corresponding Source, you remain obligated to ensure
+  that it is available for as long as needed to satisfy these requirements.
+  
+  e) Convey the object code using peer-to-peer transmission, provided you inform
+  other peers where the object code and Corresponding Source of the work are
+  being offered to the general public at no charge under subsection 6d.
+  
+  A separable portion of the object code, whose source code is excluded from
+  the Corresponding Source as a System Library, need not be included in conveying
+  the object code work.
+  
+  A "User Product" is either (1) a "consumer product", which means any tangible
+  personal property which is normally used for personal, family, or household
+  purposes, or (2) anything designed or sold for incorporation into a dwelling.
+  In determining whether a product is a consumer product, doubtful cases shall
+  be resolved in favor of coverage. For a particular product received by a particular
+  user, "normally used" refers to a typical or common use of that class of product,
+  regardless of the status of the particular user or of the way in which the
+  particular user actually uses, or expects or is expected to use, the product.
+  A product is a consumer product regardless of whether the product has substantial
+  commercial, industrial or non-consumer uses, unless such uses represent the
+  only significant mode of use of the product.
+  
+  "Installation Information" for a User Product means any methods, procedures,
+  authorization keys, or other information required to install and execute modified
+  versions of a covered work in that User Product from a modified version of
+  its Corresponding Source. The information must suffice to ensure that the
+  continued functioning of the modified object code is in no case prevented
+  or interfered with solely because modification has been made.
+  
+  If you convey an object code work under this section in, or with, or specifically
+  for use in, a User Product, and the conveying occurs as part of a transaction
+  in which the right of possession and use of the User Product is transferred
+  to the recipient in perpetuity or for a fixed term (regardless of how the
+  transaction is characterized), the Corresponding Source conveyed under this
+  section must be accompanied by the Installation Information. But this requirement
+  does not apply if neither you nor any third party retains the ability to install
+  modified object code on the User Product (for example, the work has been installed
+  in ROM).
+  
+  The requirement to provide Installation Information does not include a requirement
+  to continue to provide support service, warranty, or updates for a work that
+  has been modified or installed by the recipient, or for the User Product in
+  which it has been modified or installed. Access to a network may be denied
+  when the modification itself materially and adversely affects the operation
+  of the network or violates the rules and protocols for communication across
+  the network.
+  
+  Corresponding Source conveyed, and Installation Information provided, in accord
+  with this section must be in a format that is publicly documented (and with
+  an implementation available to the public in source code form), and must require
+  no special password or key for unpacking, reading or copying.
+  
+     7. Additional Terms.
+  
+  "Additional permissions" are terms that supplement the terms of this License
+  by making exceptions from one or more of its conditions. Additional permissions
+  that are applicable to the entire Program shall be treated as though they
+  were included in this License, to the extent that they are valid under applicable
+  law. If additional permissions apply only to part of the Program, that part
+  may be used separately under those permissions, but the entire Program remains
+  governed by this License without regard to the additional permissions.
+  
+  When you convey a copy of a covered work, you may at your option remove any
+  additional permissions from that copy, or from any part of it. (Additional
+  permissions may be written to require their own removal in certain cases when
+  you modify the work.) You may place additional permissions on material, added
+  by you to a covered work, for which you have or can give appropriate copyright
+  permission.
+  
+  Notwithstanding any other provision of this License, for material you add
+  to a covered work, you may (if authorized by the copyright holders of that
+  material) supplement the terms of this License with terms:
+  
+  a) Disclaiming warranty or limiting liability differently from the terms of
+  sections 15 and 16 of this License; or
+  
+  b) Requiring preservation of specified reasonable legal notices or author
+  attributions in that material or in the Appropriate Legal Notices displayed
+  by works containing it; or
+  
+  c) Prohibiting misrepresentation of the origin of that material, or requiring
+  that modified versions of such material be marked in reasonable ways as different
+  from the original version; or
+  
+  d) Limiting the use for publicity purposes of names of licensors or authors
+  of the material; or
+  
+  e) Declining to grant rights under trademark law for use of some trade names,
+  trademarks, or service marks; or
+  
+  f) Requiring indemnification of licensors and authors of that material by
+  anyone who conveys the material (or modified versions of it) with contractual
+  assumptions of liability to the recipient, for any liability that these contractual
+  assumptions directly impose on those licensors and authors.
+  
+  All other non-permissive additional terms are considered "further restrictions"
+  within the meaning of section 10. If the Program as you received it, or any
+  part of it, contains a notice stating that it is governed by this License
+  along with a term that is a further restriction, you may remove that term.
+  If a license document contains a further restriction but permits relicensing
+  or conveying under this License, you may add to a covered work material governed
+  by the terms of that license document, provided that the further restriction
+  does not survive such relicensing or conveying.
+  
+  If you add terms to a covered work in accord with this section, you must place,
+  in the relevant source files, a statement of the additional terms that apply
+  to those files, or a notice indicating where to find the applicable terms.
+  
+  Additional terms, permissive or non-permissive, may be stated in the form
+  of a separately written license, or stated as exceptions; the above requirements
+  apply either way.
+  
+     8. Termination.
+  
+  You may not propagate or modify a covered work except as expressly provided
+  under this License. Any attempt otherwise to propagate or modify it is void,
+  and will automatically terminate your rights under this License (including
+  any patent licenses granted under the third paragraph of section 11).
+  
+  However, if you cease all violation of this License, then your license from
+  a particular copyright holder is reinstated (a) provisionally, unless and
+  until the copyright holder explicitly and finally terminates your license,
+  and (b) permanently, if the copyright holder fails to notify you of the violation
+  by some reasonable means prior to 60 days after the cessation.
+  
+  Moreover, your license from a particular copyright holder is reinstated permanently
+  if the copyright holder notifies you of the violation by some reasonable means,
+  this is the first time you have received notice of violation of this License
+  (for any work) from that copyright holder, and you cure the violation prior
+  to 30 days after your receipt of the notice.
+  
+  Termination of your rights under this section does not terminate the licenses
+  of parties who have received copies or rights from you under this License.
+  If your rights have been terminated and not permanently reinstated, you do
+  not qualify to receive new licenses for the same material under section 10.
+  
+     9. Acceptance Not Required for Having Copies.
+  
+  You are not required to accept this License in order to receive or run a copy
+  of the Program. Ancillary propagation of a covered work occurring solely as
+  a consequence of using peer-to-peer transmission to receive a copy likewise
+  does not require acceptance. However, nothing other than this License grants
+  you permission to propagate or modify any covered work. These actions infringe
+  copyright if you do not accept this License. Therefore, by modifying or propagating
+  a covered work, you indicate your acceptance of this License to do so.
+  
+     10. Automatic Licensing of Downstream Recipients.
+  
+  Each time you convey a covered work, the recipient automatically receives
+  a license from the original licensors, to run, modify and propagate that work,
+  subject to this License. You are not responsible for enforcing compliance
+  by third parties with this License.
+  
+  An "entity transaction" is a transaction transferring control of an organization,
+  or substantially all assets of one, or subdividing an organization, or merging
+  organizations. If propagation of a covered work results from an entity transaction,
+  each party to that transaction who receives a copy of the work also receives
+  whatever licenses to the work the party's predecessor in interest had or could
+  give under the previous paragraph, plus a right to possession of the Corresponding
+  Source of the work from the predecessor in interest, if the predecessor has
+  it or can get it with reasonable efforts.
+  
+  You may not impose any further restrictions on the exercise of the rights
+  granted or affirmed under this License. For example, you may not impose a
+  license fee, royalty, or other charge for exercise of rights granted under
+  this License, and you may not initiate litigation (including a cross-claim
+  or counterclaim in a lawsuit) alleging that any patent claim is infringed
+  by making, using, selling, offering for sale, or importing the Program or
+  any portion of it.
+  
+     11. Patents.
+  
+  A "contributor" is a copyright holder who authorizes use under this License
+  of the Program or a work on which the Program is based. The work thus licensed
+  is called the contributor's "contributor version".
+  
+  A contributor's "essential patent claims" are all patent claims owned or controlled
+  by the contributor, whether already acquired or hereafter acquired, that would
+  be infringed by some manner, permitted by this License, of making, using,
+  or selling its contributor version, but do not include claims that would be
+  infringed only as a consequence of further modification of the contributor
+  version. For purposes of this definition, "control" includes the right to
+  grant patent sublicenses in a manner consistent with the requirements of this
+  License.
+  
+  Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+  license under the contributor's essential patent claims, to make, use, sell,
+  offer for sale, import and otherwise run, modify and propagate the contents
+  of its contributor version.
+  
+  In the following three paragraphs, a "patent license" is any express agreement
+  or commitment, however denominated, not to enforce a patent (such as an express
+  permission to practice a patent or covenant not to sue for patent infringement).
+  To "grant" such a patent license to a party means to make such an agreement
+  or commitment not to enforce a patent against the party.
+  
+  If you convey a covered work, knowingly relying on a patent license, and the
+  Corresponding Source of the work is not available for anyone to copy, free
+  of charge and under the terms of this License, through a publicly available
+  network server or other readily accessible means, then you must either (1)
+  cause the Corresponding Source to be so available, or (2) arrange to deprive
+  yourself of the benefit of the patent license for this particular work, or
+  (3) arrange, in a manner consistent with the requirements of this License,
+  to extend the patent license to downstream recipients. "Knowingly relying"
+  means you have actual knowledge that, but for the patent license, your conveying
+  the covered work in a country, or your recipient's use of the covered work
+  in a country, would infringe one or more identifiable patents in that country
+  that you have reason to believe are valid.
+  
+  If, pursuant to or in connection with a single transaction or arrangement,
+  you convey, or propagate by procuring conveyance of, a covered work, and grant
+  a patent license to some of the parties receiving the covered work authorizing
+  them to use, propagate, modify or convey a specific copy of the covered work,
+  then the patent license you grant is automatically extended to all recipients
+  of the covered work and works based on it.
+  
+  A patent license is "discriminatory" if it does not include within the scope
+  of its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+  of one or more of the rights that are specifically granted under this License.
+  You may not convey a covered work if you are a party to an arrangement with
+  a third party that is in the business of distributing software, under which
+  you make payment to the third party based on the extent of your activity of
+  conveying the work, and under which the third party grants, to any of the
+  parties who would receive the covered work from you, a discriminatory patent
+  license (a) in connection with copies of the covered work conveyed by you
+  (or copies made from those copies), or (b) primarily for and in connection
+  with specific products or compilations that contain the covered work, unless
+  you entered into that arrangement, or that patent license was granted, prior
+  to 28 March 2007.
+  
+  Nothing in this License shall be construed as excluding or limiting any implied
+  license or other defenses to infringement that may otherwise be available
+  to you under applicable patent law.
+  
+     12. No Surrender of Others' Freedom.
+  
+  If conditions are imposed on you (whether by court order, agreement or otherwise)
+  that contradict the conditions of this License, they do not excuse you from
+  the conditions of this License. If you cannot convey a covered work so as
+  to satisfy simultaneously your obligations under this License and any other
+  pertinent obligations, then as a consequence you may not convey it at all.
+  For example, if you agree to terms that obligate you to collect a royalty
+  for further conveying from those to whom you convey the Program, the only
+  way you could satisfy both those terms and this License would be to refrain
+  entirely from conveying the Program.
+  
+     13. Use with the GNU Affero General Public License.
+  
+  Notwithstanding any other provision of this License, you have permission to
+  link or combine any covered work with a work licensed under version 3 of the
+  GNU Affero General Public License into a single combined work, and to convey
+  the resulting work. The terms of this License will continue to apply to the
+  part which is the covered work, but the special requirements of the GNU Affero
+  General Public License, section 13, concerning interaction through a network
+  will apply to the combination as such.
+  
+     14. Revised Versions of this License.
+  
+  The Free Software Foundation may publish revised and/or new versions of the
+  GNU General Public License from time to time. Such new versions will be similar
+  in spirit to the present version, but may differ in detail to address new
+  problems or concerns.
+  
+  Each version is given a distinguishing version number. If the Program specifies
+  that a certain numbered version of the GNU General Public License "or any
+  later version" applies to it, you have the option of following the terms and
+  conditions either of that numbered version or of any later version published
+  by the Free Software Foundation. If the Program does not specify a version
+  number of the GNU General Public License, you may choose any version ever
+  published by the Free Software Foundation.
+  
+  If the Program specifies that a proxy can decide which future versions of
+  the GNU General Public License can be used, that proxy's public statement
+  of acceptance of a version permanently authorizes you to choose that version
+  for the Program.
+  
+  Later license versions may give you additional or different permissions. However,
+  no additional obligations are imposed on any author or copyright holder as
+  a result of your choosing to follow a later version.
+  
+     15. Disclaimer of Warranty.
+  
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+  LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+  OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+  EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
+  PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+  CORRECTION.
+  
+     16. Limitation of Liability.
+  
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+  ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM
+  AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+  INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO
+  USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+  INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+  PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+  PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  
+     17. Interpretation of Sections 15 and 16.
+  
+  If the disclaimer of warranty and limitation of liability provided above cannot
+  be given local legal effect according to their terms, reviewing courts shall
+  apply local law that most closely approximates an absolute waiver of all civil
+  liability in connection with the Program, unless a warranty or assumption
+  of liability accompanies a copy of the Program in return for a fee. END OF
+  TERMS AND CONDITIONS
+  
+  How to Apply These Terms to Your New Programs
+  
+  If you develop a new program, and you want it to be of the greatest possible
+  use to the public, the best way to achieve this is to make it free software
+  which everyone can redistribute and change under these terms.
+  
+  To do so, attach the following notices to the program. It is safest to attach
+  them to the start of each source file to most effectively state the exclusion
+  of warranty; and each file should have at least the "copyright" line and a
+  pointer to where the full notice is found.
+  
+  <one line to give the program's name and a brief idea of what it does.>
+  
+  Copyright (C) <year> <name of author>
+  
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU General Public License as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any later
+  version.
+  
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License along with
+  this program. If not, see <https://www.gnu.org/licenses/>.
+  
+  Also add information on how to contact you by electronic and paper mail.
+  
+  If the program does terminal interaction, make it output a short notice like
+  this when it starts in an interactive mode:
+  
+  <program> Copyright (C) <year> <name of author>
+  
+  This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+  
+  This is free software, and you are welcome to redistribute it under certain
+  conditions; type `show c' for details.
+  
+  The hypothetical commands `show w' and `show c' should show the appropriate
+  parts of the General Public License. Of course, your program's commands might
+  be different; for a GUI interface, you would use an "about box".
+  
+  You should also get your employer (if you work as a programmer) or school,
+  if any, to sign a "copyright disclaimer" for the program, if necessary. For
+  more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
+  
+  The GNU General Public License does not permit incorporating your program
+  into proprietary programs. If your program is a subroutine library, you may
+  consider it more useful to permit linking proprietary applications with the
+  library. If this is what you want to do, use the GNU Lesser General Public
+  License instead of this License. But first, please read <https://www.gnu.org/
+  licenses /why-not-lgpl.html>.
+
+</pre>
+
 </body>
 </html>

bin/resources/GameIndex.yaml

@@ -3764,6 +3764,8 @@ SCED-52759:
   region: "PAL-M5"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -3793,6 +3795,8 @@ SCED-52846:
   region: "PAL-E"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -3864,6 +3868,8 @@ SCED-52899:
   region: "PAL-M5"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -5368,6 +5374,8 @@ SCES-52004:
   compat: 5
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -5700,6 +5708,8 @@ SCES-52893:
   region: "PAL-E-GR-R"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -7214,6 +7224,8 @@ SCKA-20048:
   region: "NTSC-K"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -7426,6 +7438,8 @@ SCKA-20078:
   region: "NTSC-K"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -11550,6 +11564,8 @@ SCUS-97402:
   compat: 5
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -11690,6 +11706,8 @@ SCUS-97431:
   region: "NTSC-U"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -11698,6 +11716,8 @@ SCUS-97432:
   region: "NTSC-U"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -12141,6 +12161,8 @@ SCUS-97517:
   region: "NTSC-U"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -13335,6 +13357,8 @@ SLED-52899:
   region: "PAL-M5"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -18467,6 +18491,8 @@ SLES-51981:
   region: "PAL-E"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     roundSprite: 1 # Fixes slight blur.
     halfPixelOffset: 2 # Aligns sun post processing.
@@ -18476,6 +18502,8 @@ SLES-51982:
   region: "PAL-M3"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     roundSprite: 1 # Fixes slight blur.
     halfPixelOffset: 2 # Aligns sun post processing.
@@ -23474,6 +23502,9 @@ SLES-53717:
         // for VU1 to finish, which reduces the advantage of MTVU to basically zero.
         patch=1,EE,D0529074,extended,00000800
         patch=1,EE,20529074,extended,00000000
+  memcardFilters: # Saves from the non-Remix release can be imported.
+    - "SLES-52942"
+    - "SLES-53717"
 SLES-53718:
   name: "The Sims 2"
   name-sort: "Sims 2, The"
@@ -45823,6 +45854,8 @@ SLPM-66151:
   region: "NTSC-J"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.
@@ -65592,6 +65625,8 @@ SLUS-20828:
   compat: 5
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     roundSprite: 1 # Fixes slight blur.
     halfPixelOffset: 2 # Aligns sun post processing.
@@ -68913,6 +68948,9 @@ SLUS-21355:
         // for VU1 to finish, which reduces the advantage of MTVU to basically zero.
         patch=1,EE,D052907C,extended,00000800
         patch=1,EE,2052907C,extended,00000000
+  memcardFilters: # Saves from the non-Remix release can be imported.
+    - "SLUS-21029"
+    - "SLUS-21355"
 SLUS-21356:
   name: "Tom Clancy's Splinter Cell - Double Agent"
   region: "NTSC-U"
@@ -73169,6 +73207,8 @@ TCES-52004:
   region: "PAL-E"
   clampModes:
     vuClampMode: 0 # Resolves I Reg Clamping / performance impact and yellow graphics in certain areas.
+  gameFixes:
+    - IbitHack # Reduces VU recompilation.
   gsHWFixes:
     halfPixelOffset: 4 # Fixes post positioning.
     nativeScaling: 2 # Fixes post effects.

bin/resources/game_controller_db.txt

@@ -1246,6 +1246,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000bc2000000055000001000000,Betop AX1 BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000bc2000006412000011010000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b30,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 030000006b1400000209000011010000,Bigben,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000300e000011010000,Brook Audio Fighting Board PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000310e000011010000,Brook Audio Fighting Board PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000120c0000200e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000120c0000210e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 03000000120c0000f70e000011010000,Brook Universal Fighting Board,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,

cmake/SearchForStuff.cmake

@@ -105,7 +105,7 @@ disable_compiler_warnings_for_target(cubeb)
 disable_compiler_warnings_for_target(speex)
 
 # Find the Qt components that we need.
-find_package(Qt6 6.7.2 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
 
 if(WIN32)
   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
@@ -119,6 +119,12 @@ add_subdirectory(3rdparty/ccc EXCLUDE_FROM_ALL)
 
 # The docking system for the debugger.
 find_package(KDDockWidgets-qt6 REQUIRED)
+# Add an extra include path to work around a broken include directive.
+# TODO: Remove this the next time we update KDDockWidgets.
+get_target_property(KDDOCKWIDGETS_INCLUDE_DIRECTORY KDAB::kddockwidgets INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories(KDAB::kddockwidgets INTERFACE
+	${KDDOCKWIDGETS_INCLUDE_DIRECTORY}/kddockwidgets
+)
 
 # Architecture-specific.
 if(_M_X86)

common/vsprops/LinkPCSX2Deps.props

@@ -4,13 +4,13 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(DepsLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);freetype.lib;libjpeg.lib;libpng16.lib;libwebp.lib;lz4.lib;SDL3.lib;zlib.lib;zstd.lib;kddockwidgets-qt62.lib</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies);freetype.lib;jpeg.lib;libpng16.lib;libwebp.lib;lz4.lib;SDL3.lib;zlib.lib;zstd.lib;kddockwidgets-qt62.lib</AdditionalDependencies>
    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <DepsDLLs Include="$(DepsBinDir)freetype.dll" />
     <DepsDLLs Include="$(DepsBinDir)harfbuzz.dll" />
-    <DepsDLLs Include="$(DepsBinDir)libjpeg.dll" />
+    <DepsDLLs Include="$(DepsBinDir)jpeg62.dll" />
     <DepsDLLs Include="$(DepsBinDir)libpng16.dll" />
     <DepsDLLs Include="$(DepsBinDir)libsharpyuv.dll" />
     <DepsDLLs Include="$(DepsBinDir)libwebp.dll" />

pcsx2-qt/ColorPickerButton.cpp

@@ -29,7 +29,7 @@ void ColorPickerButton::setColor(u32 rgb)
 
 void ColorPickerButton::updateBackgroundColor()
 {
-	setStyleSheet(QStringLiteral("background-color: #%1;").arg(static_cast<uint>(m_color), 8, 16, QChar('0')));
+	setStyleSheet(QStringLiteral("background-color: #%1;").arg(static_cast<uint>(m_color), 6, 16, QChar('0')));
 }
 
 void ColorPickerButton::onClicked()

pcsx2-qt/Debugger/Breakpoints/BreakpointDialog.ui

@@ -212,7 +212,7 @@
          </size>
         </property>
         <property name="text">
-         <string>4</string>
+         <string>1</string>
         </property>
        </widget>
       </item>

pcsx2-qt/Debugger/DebuggerWindow.cpp

@@ -323,6 +323,13 @@ void DebuggerWindow::onVMPaused()
 			CBreakPoints::SetSkipFirst(BREAKPOINT_IOP, r3000Debug.getPC());
 		});
 	}
+
+	// Stops us from telling the disassembly widget to jump somwhere because
+	// breakpoint code paused the core.
+	if (!CBreakPoints::GetCorePaused())
+		emit onVMActuallyPaused();
+	else
+		CBreakPoints::SetCorePaused(false);
 }
 
 void DebuggerWindow::onVMResumed()

pcsx2-qt/Debugger/DebuggerWindow.h

@@ -51,6 +51,11 @@ public slots:
 	void onStepOver();
 	void onStepOut();
 
+Q_SIGNALS:
+	// Only emitted if the pause wasn't a temporary one triggered by the
+	// breakpoint code.
+	void onVMActuallyPaused();
+
 protected:
 	void closeEvent(QCloseEvent* event);
 

pcsx2-qt/Debugger/DisassemblyWidget.cpp

@@ -3,8 +3,9 @@
 
 #include "DisassemblyWidget.h"
 
-#include "Debugger/Breakpoints/BreakpointModel.h"
+#include "Debugger/DebuggerWindow.h"
 #include "Debugger/JsonValueWrapper.h"
+#include "Debugger/Breakpoints/BreakpointModel.h"
 
 #include "DebugTools/DebugInterface.h"
 #include "DebugTools/DisassemblyManager.h"
@@ -35,7 +36,8 @@ DisassemblyWidget::DisassemblyWidget(const DebuggerWidgetParameters& parameters)
 	setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(this, &DisassemblyWidget::customContextMenuRequested, this, &DisassemblyWidget::openContextMenu);
 
-	connect(g_emu_thread, &EmuThread::onVMPaused, this, &DisassemblyWidget::gotoProgramCounterOnPause);
+	connect(g_debugger_window, &DebuggerWindow::onVMActuallyPaused,
+		this, &DisassemblyWidget::gotoProgramCounterOnPause);
 
 	receiveEvent<DebuggerEvents::Refresh>([this](const DebuggerEvents::Refresh& event) -> bool {
 		update();

pcsx2-qt/MainWindow.cpp

@@ -411,7 +411,7 @@ void MainWindow::connectSignals()
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableEEConsoleLogging, "Logging", "EnableEEConsole", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableIOPConsoleLogging, "Logging", "EnableIOPConsole", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableLogWindow, "Logging", "EnableLogWindow", false);
-	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableFileLogging, "Logging", "EnableFileLogging", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableFileLogging, "Logging", "EnableFileLogging", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableLogTimestamps, "Logging", "EnableTimestamps", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionEnableCDVDVerboseReads, "EmuCore", "CdvdVerboseReads", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, m_ui.actionSaveBlockDump, "EmuCore", "CdvdDumpBlocks", false);

pcsx2/CMakeLists.txt

@@ -1282,7 +1282,7 @@ function(setup_main_executable target)
 
 		# Copy dependency libraries.
 		set(DEPS_BINDIR "${CMAKE_SOURCE_DIR}/deps/bin")
-		set(DEPS_TO_COPY freetype.dll harfbuzz.dll libjpeg.dll libpng16.dll libsharpyuv.dll libwebp.dll lz4.dll SDL3.dll shaderc_shared.dll zlib1.dll zstd.dll kddockwidgets-qt62.dll)
+		set(DEPS_TO_COPY freetype.dll harfbuzz.dll jpeg62.dll libpng16.dll libsharpyuv.dll libwebp.dll lz4.dll SDL3.dll shaderc_shared.dll zlib1.dll zstd.dll kddockwidgets-qt62.dll)
 		foreach(DEP_TO_COPY ${DEPS_TO_COPY})
 			install(FILES "${DEPS_BINDIR}/${DEP_TO_COPY}" DESTINATION "${CMAKE_SOURCE_DIR}/bin")
 		endforeach()

pcsx2/GS/Renderers/HW/GSRendererHW.cpp

@@ -504,7 +504,7 @@ void GSRendererHW::ConvertSpriteTextureShuffle(u32& process_rg, u32& process_ba,
 
 				const int width_diff = static_cast<int>(m_env.CTXT[m_env.PRIM.CTXT].TEX0.TBW) - static_cast<int>((m_cached_ctx.FRAME.FBW + 1) >> 1);
 				// We can check the future for a clue as this can be more accurate, be careful of different draws like channel shuffles or single page draws.
-				if (m_env.CTXT[m_env.PRIM.CTXT].TEX0.TBP0 == m_cached_ctx.FRAME.Block() && GSLocalMemory::m_psm[m_env.CTXT[m_env.PRIM.CTXT].TEX0.PSM].bpp == 32 && width_diff >= 0)
+				if (m_env.PRIM.TME && m_env.CTXT[m_env.PRIM.CTXT].TEX0.TBP0 == m_cached_ctx.FRAME.Block() && GSLocalMemory::m_psm[m_env.CTXT[m_env.PRIM.CTXT].TEX0.PSM].bpp == 32 && width_diff >= 0)
 				{
 					// width_diff will be zero is both are BW == 1, so be careful of that.
 					const bool same_width = width_diff > 0 || (m_cached_ctx.FRAME.FBW == 1 && width_diff == 0);

pcsx2/ImGui/FullscreenUI.cpp

@@ -5019,7 +5019,7 @@ void FullscreenUI::DrawAdvancedSettingsPage()
 	DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_TERMINAL, "System Console"),
 		FSUI_CSTR("Writes log messages to the system console (console window/standard output)."), "Logging", "EnableSystemConsole", false);
 	DrawToggleSetting(
-		bsi, FSUI_ICONSTR(ICON_FA_SCROLL, "File Logging"), FSUI_CSTR("Writes log messages to emulog.txt."), "Logging", "EnableFileLogging", false);
+		bsi, FSUI_ICONSTR(ICON_FA_SCROLL, "File Logging"), FSUI_CSTR("Writes log messages to emulog.txt."), "Logging", "EnableFileLogging", true);
 	DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_SCROLL, "Verbose Logging"), FSUI_CSTR("Writes dev log messages to log sinks."), "Logging", "EnableVerbose",
 		false, !IsDevBuild);
 

pcsx2/VMManager.cpp

@@ -474,7 +474,7 @@ void VMManager::UpdateLoggingSettings(SettingsInterface& si)
 
 	const bool system_console_enabled = !s_log_block_system_console && si.GetBoolValue("Logging", "EnableSystemConsole", false);
 	const bool log_window_enabled = !s_log_block_system_console && si.GetBoolValue("Logging", "EnableLogWindow", false);
-	const bool file_logging_enabled = s_log_force_file_log || si.GetBoolValue("Logging", "EnableFileLogging", false);
+	const bool file_logging_enabled = s_log_force_file_log || si.GetBoolValue("Logging", "EnableFileLogging", true);
 
 	if (system_console_enabled != Log::IsConsoleOutputEnabled())
 		Log::SetConsoleOutputLevel(system_console_enabled ? level : LOGLEVEL_NONE);
@@ -518,7 +518,7 @@ void VMManager::UpdateLoggingSettings(SettingsInterface& si)
 void VMManager::SetDefaultLoggingSettings(SettingsInterface& si)
 {
 	si.SetBoolValue("Logging", "EnableSystemConsole", false);
-	si.SetBoolValue("Logging", "EnableFileLogging", false);
+	si.SetBoolValue("Logging", "EnableFileLogging", true);
 	si.SetBoolValue("Logging", "EnableTimestamps", true);
 	si.SetBoolValue("Logging", "EnableVerbose", false);
 	si.SetBoolValue("Logging", "EnableEEConsole", false);

pcsx2/x86/microVU_Analyze.inl

@@ -228,7 +228,7 @@ __fi void mVUanalyzeIALU2(mV, int Is, int It)
 __fi void mVUanalyzeIADDI(mV, int Is, int It, s16 imm)
 {
 	mVUanalyzeIALU2(mVU, Is, It);
-	if (!Is)
+	if (!Is && !EmuConfig.Gamefixes.IbitHack)
 	{
 		setConstReg(It, imm);
 	}

pcsx2/x86/microVU_Compile.inl

@@ -742,12 +742,27 @@ void* mVUcompile(microVU& mVU, u32 startPC, uptr pState)
 			{
 				mVUsetupRange(mVU, xPC, false);
 				if (branch < 2)
-					mVUsetupRange(mVU, xPC + 8, true); // Ideally we'd do +4 but the mmx compare only works in 64bits, this should be fine
+					mVUsetupRange(mVU, xPC + 4, true);
 			}
 		}
 		else
 		{
 			incPC(-1);
+			if (EmuConfig.Gamefixes.IbitHack)
+			{
+				// Ignore IADDI, IADDIU and ISUBU, ILW, ISW, LQ, SQ.
+				// Be warned, this is a little risky as we could be ignoring subtle differences in the operations.
+				// 2 is too much, 1 is too little, so it gets 2. It's a hack anyways...
+				const u32 upper = (mVU.code >> 25);
+				if (upper == 0x1 || upper == 0x0 || upper == 0x4 || upper == 0x5 || upper == 0x8 || upper == 0x9 || (upper == 0x40 && (mVU.code & 0x3F) == 0x32))
+				{
+					incPC(1);
+					mVUsetupRange(mVU, xPC, false);
+					if (branch < 2)
+						mVUsetupRange(mVU, xPC + 2, true);
+					incPC(-1);
+				}
+			}
 			mVUopL(mVU, 0);
 			incPC(1);
 		}

pcsx2/x86/microVU_Lower.inl

@@ -858,17 +858,37 @@ mVUop(mVU_IADDI)
 		if (_Is_ == 0)
 		{
 			const xRegister32& regT = mVU.regAlloc->allocGPR(-1, _It_, mVUlow.backupVI);
-			if (_Imm5_ != 0)
-				xMOV(regT, _Imm5_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm5_ != 0)
+					xMOV(regT, _Imm5_);
+				else
+					xXOR(regT, regT);
+			}
 			else
-				xXOR(regT, regT);
+			{
+				xMOV(regT, ptr32[&curI]);
+				xSHL(regT, 21);
+				xSAR(regT, 27);
+			}
 			mVU.regAlloc->clearNeeded(regT);
 		}
 		else
 		{
 			const xRegister32& regS = mVU.regAlloc->allocGPR(_Is_, _It_, mVUlow.backupVI);
-			if (_Imm5_ != 0)
-				xADD(regS, _Imm5_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm5_ != 0)
+					xADD(regS, _Imm5_);
+			}
+			else
+			{
+				xMOV(gprT1, ptr32[&curI]);
+				xSHL(gprT1, 21);
+				xSAR(gprT1, 27);
+
+				xADD(regS, gprT1);
+			}
 			mVU.regAlloc->clearNeeded(regS);
 		}
 		mVU.profiler.EmitOp(opIADDI);
@@ -884,17 +904,43 @@ mVUop(mVU_IADDIU)
 		if (_Is_ == 0)
 		{
 			const xRegister32& regT = mVU.regAlloc->allocGPR(-1, _It_, mVUlow.backupVI);
-			if (_Imm15_ != 0)
-				xMOV(regT, _Imm15_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm15_ != 0)
+					xMOV(regT, _Imm15_);
+				else
+					xXOR(regT, regT);
+			}
 			else
-				xXOR(regT, regT);
+			{
+				xMOV(regT, ptr32[&curI]);
+				xMOV(gprT1, regT);
+				xSHR(gprT1, 10);
+				xAND(gprT1, 0x7800);
+				xAND(regT, 0x7FF);
+				xOR(regT, gprT1);
+			}
 			mVU.regAlloc->clearNeeded(regT);
 		}
 		else
 		{
 			const xRegister32& regS = mVU.regAlloc->allocGPR(_Is_, _It_, mVUlow.backupVI);
-			if (_Imm15_ != 0)
-				xADD(regS, _Imm15_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm15_ != 0)
+					xADD(regS, _Imm15_);
+			}
+			else
+			{
+				xMOV(gprT1, ptr32[&curI]);
+				xMOV(gprT2, gprT1);
+				xSHR(gprT2, 10);
+				xAND(gprT2, 0x7800);
+				xAND(gprT1, 0x7FF);
+				xOR(gprT1, gprT2);
+
+				xADD(regS, gprT1);
+			}
 			mVU.regAlloc->clearNeeded(regS);
 		}
 		mVU.profiler.EmitOp(opIADDIU);
@@ -964,8 +1010,22 @@ mVUop(mVU_ISUBIU)
 	pass2
 	{
 		const xRegister32& regS = mVU.regAlloc->allocGPR(_Is_, _It_, mVUlow.backupVI);
-		if (_Imm15_ != 0)
-			xSUB(regS, _Imm15_);
+		if (!EmuConfig.Gamefixes.IbitHack)
+		{
+			if (_Imm15_ != 0)
+				xSUB(regS, _Imm15_);
+		}
+		else
+		{
+			xMOV(gprT1, ptr32[&curI]);
+			xMOV(gprT2, gprT1);
+			xSHR(gprT2, 10);
+			xAND(gprT2, 0x7800);
+			xAND(gprT1, 0x7FF);
+			xOR(gprT1, gprT2);
+
+			xSUB(regS, gprT1);
+		}
 		mVU.regAlloc->clearNeeded(regS);
 		mVU.profiler.EmitOp(opISUBIU);
 	}
@@ -1100,12 +1160,23 @@ mVUop(mVU_ILW)
 	pass2
 	{
 		void* ptr = mVU.regs().Mem + offsetSS;
-		std::optional<xAddressVoid> optaddr(mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, offsetSS));
+		std::optional<xAddressVoid> optaddr(EmuConfig.Gamefixes.IbitHack ? std::nullopt : mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, offsetSS));
 		if (!optaddr.has_value())
 		{
 			mVU.regAlloc->moveVIToGPR(gprT1, _Is_);
-			if (_Imm11_ != 0)
-				xADD(gprT1, _Imm11_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm11_ != 0)
+					xADD(gprT1, _Imm11_);
+			}
+			else
+			{
+				xMOV(gprT2, ptr32[&curI]);
+				xSHL(gprT2, 21);
+				xSAR(gprT2, 21);
+
+				xADD(gprT1, gprT2);
+			}
 			mVUaddrFix(mVU, gprT1q);
 		}
 
@@ -1164,12 +1235,23 @@ mVUop(mVU_ISW)
 	}
 	pass2
 	{
-		std::optional<xAddressVoid> optaddr(mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, 0));
+		std::optional<xAddressVoid> optaddr(EmuConfig.Gamefixes.IbitHack ? std::nullopt : mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, 0));
 		if (!optaddr.has_value())
 		{
 			mVU.regAlloc->moveVIToGPR(gprT1, _Is_);
-			if (_Imm11_ != 0)
-				xADD(gprT1, _Imm11_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm11_ != 0)
+					xADD(gprT1, _Imm11_);
+			}
+			else
+			{
+				xMOV(gprT2, ptr32[&curI]);
+				xSHL(gprT2, 21);
+				xSAR(gprT2, 21);
+
+				xADD(gprT1, gprT2);
+			}
 			mVUaddrFix(mVU, gprT1q);
 		}
 
@@ -1251,12 +1333,23 @@ mVUop(mVU_LQ)
 	pass1 { mVUanalyzeLQ(mVU, _Ft_, _Is_, false); }
 	pass2
 	{
-		const std::optional<xAddressVoid> optaddr(mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, 0));
+		const std::optional<xAddressVoid> optaddr(EmuConfig.Gamefixes.IbitHack ? std::nullopt : mVUoptimizeConstantAddr(mVU, _Is_, _Imm11_, 0));
 		if (!optaddr.has_value())
 		{
 			mVU.regAlloc->moveVIToGPR(gprT1, _Is_);
-			if (_Imm11_ != 0)
-				xADD(gprT1, _Imm11_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm11_ != 0)
+					xADD(gprT1, _Imm11_);
+			}
+			else
+			{
+				xMOV(gprT2, ptr32[&curI]);
+				xSHL(gprT2, 21);
+				xSAR(gprT2, 21);
+
+				xADD(gprT1, gprT2);
+			}
 			mVUaddrFix(mVU, gprT1q);
 		}
 
@@ -1345,12 +1438,23 @@ mVUop(mVU_SQ)
 	pass1 { mVUanalyzeSQ(mVU, _Fs_, _It_, false); }
 	pass2
 	{
-		const std::optional<xAddressVoid> optptr(mVUoptimizeConstantAddr(mVU, _It_, _Imm11_, 0));
+		const std::optional<xAddressVoid> optptr(EmuConfig.Gamefixes.IbitHack ? std::nullopt : mVUoptimizeConstantAddr(mVU, _It_, _Imm11_, 0));
 		if (!optptr.has_value())
 		{
 			mVU.regAlloc->moveVIToGPR(gprT1, _It_);
-			if (_Imm11_ != 0)
-				xADD(gprT1, _Imm11_);
+			if (!EmuConfig.Gamefixes.IbitHack)
+			{
+				if (_Imm11_ != 0)
+					xADD(gprT1, _Imm11_);
+			}
+			else
+			{
+				xMOV(gprT2, ptr32[&curI]);
+				xSHL(gprT2, 21);
+				xSAR(gprT2, 21);
+
+				xADD(gprT1, gprT2);
+			}
 			mVUaddrFix(mVU, gprT1q);
 		}