From 55dc3f8ec152f2441be8cce113ce47ebb3251bab Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 25 Mar 2025 20:30:33 +1000 Subject: [PATCH] Update external dependency URLs and versions - Change SDL2 bundled version from 2.32.0 to 2.28.2 - Downgrade clang-format version from 18 to 15 - Replace citron-emu.org URLs with GitHub mirror URLs: - Update clang-format download URL to use yuzu-mirror repository - Update package base URL for external dependencies Signed-off-by: Zephyron --- CMakeLists.txt | 6 +++--- CMakeModules/DownloadExternals.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1dbfbd63..55e971504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -447,7 +447,7 @@ if (ENABLE_SDL2) if (CITRON_USE_BUNDLED_SDL2) # Detect toolchain and platform if ((MSVC_VERSION GREATER_EQUAL 1920) AND ARCHITECTURE_x86_64) - set(SDL2_VER "SDL2-2.32.0") + set(SDL2_VER "SDL2-2.28.2") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRON_USE_BUNDLED_SDL2 and provide your own.") endif() @@ -594,7 +594,7 @@ endif() # against all the src files. This should be used before making a pull request. # ======================================================================= -set(CLANG_FORMAT_POSTFIX "-18") +set(CLANG_FORMAT_POSTFIX "-15") find_program(CLANG_FORMAT NAMES clang-format${CLANG_FORMAT_POSTFIX} clang-format @@ -605,7 +605,7 @@ if (NOT CLANG_FORMAT) message(STATUS "Clang format not found! Downloading...") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") file(DOWNLOAD - https://git.citron-emu.org/Citron/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe + https://github.com/yuzu-mirror/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe "${CLANG_FORMAT}" SHOW_PROGRESS STATUS DOWNLOAD_SUCCESS) if (NOT DOWNLOAD_SUCCESS EQUAL 0) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index b3e229256..d237876e6 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -8,7 +8,7 @@ set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR}) function(download_bundled_external remote_path lib_name prefix_var) -set(package_base_url "https://git.citron-emu.org/Citron/") +set(package_base_url "https://github.com/yuzu-mirror/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32)