Merge branch 'stenzek:master' into master

Author: yeager

.github/workflows/flathub-publish.yml

@@ -8,7 +8,7 @@ jobs:
   linux-appimage-build:
     name: "${{ matrix.name }}"
     runs-on: ubuntu-22.04
-    timeout-minutes: 120
+    timeout-minutes: 240
     strategy:
       matrix:
         include:

.github/workflows/linux-appimage-build.yml

@@ -16,7 +16,7 @@ jobs:
     container:
       image: ghcr.io/duckstation/cross-build-${{ matrix.arch }}:latest
 
-    timeout-minutes: 120
+    timeout-minutes: 240
     steps:
     - uses: actions/checkout@v5
       with:

.github/workflows/linux-cross-appimage-build.yml

@@ -8,7 +8,7 @@ jobs:
   macos-build:
     name: "Universal"
     runs-on: macos-15
-    timeout-minutes: 120
+    timeout-minutes: 240
     steps:
     - uses: actions/checkout@v5
       with:
@@ -60,7 +60,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        export MACOSX_DEPLOYMENT_TARGET=11.0
+        export MACOSX_DEPLOYMENT_TARGET=13.0
         cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_BUILD_TYPE=Release -DENABLE_OPENGL=OFF -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -G Ninja ..
         cmake --build . --parallel
         mv bin/DuckStation.app .

.github/workflows/linux-flatpak-build.yml

@@ -28,17 +28,13 @@ jobs:
   linux-cross-appimage:
     name: 🐧 Linux Cross-Compiled AppImage
     uses: "./.github/workflows/linux-cross-appimage-build.yml"
-  linux-flatpak:
-    name: 📦 Linux Flatpak
-    needs: [linux-appimage, linux-cross-appimage]
-    uses: "./.github/workflows/linux-flatpak-build.yml"
   macos:
     name: 🍎 MacOS
     uses: "./.github/workflows/macos-build.yml"
 
   create-release:
     name: 📤 Create Release
-    needs: [windows, linux-appimage, linux-cross-appimage, linux-flatpak, macos]
+    needs: [windows, linux-appimage, linux-cross-appimage, macos]
     runs-on: ubuntu-22.04
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
     steps:
@@ -71,8 +67,6 @@ jobs:
             ./artifacts/linux-arm64-appimage/DuckStation-Mini-arm64.AppImage
             ./artifacts/linux-armhf-appimage/DuckStation-armhf.AppImage
             ./artifacts/linux-armhf-appimage/DuckStation-Mini-armhf.AppImage
-            ./artifacts/linux-flatpak-x86_64/duckstation-x86_64.flatpak
-            ./artifacts/linux-flatpak-aarch64/duckstation-aarch64.flatpak
             ./artifacts/macos/duckstation-mac-release.zip
 
       - name: Create Rolling Release
@@ -96,6 +90,4 @@ jobs:
             ./artifacts/linux-arm64-appimage/DuckStation-Mini-arm64.AppImage
             ./artifacts/linux-armhf-appimage/DuckStation-armhf.AppImage
             ./artifacts/linux-armhf-appimage/DuckStation-Mini-armhf.AppImage
-            ./artifacts/linux-flatpak-x86_64/duckstation-x86_64.flatpak
-            ./artifacts/linux-flatpak-aarch64/duckstation-aarch64.flatpak
             ./artifacts/macos/duckstation-mac-release.zip

.github/workflows/macos-build.yml

@@ -8,7 +8,7 @@ jobs:
   windows-build:
     name: "${{ matrix.name }}"
     runs-on: windows-2022
-    timeout-minutes: 120
+    timeout-minutes: 240
     strategy:
       matrix:
         include:

.github/workflows/main.yml

@@ -94,7 +94,8 @@ endif()
 
 # Rewrite paths in macros to be relative to the source directory.
 # Helpful for reproducible builds.
-if(COMPILER_CLANG OR COMPILER_CLANG_CL OR COMPILER_GCC)
+if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT CMAKE_GENERATOR MATCHES "Xcode" AND
+   (COMPILER_CLANG OR COMPILER_CLANG_CL OR COMPILER_GCC))
   file(RELATIVE_PATH source_dir_remap "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}")
   string(REGEX REPLACE "\/+$" "" source_dir_remap "${source_dir_remap}")
   set(source_dir_remap_str "\"${CMAKE_SOURCE_DIR}\"=\"${source_dir_remap}\"")

.github/workflows/windows-build.yml

@@ -30,7 +30,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 
 # Bundled dependencies.
-find_package(SDL3 3.2.24 REQUIRED)
+find_package(SDL3 3.2.26 REQUIRED)
 find_package(zstd 1.5.7 REQUIRED)
 find_package(WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config.
 find_package(PNG 1.6.50 REQUIRED)
@@ -66,7 +66,10 @@ set(CMAKE_FIND_ROOT_PATH ${FIND_ROOT_PATH_BACKUP})
 
 # Qt has transitive dependencies on system libs, so do it afterwards.
 if(BUILD_QT_FRONTEND)
-  find_package(Qt6 6.9.3 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
+  # All our builds include Qt, so this is not a problem.
+  set(QT_NO_PRIVATE_MODULE_WARNING ON)
+
+  find_package(Qt6 6.10.0 COMPONENTS Core Gui GuiPrivate Widgets LinguistTools REQUIRED)
 
   # Have to verify it down here, don't want users using unpatched Qt.
   if(NOT Qt6_DIR MATCHES "^${CMAKE_PREFIX_PATH}")
@@ -98,7 +101,7 @@ if(NOT WIN32)
 endif()
 
 if(NOT WIN32)
-  find_package(FFMPEG 7.0.0 COMPONENTS avcodec avformat avutil swresample swscale)
+  find_package(FFMPEG 8.0.0 COMPONENTS avcodec avformat avutil swresample swscale)
   if(NOT FFMPEG_FOUND)
     message(WARNING "FFmpeg not found, using bundled headers.")
   endif()

CMakeLists.txt

@@ -33,7 +33,7 @@ Other features include:
  - Motion adaptive deinterlacing.
  - Adaptive downsampling filter.
  - Screen rotation for vertical or "TATE" shmup games.
- - Post processing shader chains (GLSL and Reshade FX).
+ - Post processing shader chains (GLSL, Reshade FX and Slang Presets).
  - Border overlays/bezels displayed around game content.
  - "Fast boot" for skipping BIOS splash/intro.
  - Save state support, with runahead and rewind.
@@ -94,7 +94,7 @@ Once downloaded and extracted, you can launch the emulator with `duckstation-qt-
 
 ### Linux
 
-DuckStation is provided for x86_64/ARM32/ARM64 Linux in AppImage (recommended) and Flatpak (not recommended) formats.
+DuckStation is provided for x86_64/ARM32/ARM64 Linux in AppImage formats.
 
 #### AppImage
 
@@ -103,21 +103,7 @@ The AppImages require a distribution equivalent to Ubuntu 22.04 or newer to run.
  - Go to https://github.com/stenzek/duckstation/releases/tag/latest, and download `duckstation-x64.AppImage`.
  - Run `chmod a+x` on the downloaded AppImage -- following this step, the AppImage can be run like a typical executable.
 
-#### Flatpak
-
-Due to various Flatpak limitations and Flathub randomly breaking regularly, **the Flatpak package is not recommended**. **We recommend that you use the AppImage instead.**
-
- - Go to https://github.com/stenzek/duckstation/releases/tag/latest, and download `duckstation-x64.flatpak`.
- - Run `flatpak install ./duckstation-x64.flatpak`.
-
-or, if you have FlatHub set up:
- - Run `flatpak install org.duckstation.DuckStation`.
-
-Use `flatpak run org.duckstation.DuckStation` to start, or select `DuckStation` in the launcher of your desktop environment. Follow the Setup Wizard to get started.
-
-**As of 2025/07/26, with the aforementioned issues and a lack of interest from users, the Flatpak package is deprecated. Future updates are not guaranteed.**
-
-To migrate your data from the Flatpak package to the AppImage, you can run the following command:
+If you were previously using the Flatpak package, to migrate your data from the Flatpak to the AppImage, you can run the following command:
 ```bash
 mv ~/.var/app/org.duckstation.DuckStation/config/duckstation ~/.local/share
 ```
@@ -128,7 +114,7 @@ You will need to re-add your game directories after switching to the AppImage.
 
 Universal macOS builds are provided for both x86_64 (Intel) and ARM64 (Apple Silicon).
 
-macOS Big Sur (11.0) is required, as this is also the minimum requirement for Qt.
+macOS Ventura (13.0) is required, as this is also the minimum requirement for Qt.
 
 To download:
  - Go to https://github.com/stenzek/duckstation/releases/tag/latest, and download `duckstation-mac-release.zip`.