From 1aad9fd4e3a8fb858f5ac1bbc28af7fcef39dec2 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Thu, 13 Feb 2025 11:48:41 +0000 Subject: [PATCH] revert f45f339ef9f02610d79890c12844742a4541361e revert deps: update SDL2 and FFmpeg versions Update bundled dependencies to their latest stable versions: - SDL2: 2.28.2 -> 2.30.12 - FFmpeg: 6.0 -> 6.1.2 Also add citron copyright header to FFmpeg CMakeLists.txt --- CMakeLists.txt | 2 +- externals/ffmpeg/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88d58c0ed..b7841c69b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -390,7 +390,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.30.12") + 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() diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 535e2ee02..790f7c8de 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -1,5 +1,4 @@ # SPDX-FileCopyrightText: 2021 yuzu Emulator Project -# SPDX-FileCopyrightText: 2025 citron Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later if (NOT WIN32 AND NOT ANDROID) @@ -255,7 +254,7 @@ elseif(ANDROID) set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) elseif(WIN32) # Use citron FFmpeg binaries - set(FFmpeg_EXT_NAME "ffmpeg-6.1.2") + set(FFmpeg_EXT_NAME "ffmpeg-6.0") set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") set(FFmpeg_FOUND YES)