build fixes

[vk] Implement Shader Read Barrier
revert 94e512e4bc
2025-10-04 00:57:48 -07:00 · 2025-10-03 22:00:03 -07:00 · 2025-10-04 05:28:44 +02:00 · 2025-10-03 19:34:01 -07:00
15 changed files with 298 additions and 354 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -147,7 +147,6 @@ if (ENABLE_SDL2)
    option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")
 endif()

-# qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
 option(ENABLE_QT_UPDATE_CHECKER "Enable update checker for the Qt frontend" OFF)
@ -164,12 +163,8 @@ if (MSVC OR ANDROID)
 endif()
 option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})

-# ffmpeg
 option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})
-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" "${PLATFORM_SUN}" "NOT WIN32 AND NOT ANDROID" OFF)
-
-# sirit
-option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${EXT_DEFAULT})
+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)

 cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)

@ -317,6 +312,7 @@ endif()
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
    set(HAS_NCE 1)
    add_compile_definitions(HAS_NCE=1)
+    find_package(oaknut 2.0.1)
 endif()

 if (YUZU_ROOM)
@ -456,6 +452,22 @@ if (YUZU_USE_CPM)
        add_library(zstd::zstd ALIAS libzstd_static)
    endif()

+    # Catch2
+    if (YUZU_TESTS OR DYNARMIC_TESTS)
+        AddJsonPackage(catch2)
+    endif()
+
+    # ENet
+    AddJsonPackage(enet)
+
+    if (enet_ADDED)
+        target_include_directories(enet INTERFACE ${enet_SOURCE_DIR}/include)
+    endif()
+
+    if (NOT TARGET enet::enet)
+        add_library(enet::enet ALIAS enet)
+    endif()
+
    # Opus
    AddJsonPackage(opus)

@ -470,10 +482,31 @@ if (YUZU_USE_CPM)
    if (NOT TARGET Opus::opus)
        add_library(Opus::opus ALIAS opus)
    endif()
+
+    # VulkanUtilityHeaders - pulls in headers and utility libs
+    AddJsonPackage(vulkan-utility-headers)
+
+    # small hack
+    if (NOT VulkanUtilityLibraries_ADDED)
+        find_package(VulkanHeaders 1.3.274 REQUIRED)
+    endif()
+
+    # SPIRV Headers
+    AddJsonPackage(spirv-headers)
+
+    # SPIRV Tools
+    AddJsonPackage(spirv-tools)
+
+    if (SPIRV-Tools_ADDED)
+        add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools-static)
+        target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link)
+    endif()
+
+    # mbedtls
+    AddJsonPackage(mbedtls)
 else()
    # Enforce the search mode of non-required packages for better and shorter failure messages
    find_package(fmt 8 REQUIRED)
-
    if (NOT YUZU_DISABLE_LLVM)
        find_package(LLVM MODULE COMPONENTS Demangle)
    endif()
@ -482,7 +515,7 @@ else()
    find_package(lz4 REQUIRED)
    find_package(RenderDoc MODULE)
    find_package(stb MODULE)
-
+    find_package(enet 1.3 MODULE REQUIRED)
    find_package(Opus 1.3 MODULE REQUIRED)
    find_package(ZLIB 1.2 REQUIRED)
    find_package(zstd 1.5 REQUIRED MODULE)
@ -494,6 +527,29 @@ else()
        find_package(Boost 1.57.0 REQUIRED)
    endif()

+    # OpenBSD does not package mbedtls3 (only 2)
+    if (PLATFORM_OPENBSD)
+        AddJsonPackage(mbedtls)
+    else()
+        find_package(MbedTLS 3 REQUIRED)
+    endif()
+
+    find_package(VulkanUtilityLibraries REQUIRED)
+    find_package(VulkanHeaders 1.3.274 REQUIRED)
+
+    # FreeBSD does not package spirv-headers
+    if (PLATFORM_FREEBSD)
+        AddJsonPackage(spirv-headers)
+    else()
+        find_package(SPIRV-Headers 1.3.274 REQUIRED)
+    endif()
+
+    find_package(SPIRV-Tools MODULE REQUIRED)
+
+    if (YUZU_TESTS)
+        find_package(Catch2 3.0.1 REQUIRED)
+    endif()
+
    if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
        find_package(gamemode 1.7 MODULE)
    endif()
@ -507,6 +563,90 @@ if(NOT TARGET Boost::headers)
    AddJsonPackage(boost_headers)
 endif()

+# DiscordRPC
+if (USE_DISCORD_PRESENCE)
+    if (ARCHITECTURE_arm64)
+        add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN)
+    endif()
+
+    AddJsonPackage(discord-rpc)
+
+    target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include)
+    add_library(DiscordRPC::discord-rpc ALIAS discord-rpc)
+endif()
+
+# SimpleIni
+AddJsonPackage(simpleini)
+
+# Most linux distros don't package cubeb, so enable regardless of cpm settings
+if(ENABLE_CUBEB)
+    AddJsonPackage(cubeb)
+
+    if (cubeb_ADDED)
+        if (NOT MSVC)
+            if (TARGET speex)
+                target_compile_options(speex PRIVATE -Wno-sign-compare)
+            endif()
+
+            set_target_properties(cubeb PROPERTIES COMPILE_OPTIONS "")
+            target_compile_options(cubeb INTERFACE
+                -Wno-implicit-const-int-float-conversion
+                -Wno-shadow
+                -Wno-missing-declarations
+                -Wno-return-type
+                -Wno-uninitialized
+            )
+        else()
+            target_compile_options(cubeb PRIVATE
+                /wd4456
+                /wd4458
+            )
+        endif()
+    endif()
+
+    if (NOT TARGET cubeb::cubeb)
+        add_library(cubeb::cubeb ALIAS cubeb)
+    endif()
+endif()
+
+# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the YUZU_find_package
+if (ENABLE_SDL2)
+    if (YUZU_USE_EXTERNAL_SDL2)
+        message(STATUS "Using SDL2 from externals.")
+        if (NOT WIN32)
+            # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
+            # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
+            # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
+            # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
+            set(SDL_UNUSED_SUBSYSTEMS
+                File Filesystem
+                Locale Power Render)
+            foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
+              string(TOUPPER ${_SUB} _OPT)
+              set(SDL_${_OPT} OFF)
+            endforeach()
+
+            set(HIDAPI ON)
+        endif()
+
+        if (APPLE)
+            set(SDL_FILE ON)
+        endif()
+
+        if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
+            set(SDL_PIPEWIRE OFF) # build errors out with this on
+            AddJsonPackage("sdl2_steamdeck")
+        else()
+            AddJsonPackage("sdl2_generic")
+        endif()
+    elseif (YUZU_USE_BUNDLED_SDL2)
+        message(STATUS "Using bundled SDL2")
+        AddJsonPackage(sdl2)
+    endif()
+
+    find_package(SDL2 2.26.4 REQUIRED)
+endif()
+
 # List of all FFmpeg components required
 set(FFmpeg_COMPONENTS
    avcodec
@ -537,11 +677,6 @@ add_subdirectory(externals)
 # pass targets from externals
 find_package(libusb)
 find_package(VulkanMemoryAllocator)
-find_package(enet)
-find_package(MbedTLS)
-find_package(VulkanUtilityLibraries)
-find_package(SimpleIni)
-find_package(SPIRV-Tools)

 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
    find_package(xbyak)
@ -555,26 +690,6 @@ if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
    find_package(cpp-jwt)
 endif()

-if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
-    find_package(oaknut)
-endif()
-
-if (ENABLE_SDL2)
-    find_package(SDL2)
-endif()
-
-if (USE_DISCORD_PRESENCE)
-    find_package(DiscordRPC)
-endif()
-
-if (ENABLE_CUBEB)
-    find_package(cubeb)
-endif()
-
-if (YUZU_TESTS OR DYNARMIC_TESTS)
-    find_package(Catch2)
-endif()
-
 if (ENABLE_QT)
    if (YUZU_USE_BUNDLED_QT)
        download_qt(6.8.3)
--- a/CMakeModules/CPMUtil.cmake
+++ b/CMakeModules/CPMUtil.cmake
@ -107,6 +107,7 @@ function(AddJsonPackage)
        get_json_element("${object}" name name "${JSON_NAME}")
        get_json_element("${object}" extension extension "tar.zst")
        get_json_element("${object}" min_version min_version "")
+        get_json_element("${object}" cmake_filename cmake_filename "")
        get_json_element("${object}" raw_disabled disabled_platforms "")

        if (raw_disabled)
@ -123,6 +124,7 @@ function(AddJsonPackage)
            EXTENSION ${extension}
            MIN_VERSION ${min_version}
            DISABLED_PLATFORMS ${disabled_platforms}
+            CMAKE_FILENAME ${cmake_filename}
        )

        # pass stuff to parent scope
@ -137,7 +139,6 @@ function(AddJsonPackage)
    endif()

    get_json_element("${object}" hash hash "")
-    get_json_element("${object}" hash_suffix hash_suffix "")
    get_json_element("${object}" sha sha "")
    get_json_element("${object}" url url "")
    get_json_element("${object}" key key "")
@ -207,7 +208,6 @@ function(AddJsonPackage)
        VERSION "${version}"
        URL "${url}"
        HASH "${hash}"
-        HASH_SUFFIX "${hash_suffix}"
        SHA "${sha}"
        REPO "${repo}"
        KEY "${key}"
@ -533,6 +533,7 @@ function(AddCIPackage)
        EXTENSION
        MIN_VERSION
        DISABLED_PLATFORMS
+        CMAKE_FILENAME
    )

    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "" ${ARGN})
@ -588,28 +589,25 @@ function(AddCIPackage)
        add_ci_package(android)
    endif()

-    if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(solaris-amd64)
+    if(PLATFORM_SUN AND NOT "solaris" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(solaris)
    endif()

-    if(PLATFORM_FREEBSD AND NOT "freebsd-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(freebsd-amd64)
+    if(PLATFORM_FREEBSD AND NOT "freebsd" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(freebsd)
    endif()

-    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux-amd64" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(linux-amd64)
+    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux)
    endif()

    if((PLATFORM_LINUX AND ARCHITECTURE_arm64) AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
        add_ci_package(linux-aarch64)
    endif()

-    # TODO(crueter): macOS amd64/aarch64 split mayhaps
-    if (APPLE AND NOT "macos-universal" IN_LIST DISABLED_PLATFORMS)
-        add_ci_package(macos-universal)
-    endif()
-
    if (DEFINED ARTIFACT_DIR)
+        include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake)
+
        set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
        set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE)
    else()
--- a/cpmfile.json
+++ b/cpmfile.json
@ -4,11 +4,8 @@
        "package": "OpenSSL",
        "name": "openssl",
        "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0",
-        "min_version": "1.1.1",
-        "disabled_platforms": [
-            "macos-universal"
-        ]
+        "version": "3.5.3",
+        "min_version": "1.1.1"
    },
    "boost": {
        "package": "Boost",
@ -69,6 +66,20 @@
            "ZSTD_BUILD_SHARED OFF"
        ]
    },
+    "catch2": {
+        "package": "Catch2",
+        "repo": "catchorg/Catch2",
+        "sha": "644821ce28",
+        "hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f",
+        "version": "3.0.1"
+    },
+    "enet": {
+        "repo": "lsalzman/enet",
+        "sha": "2662c0de09",
+        "hash": "3de1beb4fa3d6b1e03eda8dd1e7580694f854af3ed3975dcdabfdcdf76b97f322b9734d35ea7f185855bb490d957842b938b26da4dd2dfded509390f8d2794dd",
+        "version": "1.3",
+        "find_args": "MODULE"
+    },
    "opus": {
        "package": "Opus",
        "repo": "crueter/opus",
@ -80,12 +91,97 @@
            "OPUS_PRESUME_NEON ON"
        ]
    },
+    "vulkan-utility-headers": {
+        "package": "VulkanUtilityLibraries",
+        "repo": "scripts/VulkanUtilityHeaders",
+        "tag": "1.4.326",
+        "artifact": "VulkanUtilityHeaders.tar.zst",
+        "git_host": "git.crueter.xyz",
+        "hash": "5924629755cb1605c4aa4eee20ef7957a9dd8d61e4df548be656d98054f2730c4109693c1bd35811f401f4705d2ccff9fc849be32b0d8480bc3f73541a5e0964"
+    },
+    "spirv-tools": {
+        "package": "SPIRV-Tools",
+        "repo": "KhronosGroup/SPIRV-Tools",
+        "sha": "40eb301f32",
+        "hash": "58d0fb1047d69373cf24c73e6f78c73a72a6cca3b4df1d9f083b9dcc0962745ef154abf3dbe9b3623b835be20c6ec769431cf11733349f45e7568b3525f707aa",
+        "find_args": "MODULE",
+        "options": [
+            "SPIRV_SKIP_EXECUTABLES ON"
+        ]
+    },
+    "spirv-headers": {
+        "package": "SPIRV-Headers",
+        "repo": "KhronosGroup/SPIRV-Headers",
+        "sha": "4e209d3d7e",
+        "hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4",
+        "options": [
+            "SPIRV_WERROR OFF"
+        ]
+    },
+    "mbedtls": {
+        "package": "MbedTLS",
+        "repo": "Mbed-TLS/mbedtls",
+        "tag": "mbedtls-%VERSION%",
+        "hash": "6671fb8fcaa832e5b115dfdce8f78baa6a4aea71f5c89a640583634cdee27aefe3bf4be075744da91f7c3ae5ea4e0c765c8fc3937b5cfd9ea73d87ef496524da",
+        "version": "3",
+        "git_version": "3.6.4",
+        "artifact": "%TAG%.tar.bz2"
+    },
+    "cubeb": {
+        "repo": "mozilla/cubeb",
+        "sha": "fa02160712",
+        "hash": "82d808356752e4064de48c8fecbe7856715ade1e76b53937116bf07129fc1cc5b3de5e4b408de3cd000187ba8dc32ca4109661cb7e0355a52e54bd81b9be1c61",
+        "find_args": "CONFIG",
+        "options": [
+            "USE_SANITIZERS OFF",
+            "BUILD_TESTS OFF",
+            "BUILD_TOOLS OFF",
+            "BUNDLE_SPEEX ON"
+        ]
+    },
    "boost_headers": {
        "repo": "boostorg/headers",
        "sha": "95930ca8f5",
        "hash": "d1dece16f3b209109de02123c537bfe1adf07a62b16c166367e7e5d62e0f7c323bf804c89b3192dd6871bc58a9d879d25a1cc3f7b9da0e497cf266f165816e2a",
        "bundled": true
    },
+    "discord-rpc": {
+        "repo": "eden-emulator/discord-rpc",
+        "sha": "1cf7772bb6",
+        "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97"
+    },
+    "simpleini": {
+        "package": "SimpleIni",
+        "repo": "brofield/simpleini",
+        "sha": "09c21bda1d",
+        "hash": "99779ca9b6e040d36558cadf484f9ffdab5b47bcc8fc72e4d33639d1d60c0ceb4410d335ba445d72a4324e455167fd6769d99b459943aa135bec085dff2d4b7c",
+        "find_args": "MODULE"
+    },
+    "sdl2_generic": {
+        "package": "SDL2",
+        "repo": "libsdl-org/SDL",
+        "sha": "54772f345a",
+        "hash": "2a68a0e01c390043aa9d9df63d8a20a52076c88bb460ac4e0f33194ca7d9bc8fadbbcc04e7506872ac4b6354a73fbc267c036f82200da59465789b87c7d9e3a4",
+        "key": "generic",
+        "bundled": true
+    },
+    "sdl2_steamdeck": {
+        "package": "SDL2",
+        "repo": "libsdl-org/SDL",
+        "sha": "cc016b0046",
+        "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b",
+        "key": "steamdeck",
+        "bundled": true
+    },
+    "sdl2": {
+        "ci": true,
+        "package": "SDL2",
+        "name": "SDL2",
+        "repo": "crueter-ci/SDL2",
+        "version": "2.32.8",
+        "min_version": "2.26.4",
+        "cmake_filename": "sdl2"
+    },
    "llvm-mingw": {
        "repo": "misc/llvm-mingw",
        "git_host": "git.crueter.xyz",
--- a/docs/CPM.md
+++ b/docs/CPM.md
@ -108,9 +108,7 @@ All dependencies must be identifiable in some way for usage in the dependency vi
 URLs:

 - `GIT_URL`
- `REPO` as a Git repository
-  * You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
-  * If `GIT_HOST` is unspecified, defaults to `github.com`
+- `REPO` as a GitHub repository
 - `URL`

 Versions (bundled):
@ -137,11 +135,11 @@ Adds a package that follows crueter's CI repository spec.
  * `windows-amd64`
  * `windows-arm64`
  * `android`
-  * `solaris-amd64`
-  * `freebsd-amd64`
-  * `linux-amd64`
+  * `solaris`
+  * `freebsd`
+  * `linux`
  * `linux-aarch64`
-  * `macos-universal`
+- `CMAKE_FILENAME`: Custom CMake filename, relative to the package root (default `${PACKAGE_ROOT}/${NAME}.cmake`)

 ### AddJsonPackage

@ -157,17 +155,10 @@ The cpmfile is an object of objects, with each sub-object being named according
 If `ci` is `false`:

 - `hash` -> `HASH`
- `hash_suffix` -> `HASH_SUFFIX`
 - `sha` -> `SHA`
- `key` -> `KEY`
 - `tag` -> `TAG`
-  * If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
- `url` -> `URL`
 - `artifact` -> `ARTIFACT`
-  * If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
-  * If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
 - `git_version` -> `GIT_VERSION`
- `git_host` -> `GIT_HOST`
 - `source_subdir` -> `SOURCE_SUBDIR`
 - `bundled` -> `BUNDLED_PACKAGE`
 - `find_args` -> `FIND_PACKAGE_ARGUMENTS`
@ -181,6 +172,7 @@ If `ci` is `true`:
 - `name` -> `NAME`, defaults to the object key
 - `extension` -> `EXTENSION`, defaults to `tar.zst`
 - `min_version` -> `MIN_VERSION`
+- `cmake_filename` -> `CMAKE_FILENAME`
 - `extension` -> `EXTENSION`

 ### Examples
@ -200,8 +192,8 @@ In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discor
    "boost": {
        "package": "Boost",
        "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
-        "artifact": "%TAG%-cmake.7z",
+        "tag": "boost-1.88.0",
+        "artifact": "boost-1.88.0-cmake.7z",
        "hash": "e5b049e5b61964480ca816395f63f95621e66cb9bcf616a8b10e441e0e69f129e22443acb11e77bc1e8170f8e4171b9b7719891efc43699782bfcd4b3a365f01",
        "git_version": "1.88.0",
        "version": "1.57"
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@ -39,144 +39,6 @@ if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
    AddJsonPackage(oaknut)
 endif()

-# enet
-AddJsonPackage(enet)
-
-if (enet_ADDED)
-    target_include_directories(enet INTERFACE ${enet_SOURCE_DIR}/include)
-endif()
-
-if (NOT TARGET enet::enet)
-    add_library(enet::enet ALIAS enet)
-endif()
-
-# mbedtls
-AddJsonPackage(mbedtls)
-
-# VulkanUtilityHeaders - pulls in headers and utility libs
-AddJsonPackage(vulkan-utility-headers)
-
-# small hack
-if (NOT VulkanUtilityLibraries_ADDED)
-    find_package(VulkanHeaders 1.3.274 REQUIRED)
-endif()
-
-# DiscordRPC
-if (USE_DISCORD_PRESENCE)
-    if (ARCHITECTURE_arm64)
-        add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN)
-    endif()
-
-    AddJsonPackage(discord-rpc)
-
-    if (DiscordRPC_ADDED)
-        target_include_directories(discord-rpc INTERFACE ${DiscordRPC_SOURCE_DIR}/include)
-        add_library(DiscordRPC::discord-rpc ALIAS discord-rpc)
-    endif()
-endif()
-
-# SimpleIni
-AddJsonPackage(simpleini)
-
-# Most linux distros don't package cubeb, so enable regardless of cpm settings
-if(ENABLE_CUBEB)
-    AddJsonPackage(cubeb)
-
-    if (cubeb_ADDED)
-        if (NOT MSVC)
-            if (TARGET speex)
-                target_compile_options(speex PRIVATE -Wno-sign-compare)
-            endif()
-
-            set_target_properties(cubeb PROPERTIES COMPILE_OPTIONS "")
-            target_compile_options(cubeb INTERFACE
-                -Wno-implicit-const-int-float-conversion
-                -Wno-shadow
-                -Wno-missing-declarations
-                -Wno-return-type
-                -Wno-uninitialized
-            )
-        else()
-            target_compile_options(cubeb PRIVATE
-                /wd4456
-                /wd4458
-            )
-        endif()
-    endif()
-
-    if (NOT TARGET cubeb::cubeb)
-        add_library(cubeb::cubeb ALIAS cubeb)
-    endif()
-endif()
-
-# find SDL2 exports a bunch of variables that are needed, so its easier to do this outside of the YUZU_find_package
-if (ENABLE_SDL2)
-    if (YUZU_USE_EXTERNAL_SDL2)
-        message(STATUS "Using SDL2 from externals.")
-        if (NOT WIN32)
-            # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
-            # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
-            # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-            # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
-            set(SDL_UNUSED_SUBSYSTEMS
-                File Filesystem
-                Locale Power Render)
-            foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
-              string(TOUPPER ${_SUB} _OPT)
-              set(SDL_${_OPT} OFF)
-            endforeach()
-
-            set(HIDAPI ON)
-        endif()
-
-        if (APPLE)
-            set(SDL_FILE ON)
-        endif()
-
-        if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck")
-            set(SDL_PIPEWIRE OFF) # build errors out with this on
-            AddJsonPackage("sdl2_steamdeck")
-        else()
-            AddJsonPackage("sdl2_generic")
-        endif()
-    elseif (YUZU_USE_BUNDLED_SDL2)
-        message(STATUS "Using bundled SDL2")
-        AddJsonPackage(sdl2)
-    endif()
-
-    find_package(SDL2 2.26.4 REQUIRED)
-endif()
-
-# SPIRV Headers
-# We only need SPIRV-Headers iff spirv-tools is bundled
-if (SPIRV-Tools_FORCE_BUNDLED OR CPMUTIL_FORCE_BUNDLED)
-    set(NEED_SPIRV_HEADERS ON)
-else()
-    find_package(SPIRV-Tools MODULE QUIET)
-    if (NOT SPIRV-Tools_FOUND)
-        set(NEED_SPIRV_HEADERS ON)
-    else()
-        set(NEED_SPIRV_HEADERS OFF)
-    endif()
-endif()
-
-if (NEED_SPIRV_HEADERS)
-    AddJsonPackage(spirv-headers)
-endif()
-
-# SPIRV Tools
-AddJsonPackage(spirv-tools)
-
-if (SPIRV-Tools_ADDED)
-    add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools-static)
-    target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link)
-endif()
-
-# Catch2
-if (YUZU_TESTS OR DYNARMIC_TESTS)
-    AddJsonPackage(catch2)
-endif()
-
 # getopt
 if (MSVC)
    add_subdirectory(getopt)
@ -206,18 +68,15 @@ if (VulkanMemoryAllocator_ADDED)
 endif()

 # Sirit
-if (YUZU_USE_BUNDLED_SIRIT)
-    AddJsonPackage(sirit-ci)
-else()
-    AddJsonPackage(sirit)
-    if(MSVC AND USE_CCACHE AND sirit_ADDED)
-        get_target_property(_opts sirit COMPILE_OPTIONS)
-        list(FILTER _opts EXCLUDE REGEX "/Zi")
-        list(APPEND _opts "/Z7")
-        set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
-    elseif(MSVC AND CXX_CLANG)
-        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
-    endif()
+AddJsonPackage(sirit)
+
+if(MSVC AND USE_CCACHE AND sirit_ADDED)
+    get_target_property(_opts sirit COMPILE_OPTIONS)
+    list(FILTER _opts EXCLUDE REGEX "/Zi")
+    list(APPEND _opts "/Z7")
+    set_target_properties(sirit PROPERTIES COMPILE_OPTIONS "${_opts}")
+elseif(MSVC AND CXX_CLANG)
+    target_compile_options(sirit PRIVATE -Wno-error=unused-command-line-argument)
 endif()

 # httplib
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@ -8,18 +8,12 @@
    },
    "sirit": {
        "repo": "eden-emulator/sirit",
-        "version": "1.0.1",
-        "tag": "v%VERSION%",
-        "artifact": "sirit-source-%VERSION%.tar.zst",
-        "hash_suffix": "sha512sum",
-        "find_args": "CONFIG"
-    },
-    "sirit-ci": {
-        "ci": true,
-        "package": "sirit",
-        "name": "sirit",
-        "repo": "eden-emulator/sirit",
-        "version": "1.0.0"
+        "sha": "db1f1e8ab5",
+        "hash": "73eb3a042848c63a10656545797e85f40d142009dfb7827384548a385e1e28e1ac72f42b25924ce530d58275f8638554281e884d72f9c7aaf4ed08690a414b05",
+        "find_args": "CONFIG",
+        "options": [
+            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
+        ]
    },
    "httplib": {
        "repo": "yhirose/cpp-httplib",
@ -76,107 +70,5 @@
        "sha": "73f3cbb237",
        "hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
        "find_args": "CONFIG"
-    },
-    "mbedtls": {
-        "package": "MbedTLS",
-        "repo": "Mbed-TLS/mbedtls",
-        "tag": "mbedtls-%VERSION%",
-        "hash": "6671fb8fcaa832e5b115dfdce8f78baa6a4aea71f5c89a640583634cdee27aefe3bf4be075744da91f7c3ae5ea4e0c765c8fc3937b5cfd9ea73d87ef496524da",
-        "version": "3",
-        "git_version": "3.6.4",
-        "artifact": "%TAG%.tar.bz2"
-    },
-    "enet": {
-        "repo": "lsalzman/enet",
-        "sha": "2662c0de09",
-        "hash": "3de1beb4fa3d6b1e03eda8dd1e7580694f854af3ed3975dcdabfdcdf76b97f322b9734d35ea7f185855bb490d957842b938b26da4dd2dfded509390f8d2794dd",
-        "version": "1.3",
-        "find_args": "MODULE"
-    },
-    "vulkan-utility-headers": {
-        "package": "VulkanUtilityLibraries",
-        "repo": "scripts/VulkanUtilityHeaders",
-        "tag": "1.4.326",
-        "artifact": "VulkanUtilityHeaders.tar.zst",
-        "git_host": "git.crueter.xyz",
-        "hash": "5924629755cb1605c4aa4eee20ef7957a9dd8d61e4df548be656d98054f2730c4109693c1bd35811f401f4705d2ccff9fc849be32b0d8480bc3f73541a5e0964"
-    },
-        "spirv-tools": {
-        "package": "SPIRV-Tools",
-        "repo": "KhronosGroup/SPIRV-Tools",
-        "sha": "40eb301f32",
-        "hash": "58d0fb1047d69373cf24c73e6f78c73a72a6cca3b4df1d9f083b9dcc0962745ef154abf3dbe9b3623b835be20c6ec769431cf11733349f45e7568b3525f707aa",
-        "find_args": "MODULE",
-        "options": [
-            "SPIRV_SKIP_EXECUTABLES ON"
-        ]
-    },
-    "spirv-headers": {
-        "package": "SPIRV-Headers",
-        "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "4e209d3d7e",
-        "hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4",
-        "options": [
-            "SPIRV_WERROR OFF"
-        ]
-    },
-    "cubeb": {
-        "repo": "mozilla/cubeb",
-        "sha": "fa02160712",
-        "hash": "82d808356752e4064de48c8fecbe7856715ade1e76b53937116bf07129fc1cc5b3de5e4b408de3cd000187ba8dc32ca4109661cb7e0355a52e54bd81b9be1c61",
-        "find_args": "CONFIG",
-        "options": [
-            "USE_SANITIZERS OFF",
-            "BUILD_TESTS OFF",
-            "BUILD_TOOLS OFF",
-            "BUNDLE_SPEEX ON"
-        ]
-    },
-    "discord-rpc": {
-        "package": "DiscordRPC",
-        "repo": "eden-emulator/discord-rpc",
-        "sha": "1cf7772bb6",
-        "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97"
-    },
-    "simpleini": {
-        "package": "SimpleIni",
-        "repo": "brofield/simpleini",
-        "sha": "09c21bda1d",
-        "hash": "99779ca9b6e040d36558cadf484f9ffdab5b47bcc8fc72e4d33639d1d60c0ceb4410d335ba445d72a4324e455167fd6769d99b459943aa135bec085dff2d4b7c",
-        "find_args": "MODULE"
-    },
-    "sdl2_generic": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "54772f345a",
-        "hash": "2a68a0e01c390043aa9d9df63d8a20a52076c88bb460ac4e0f33194ca7d9bc8fadbbcc04e7506872ac4b6354a73fbc267c036f82200da59465789b87c7d9e3a4",
-        "key": "generic",
-        "bundled": true
-    },
-    "sdl2_steamdeck": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "cc016b0046",
-        "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b",
-        "key": "steamdeck",
-        "bundled": true
-    },
-    "sdl2": {
-        "ci": true,
-        "package": "SDL2",
-        "name": "SDL2",
-        "repo": "crueter-ci/SDL2",
-        "version": "2.32.10",
-        "min_version": "2.26.4",
-        "disabled_platforms": [
-            "macos-universal"
-        ]
-    },
-    "catch2": {
-        "package": "Catch2",
-        "repo": "catchorg/Catch2",
-        "sha": "644821ce28",
-        "hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f",
-        "version": "3.0.1"
    }
 }
--- a/externals/ffmpeg/cpmfile.json
+++ b/externals/ffmpeg/cpmfile.json
@ -13,9 +13,8 @@
        "version": "8.0",
        "min_version": "4.1",
 		"disabled_platforms": [
-			"freebsd-amd64",
-			"solaris-amd64",
-            "macos-universal"
+			"freebsd",
+			"solaris"
 		]
    }
 }
--- a/src/common/settings.h
+++ b/src/common/settings.h
@ -320,19 +320,11 @@ struct Values {
                                                                linkage, true, "cpuopt_unsafe_ignore_global_monitor", Category::CpuUnsafe};

    // Renderer
-    SwitchableSetting<RendererBackend, true> renderer_backend{linkage,
-#if defined(__sun__) || defined(__managarm__)
-                                                              RendererBackend::OpenGL,
-#else
-                                                              RendererBackend::Vulkan,
-#endif
+    SwitchableSetting<RendererBackend, true> renderer_backend{
+                                                              linkage, RendererBackend::Vulkan,
                                                              "backend", Category::Renderer};
-    SwitchableSetting<ShaderBackend, true> shader_backend{linkage,
-#if defined(__sun__) || defined(__managarm__)
-                                                          ShaderBackend::Glsl,
-#else
-                                                          ShaderBackend::SpirV,
-#endif
+    SwitchableSetting<ShaderBackend, true> shader_backend{
+                                                          linkage, ShaderBackend::SpirV,
                                                          "shader_backend", Category::Renderer,  Specialization::RuntimeList};
    SwitchableSetting<int> vulkan_device{linkage, 0, "vulkan_device", Category::Renderer,
                                         Specialization::RuntimeList};
--- a/src/qt_common/CMakeLists.txt
+++ b/src/qt_common/CMakeLists.txt
@ -39,7 +39,7 @@ endif()

 add_subdirectory(externals)

-target_link_libraries(qt_common PRIVATE core Qt6::Core SimpleIni::SimpleIni QuaZip::QuaZip)
+target_link_libraries(qt_common PRIVATE core Qt6::Core SimpleIni::SimpleIni QuaZip::QuaZip frozen::frozen)

 if (NOT APPLE AND ENABLE_OPENGL)
    target_compile_definitions(qt_common PUBLIC HAS_OPENGL)
--- a/src/qt_common/externals/CMakeLists.txt
+++ b/src/qt_common/externals/CMakeLists.txt
@ -17,4 +17,4 @@ AddJsonPackage(quazip)

 # frozen
 # TODO(crueter): Qt String Lookup
-# AddJsonPackage(frozen)
+AddJsonPackage(frozen)
--- a/src/shader_recompiler/CMakeLists.txt
+++ b/src/shader_recompiler/CMakeLists.txt
@ -246,7 +246,7 @@ add_library(shader_recompiler STATIC

 )

-target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit SPIRV-Tools::SPIRV-Tools)
+target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit SPIRV-Tools::SPIRV-Tools)

 if (MSVC)
    target_compile_options(shader_recompiler PRIVATE
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@ -333,7 +333,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
 add_dependencies(video_core host_shaders)
 target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})

-target_link_libraries(video_core PRIVATE sirit::sirit)
+target_link_libraries(video_core PRIVATE sirit)

 # Header-only stuff needed by all dependent targets
 target_link_libraries(video_core PUBLIC Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
--- a/src/video_core/engines/maxwell_dma.cpp
+++ b/src/video_core/engines/maxwell_dma.cpp
@ -64,7 +64,6 @@ void MaxwellDMA::Launch() {
    // TODO(Subv): Perform more research and implement all features of this engine.
    const LaunchDMA& launch = regs.launch_dma;
    ASSERT(launch.interrupt_type == LaunchDMA::InterruptType::NONE);
-    ASSERT(launch.data_transfer_type == LaunchDMA::DataTransferType::NON_PIPELINED);

    if (launch.multi_line_enable) {
        const bool is_src_pitch = launch.src_memory_layout == LaunchDMA::MemoryLayout::PITCH;
@ -157,7 +156,7 @@ void MaxwellDMA::Launch() {
 }

 void MaxwellDMA::CopyBlockLinearToPitch() {
-    UNIMPLEMENTED_IF(regs.launch_dma.remap_enable != 0);
+   

    u32 bytes_per_pixel = 1;
    DMA::ImageOperand src_operand;
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@ -397,6 +397,8 @@ if (NOT WIN32)
    target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
 endif()

+target_link_libraries(yuzu PRIVATE Vulkan::Headers)
+
 if (UNIX AND NOT APPLE)
    target_link_libraries(yuzu PRIVATE Qt6::DBus)

--- a/tools/cpm-fetch.sh
+++ b/tools/cpm-fetch.sh
@ -84,7 +84,7 @@ ci_package() {

  echo "-- CI package $PACKAGE"

-  for platform in windows-amd64 windows-arm64 android solaris-amd64 freebsd-amd64 linux-amd64 linux-aarch64 macos-universal; do
+  for platform in windows-amd64 windows-arm64 android solaris freebsd linux linux-aarch64; do
    echo "-- * platform $platform"

    case $DISABLED in
@ -227,7 +227,7 @@ do
      HASH_URL="${DOWNLOAD}.${HASH_SUFFIX}"
    fi

-    HASH=$(curl "$HASH_URL" -sS -L -o -)
+    HASH=$(curl "$HASH_URL" -L -o -)
  fi

  download_package
Author	SHA1	Message	Date
Ribbit	cc28b585e3	build fixes Some checks failed eden-license / license-header (pull_request) Failing after 24s Details	2025-10-04 00:57:48 -07:00
Ribbit	b41f131670	[vk] Implement Shader Read Barrier Some checks failed eden-license / license-header (pull_request) Failing after 25s Details	2025-10-03 22:00:03 -07:00
Ribbit	806c26857f	revert `94e512e4bc` revert [video_core] Fix stutters and freezes when playing FMV content in some games (#2650) This fixes stutters and freezes when playing FMV content in some games. Reviewed-on: #2650 Co-authored-by: MaranBr <maranbr@outlook.com> Co-committed-by: MaranBr <maranbr@outlook.com>	2025-10-04 05:28:44 +02:00
Ribbit	94e512e4bc	[video_core] Fix stutters and freezes when playing FMV content in some games (#2650 ) This fixes stutters and freezes when playing FMV content in some games. Reviewed-on: #2650 Co-authored-by: MaranBr <maranbr@outlook.com> Co-committed-by: MaranBr <maranbr@outlook.com>	2025-10-03 19:34:01 -07:00