chore: upstream merge to 2409

.github/workflows/main.yml

@@ -51,10 +51,10 @@ jobs:
         include:
           - build_type: Netplay
             artifact_name: mainline-windows-netplay
-            build_config: -G "Ninja" -DCMAKE_BUILD_TYPE="Release" -DSLIPPI_PLAYBACK=false
+            build_config: -DCMAKE_BUILD_TYPE="Release" -DSLIPPI_PLAYBACK=false
           - build_type: Playback
             artifact_name: mainline-windows-playback
-            build_config: -G "Ninja" -DCMAKE_BUILD_TYPE="Release" -DSLIPPI_PLAYBACK=true
+            build_config: -DCMAKE_BUILD_TYPE="Release" -DSLIPPI_PLAYBACK=true
     name: "Windows ${{ matrix.build_type }}"
     runs-on: windows-2022
     steps:
@@ -260,7 +260,7 @@ jobs:
             artifact_name: mainline-macOS-playback
             build_config: playback
     name: "macOS ${{ matrix.build_type }}"
-    runs-on: macos-13
+    runs-on: macos-12
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4

.gitignore

@@ -6,6 +6,8 @@ Thumbs.db
 Externals/mGBA/version.c
 Source/Core/Common/scmrev.h
 # Ignore files output by build
+/cmake-build-debug
+/cmake-build-release
 /[Bb]uild*/
 /out/
 /[Bb]inary*/
@@ -39,7 +41,7 @@ CMakeLists.txt.user
 # Ignore kdevelop files/dirs
 *.kdev4
 # Ignore IDEA/Clion files/dirs
-/.idea/
+.idea/
 # Ignore Visual Studio Code's working dir
 /.vscode/
 

.gitmodules

@@ -81,3 +81,12 @@
 [submodule "hidapi-src"]
 	path = Externals/hidapi/hidapi-src
 	url = https://github.com/libusb/hidapi
+[submodule "Externals/tinygltf/tinygltf"]
+	path = Externals/tinygltf/tinygltf
+	url = https://github.com/syoyo/tinygltf.git
+[submodule "Externals/minizip-ng/minizip-ng"]
+	path = Externals/minizip-ng/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng
+[submodule "Externals/Vulkan-Headers"]
+	path = Externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:delroth:p:dolphin-emu:r:emulator]
+[o:dolphinemu:p:dolphin-emu:r:emulator]
 file_filter = Languages/po/<lang>.po
 source_file = Languages/po/dolphin-emu.pot
 source_lang = en-US

BuildMacOSUniversalBinary.py

@@ -59,8 +59,6 @@
     # running corrupted binaries and allows for access to the extended
     # permisions needed for ARM builds
     "codesign_identity":  "-",
-    # Entitlements file to use for code signing
-    "entitlements": "../Source/Core/DolphinQt/DolphinEmu.entitlements",
 
     # Minimum macOS version for each architecture slice
     "arm64_mac_os_deployment_target":  "11.0.0",
@@ -72,9 +70,6 @@
 
     "run_unit_tests": False,
 
-    # Whether we should make a build for Steam.
-    "steam": False,
-
     # Whether our autoupdate functionality is enabled or not.
     "autoupdate": True,
 
@@ -119,20 +114,9 @@ def parse_args(conf=DEFAULT_CONFIG):
         help="Directory where universal binary will be stored",
         default=conf["dst_app"])
 
-    parser.add_argument(
-        "--entitlements",
-        help="Path to .entitlements file for code signing",
-        default=conf["entitlements"])
-
     parser.add_argument("--run_unit_tests", action="store_true",
                         default=conf["run_unit_tests"])
 
-    parser.add_argument(
-        "--steam",
-        help="Create a build for Steam",
-        action="store_true",
-        default=conf["steam"])
-
     parser.add_argument(
         "--autoupdate",
         help="Enables our autoupdate functionality",
@@ -317,14 +301,18 @@ def build(config):
                 + config[arch+"_mac_os_deployment_target"],
                 "-DMACOS_CODE_SIGNING_IDENTITY="
                 + config["codesign_identity"],
-                "-DMACOS_CODE_SIGNING_IDENTITY_UPDATER="
-                + config["codesign_identity"],
                 '-DMACOS_CODE_SIGNING="ON"',
-                "-DSTEAM="
-                + python_to_cmake_bool(config["steam"]),
                 "-DENABLE_AUTOUPDATE="
                 + python_to_cmake_bool(config["autoupdate"]),
-                '-DDISTRIBUTOR=' + config['distributor']
+                '-DDISTRIBUTOR=' + config['distributor'],
+                # Always use libraries from Externals to prevent any libraries
+                # installed by Homebrew from leaking in to the app
+                "-DUSE_SYSTEM_LIBS=OFF",
+                # However, we should still use the macOS provided versions of
+                # iconv, bzip2, and curl
+                "-DUSE_SYSTEM_ICONV=ON",
+                "-DUSE_SYSTEM_BZIP2=ON",
+                "-DUSE_SYSTEM_CURL=ON"
             ],
             env=env, cwd=arch)
 
@@ -346,21 +334,21 @@ def build(config):
     src_app1 = ARCHITECTURES[1]+"/Binaries/"
 
     recursive_merge_binaries(src_app0, src_app1, dst_app)
-    for path in glob.glob(dst_app+"/*"):
-        if os.path.isdir(path) and os.path.splitext(path)[1] != ".app":
-            continue
-
+
+    if config["autoupdate"]:
         subprocess.check_call([
-            "codesign",
-            "-d",
-            "--force",
-            "-s",
+            "../Tools/mac-codesign.sh",
+            "-t",
+            "-e", "preserve",
             config["codesign_identity"],
-            "--options=runtime",
-            "--entitlements", config["entitlements"],
-            "--deep",
-            "--verbose=2",
-            path])
+            dst_app+"/Dolphin.app/Contents/Helpers/Dolphin Updater.app"])
+
+    subprocess.check_call([
+        "../Tools/mac-codesign.sh",
+        "-t",
+        "-e", "preserve",
+        config["codesign_identity"],
+        dst_app+"/Dolphin.app"])
 
     print("Built Universal Binary successfully!")
 

CMake/CCache.cmake

@@ -1,10 +1,17 @@
 find_program(CCACHE_BIN NAMES ccache sccache)
 if(CCACHE_BIN)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_BIN})
+    # Official ccache recommendation is to set CMAKE_C(XX)_COMPILER_LAUNCHER
+    if (NOT CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
+        list(INSERT CMAKE_C_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+    endif()
+
+    if (NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
+        list(INSERT CMAKE_CXX_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+    endif()
 
     # ccache uses -I when compiling without preprocessor, which makes clang complain.
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
         set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
     endif()
 endif()

CMake/DolphinDisableWarningsMSVC.cmake

@@ -1,18 +1,20 @@
 include(RemoveCompileFlag)
 
-macro(dolphin_disable_warnings_msvc _target)
+macro(dolphin_disable_warnings _target)
+  get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
+  if (_target_cxx_flags)
+    set(new_flags "")
+    foreach(flag IN LISTS _target_cxx_flags)
+      # all warning flags start with "/W" or "/w" or "-W" or "-w"
+      if (NOT "${flag}" MATCHES "^[-/][Ww]")
+        list(APPEND new_flags "${flag}")
+      endif()
+    endforeach()
+    set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${new_flags}")
+  endif()
   if (MSVC)
-    get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
-    if (_target_cxx_flags)
-      set(new_flags "")
-      foreach(flag IN LISTS _target_cxx_flags)
-        # all warning flags start with "/W" or "/w" or "-W" or "-w"
-        if (NOT "${flag}" MATCHES "^[-/][Ww]")
-          list(APPEND new_flags "${flag}")
-        endif()
-      endforeach()
-      set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${new_flags}")
-    endif()
     target_compile_options(${_target} PRIVATE "/W0")
+  elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    target_compile_options(${_target} PRIVATE "-w")
   endif()
 endmacro()

CMake/DolphinLibraryTools.cmake

@@ -79,7 +79,7 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun
   dolphin_optional_system_library(${library})
   string(TOUPPER ${library} upperlib)
   if(RESOLVED_USE_SYSTEM_${upperlib})
-    pkg_check_modules(${library} ${search} ${ARGN} IMPORTED_TARGET)
+    pkg_search_module(${library} ${search} ${ARGN} IMPORTED_TARGET)
     if((NOT ${library}_FOUND) AND (NOT ${RESOLVED_USE_SYSTEM_${upperlib}} STREQUAL "AUTO"))
       message(FATAL_ERROR "No system ${library} was found.  Please install it or set USE_SYSTEM_${upperlib} to AUTO or OFF.")
     endif()

CMake/DolphinPostprocessBundle.cmake

@@ -14,14 +14,13 @@ if(CMAKE_GENERATOR)
 	set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
 	function(dolphin_postprocess_bundle target)
 		add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -DDOLPHIN_BUNDLE_PATH="$<TARGET_FILE_DIR:${target}>/../.."
+			COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
 				-P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
 		)
 	endfunction()
 	return()
 endif()
 
-get_filename_component(DOLPHIN_BUNDLE_PATH "${DOLPHIN_BUNDLE_PATH}" ABSOLUTE)
 message(STATUS "Fixing up application bundle: ${DOLPHIN_BUNDLE_PATH}")
 
 # Make sure to fix up any additional shared libraries (like plugins) that are

CMake/ScmRevGen.cmake

@@ -18,36 +18,53 @@ if(GIT_FOUND)
   execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
       OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
       OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # defines DOLPHIN_WC_COMMITS_AHEAD_MASTER
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^master
+      OUTPUT_VARIABLE DOLPHIN_WC_COMMITS_AHEAD_MASTER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # defines DOLPHIN_WC_TAG
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --exact-match HEAD
+    OUTPUT_VARIABLE DOLPHIN_WC_TAG
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET)
 endif()
 
 # version number
-set(DOLPHIN_VERSION_MAJOR "5")
+set(DOLPHIN_VERSION_MAJOR "2409")
 set(DOLPHIN_VERSION_MINOR "0")
-if(DOLPHIN_WC_BRANCH STREQUAL "stable")
-  set(DOLPHIN_VERSION_PATCH "0")
-else()
-  set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
-endif()
+set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
 
 # If Dolphin is not built from a Git repository, default the version info to
 # reasonable values.
 if(NOT DOLPHIN_WC_REVISION)
   set(DOLPHIN_WC_DESCRIBE "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}")
   set(DOLPHIN_WC_REVISION "${DOLPHIN_WC_DESCRIBE} (no further info)")
   set(DOLPHIN_WC_BRANCH "master")
+  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
 endif()
 
-if(DOLPHIN_WC_BRANCH STREQUAL "master" OR DOLPHIN_WC_BRANCH STREQUAL "stable")
-  set(DOLPHIN_WC_IS_STABLE "1")
-else()
-  set(DOLPHIN_WC_IS_STABLE "0")
+# If this is a tag (i.e. a release), then set the current patch version and
+# the number of commits ahead to zero.
+if(DOLPHIN_WC_TAG)
+  set(DOLPHIN_VERSION_PATCH "0")
+  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
 endif()
 
-configure_file(
-  "${PROJECT_SOURCE_DIR}/Source/Core/Common/scmrev.h.in"
-  "${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h.tmp"
-)
+function(configure_source_file path)
+  configure_file(
+    "${PROJECT_SOURCE_DIR}/${path}.in"
+    "${PROJECT_BINARY_DIR}/${path}.tmp"
+  )
+
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_BINARY_DIR}/${path}.tmp" "${PROJECT_BINARY_DIR}/${path}")
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h.tmp" "${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h")
+  file(REMOVE "${PROJECT_BINARY_DIR}/${path}.tmp")
+endfunction()
 
-file(REMOVE "${PROJECT_BINARY_DIR}/Source/Core/Common/scmrev.h.tmp")
+configure_source_file("Source/Core/Common/scmrev.h")
+
+if(APPLE)
+  configure_source_file("Source/Core/DolphinQt/Info.plist")
+  configure_source_file("Source/Core/MacUpdater/Info.plist")
+endif()