aboutsummaryrefslogtreecommitdiff
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorcrueter <crueter@eden-emu.dev>2026-01-14 19:29:13 +0100
committercrueter <crueter@eden-emu.dev>2026-01-14 19:29:13 +0100
commit89f72d286a85504ccf997bb8124e32d1f76d6c81 (patch)
treee71d20665bb7dd75c855d5caa2ee304d970f3215 /externals/ffmpeg
parentecd01e13fd13b39bff0f2c7c7bc2387c3a2157f4 (diff)
[cmake, tools] update CPMUtil and add support for CPMUtil bundled Qt, module updates, cleanups (#3289)
Support for bundled Qt, not through aqtinstall but rather my CI. Multimedia is implemented too, works on both Windows and Linux, though we don't actually use it so it doesn't really matter. Contains Declarative and all that so the Quick frontend will work once it becomes a thing. Some options have changed, notably w.r.t LTO and faster linker, which are now handled directly in the modules. CPMUtil also has support for custom dirs (`PackageName_CUSTOM_DIR`) now. Probably most useful for adding external fragment shaders and whatnot. Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3289
Diffstat (limited to 'externals/ffmpeg')
-rw-r--r--externals/ffmpeg/CMakeLists.txt2
-rw-r--r--externals/ffmpeg/cpmfile.json16
2 files changed, 0 insertions, 18 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 14438f1229..3140f8e545 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -4,8 +4,6 @@
# SPDX-FileCopyrightText: 2021 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
-include(CPMUtil)
-
# TODO(crueter, MaranBr): Externals FFmpeg 8.0
set(FFmpeg_HWACCEL_LIBRARIES)
diff --git a/externals/ffmpeg/cpmfile.json b/externals/ffmpeg/cpmfile.json
deleted file mode 100644
index 405d060411..0000000000
--- a/externals/ffmpeg/cpmfile.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "ffmpeg": {
- "repo": "FFmpeg/FFmpeg",
- "sha": "5e56937b74",
- "hash": "9ab0457dcd6ce6359b5053c1662f57910d332f68ca0cca9d4134d858464840917027374de3d97e0863c3a7daaea2fe4f4cd17d1c6d8e7f740f4ad91e71c2932b",
- "bundled": true
- },
- "ffmpeg-ci": {
- "ci": true,
- "package": "FFmpeg",
- "name": "ffmpeg",
- "repo": "crueter-ci/FFmpeg",
- "version": "8.0.1-5e56937b74",
- "min_version": "4.1"
- }
-}