chore: upstream merge 2509

.editorconfig

@@ -25,3 +25,9 @@ insert_final_newline = false
 indent_size = 4
 indent_style = space
 insert_final_newline = true
+
+[*.{kt,kts}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+max_line_length = 100

.github/workflows/main.yml

@@ -262,7 +262,7 @@ jobs:
             artifact_name: mainline-macOS-playback
             build_config: playback
     name: "macOS ${{ matrix.build_type }}"
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4

.gitmodules

@@ -1,32 +1,26 @@
 [submodule "Externals/Qt"]
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
-	branch = master
 	shallow = true
 [submodule "Externals/mGBA/mgba"]
 	path = Externals/mGBA/mgba
 	url = https://github.com/mgba-emu/mgba.git
-	branch = master
 	shallow = true
 [submodule "Externals/FFmpeg-bin"]
 	path = Externals/FFmpeg-bin
 	url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
-	branch = master
 	shallow = true
 [submodule "libusb"]
 	path = Externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
-	branch = master
 	shallow = true
 [submodule "Externals/spirv_cross/SPIRV-Cross"]
 	path = Externals/spirv_cross/SPIRV-Cross
 	url = https://github.com/KhronosGroup/SPIRV-Cross.git
-	branch = main
 	shallow = true
 [submodule "SDL"]
 	path = Externals/SDL/SDL
 	url = https://github.com/libsdl-org/SDL.git
-	branch = SDL2
 	shallow = true
 [submodule "Externals/zlib-ng/zlib-ng"]
 	path = Externals/zlib-ng/zlib-ng
@@ -35,22 +29,23 @@
 [submodule "Externals/libspng/libspng"]
 	path = Externals/libspng/libspng
 	url = https://github.com/randy408/libspng.git
-	branch = v0.7.2
 	shallow = true
 [submodule "Externals/VulkanMemoryAllocator"]
 	path = Externals/VulkanMemoryAllocator
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	shallow = true
 [submodule "Externals/cubeb/cubeb"]
 	path = Externals/cubeb/cubeb
 	url = https://github.com/mozilla/cubeb.git
-	branch = master
 	shallow = true
 [submodule "Externals/implot/implot"]
 	path = Externals/implot/implot
 	url = https://github.com/epezent/implot.git
+	shallow = true
 [submodule "Externals/gtest"]
 	path = Externals/gtest
 	url = https://github.com/google/googletest.git
+	shallow = true
 [submodule "Externals/corrosion"]
 	path = Externals/corrosion
 	url = https://github.com/corrosion-rs/corrosion.git
@@ -60,39 +55,84 @@
 [submodule "Externals/rcheevos/rcheevos"]
 	path = Externals/rcheevos/rcheevos
 	url = https://github.com/RetroAchievements/rcheevos.git
+	shallow = true
 [submodule "Externals/libadrenotools"]
 	path = Externals/libadrenotools
 	url = https://github.com/bylaws/libadrenotools.git
+	shallow = true
 [submodule "Externals/curl/curl"]
 	path = Externals/curl/curl
 	url = https://github.com/curl/curl.git
+	shallow = true
 [submodule "Externals/fmt/fmt"]
 	path = Externals/fmt/fmt
 	url = https://github.com/fmtlib/fmt.git
+	shallow = true
 [submodule "Externals/lz4/lz4"]
 	path = Externals/lz4/lz4
-	url = https://github.com/lz4/lz4
+	url = https://github.com/lz4/lz4.git
+	shallow = true
 [submodule "Externals/xxhash/xxHash"]
 	path = Externals/xxhash/xxHash
 	url = https://github.com/Cyan4973/xxHash.git
+	shallow = true
 [submodule "Externals/enet/enet"]
 	path = Externals/enet/enet
 	url = https://github.com/lsalzman/enet.git
+	shallow = true
 [submodule "hidapi-src"]
 	path = Externals/hidapi/hidapi-src
-	url = https://github.com/libusb/hidapi
+	url = https://github.com/libusb/hidapi.git
+	shallow = true
 [submodule "Externals/tinygltf/tinygltf"]
 	path = Externals/tinygltf/tinygltf
 	url = https://github.com/syoyo/tinygltf.git
+	shallow = true
 [submodule "Externals/minizip-ng/minizip-ng"]
 	path = Externals/minizip-ng/minizip-ng
-	url = https://github.com/zlib-ng/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git
+	shallow = true
 [submodule "Externals/Vulkan-Headers"]
 	path = Externals/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+	shallow = true
+[submodule "Externals/watcher/watcher"]
+	path = Externals/watcher/watcher
+	url = https://github.com/e-dant/watcher.git
+	shallow = true
 [submodule "Externals/SFML/SFML"]
 	path = Externals/SFML/SFML
 	url = https://github.com/SFML/SFML.git
+	shallow = true
 [submodule "Externals/zstd/zstd"]
 	path = Externals/zstd/zstd
 	url = https://github.com/facebook/zstd.git
+	shallow = true
+[submodule "Externals/miniupnpc/miniupnp"]
+	path = Externals/miniupnpc/miniupnp
+	url = https://github.com/miniupnp/miniupnp.git
+	shallow = true
+[submodule "Externals/glslang/glslang"]
+	path = Externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git
+	shallow = true
+[submodule "Externals/pugixml/pugixml"]
+	path = Externals/pugixml/pugixml
+	url = https://github.com/zeux/pugixml.git
+	shallow = true
+[submodule "Externals/cpp-ipc/cpp-ipc"]
+	path = Externals/cpp-ipc/cpp-ipc
+	url = https://github.com/mutouyun/cpp-ipc.git
+	shallow = true
+[submodule "Externals/cpp-optparse/cpp-optparse"]
+	path = Externals/cpp-optparse/cpp-optparse
+	url = https://github.com/weisslj/cpp-optparse.git
+	shallow = true
+[submodule "Externals/bzip2/bzip2"]
+	path = Externals/bzip2/bzip2
+	url = https://gitlab.com/bzip2/bzip2.git
+	shallow = true
+[submodule "Externals/imgui/imgui"]
+	path = Externals/imgui/imgui
+	url = https://github.com/ocornut/imgui.git
+	shallow = true

AndroidSetup.md

@@ -6,21 +6,29 @@ If you'd like to contribute to the Android project, but do not currently have a
 
 * [Android Studio](https://developer.android.com/studio/)
 
-If you downloaded Android Studio, install it with the default options and open the project located in `dolphin/Source/Android`
+Install Android Studio with the default options if you do not already have it.
 
 ## Setting Up Android Studio
 
-1. Wait for background tasks to complete on the bottom of the window.
-2. Launch the Android SDK Manager by clicking on its icon in Android Studio's main toolbar:
-![Android Studio Package Icon][package-icon]
-3. Install or update the SDK Platform. Choose the API level as defined in the app module's [build.gradle](Source/Android/app/build.gradle#L7) file.
-4. Install a CMake version as defined in the app module's [build.gradle](Source/Android/app/build.gradle#L99) file. The option won't appear until you select `Show Package Details`.
-5. Select `Build Variants` on the left side of the window to choose the build variant and ABI you would like to compile for the `:app` module.
-6. Select the green hammer icon in the main toolbar to build and create the apk in `Source/Android/app/build/outputs/apk`
+1. Open the `Source/Android` project in Android Studio, let any background tasks finish, and Android Studio will automatically download the required SDK components and tooling.
+2. Use the hammer icon or **Build > Assemble 'app' Run Configuration** to compile the `:app` module, then choose **Build > Generate App Bundles or APKs > Generate APKs** to produce the APK in `Source/Android/app/build/outputs/apk`.
+
+## Import the Dolphin code style
+
+The project maintains a custom IntelliJ/Android Studio style file to keep Java and Kotlin formatting consistent.
+
+* Go to **File > Settings > Editor > Code Style** (or **Android Studio > Settings > Editor > Code Style** on macOS).
+* Click the gear icon and choose **Import Scheme**.
+* Select `Source/Android/code-style-java.xml` from the repository.
+* Ensure that Dolphin-Java is selected.
+
+## Format code before opening a pull request
+
+Before committing or submitting a pull request, reformat any Java or Kotlin files you modified:
+
+* Use **Code > Reformat Code** (or press `Ctrl+Alt+L`/`⌥⌘L` on macOS) with the Dolphin code style selected.
+* Re-run formatting after edits to keep spacing, imports, and wrapping consistent with the rest of the project.
 
 ## Compiling from the Command-Line
 
 For command-line users, any task may be executed with `cd Source/Android` followed by `gradlew <task-name>`. In particular, `gradlew assemble` builds debug and release versions of the application (which are placed in `Source/Android/app/build/outputs/apk`).
-
-[package-icon]: https://i.imgur.com/hgmMlsM.png
-[code-style]: https://i.imgur.com/3b3UBhb.png

CMake/DolphinLibraryTools.cmake

@@ -54,7 +54,42 @@ function(dolphin_find_optional_system_library library bundled_path)
   dolphin_optional_system_library(use_system ${library})
   string(TOUPPER ${library} upperlib)
   if(use_system)
-    find_package(${library} ${ARGN})
+    # Try a list of versions
+    # Will be obsoleted if cmake ever fixes https://gitlab.kitware.com/cmake/cmake/-/issues/26477
+    if("DOLPHIN_TRY_VERSIONS" IN_LIST ARGN)
+      list(FIND ARGN DOLPHIN_TRY_VERSIONS versions_idx)
+      list(REMOVE_AT ARGN ${versions_idx})
+      # Extract list of version-like elements from ARGN into version_list
+      set(version_list)
+      while(TRUE)
+        list(LENGTH ARGN len)
+        if(len EQUAL versions_idx)
+          break()
+        endif()
+        LIST(GET ARGN ${versions_idx} ver)
+        if(ver MATCHES "^[0-9]+(\\.[0-9]+)*$")
+          list(APPEND version_list "${ver}")
+          list(REMOVE_AT ARGN ${versions_idx})
+        else()
+          break()
+        endif()
+      endwhile()
+      # Quietly check all the listed versions
+      foreach(version IN LISTS version_list)
+        find_package(${library} ${version} ${ARGN} QUIET)
+        if(${library}_FOUND)
+          break()
+        endif()
+      endforeach()
+      # If none were found, find_package one version loudly so the user sees
+      if(NOT ${library}_FOUND)
+        list(GET version_list 0 first_version)
+        find_package(${library} ${first_version} ${ARGN})
+      endif()
+    else()
+      find_package(${library} ${ARGN})
+    endif()
+
     # Yay for cmake packages being inconsistent
     if(DEFINED ${library}_FOUND)
       set(prefix ${library})

CMake/ScmRevGen.cmake

@@ -33,7 +33,7 @@ endif()
 string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "2506")
+set(DOLPHIN_VERSION_MAJOR "2512")
 set(DOLPHIN_VERSION_MINOR "0")
 set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})