From 80ad29564c915f9967a2bc8816d8c63eec0e2178 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 21 Aug 2026 02:42:56 +0200 Subject: [PATCH] ci: vita's lame does not declare mpg123 dependency, so disable testffmpeg [sdl-ci-filter *vita*] --- .github/workflows/create-test-plan.py | 1 + test/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-test-plan.py b/.github/workflows/create-test-plan.py index dd0f3c236b..fa83e8464c 100755 --- a/.github/workflows/create-test-plan.py +++ b/.github/workflows/create-test-plan.py @@ -724,6 +724,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool, ctest_args job.cmake_arguments.extend(( f"-DVIDEO_VITA_PIB={ 'true' if spec.vita_gles == VitaGLES.Pib else 'false' }", f"-DVIDEO_VITA_PVR={ 'true' if spec.vita_gles == VitaGLES.Pvr else 'false' }", + "-DCMAKE_DISABLE_FIND_PACKAGE_FFmpeg=TRUE", # https://sourceforge.net/p/lame/bugs/526/ "-DSDL_ARMNEON=ON", "-DSDL_ARMSIMD=ON", )) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 726fea15e8..8688665ab1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -324,7 +324,7 @@ files2headers(icon_png_header icon.png) files2headers(glass_png_header glass.png) set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE) -include("${CMAKE_CURRENT_LIST_DIR}/../cmake/FindFFmpeg.cmake") +find_package(FFmpeg) if(FFmpeg_FOUND) cmake_push_check_state() list(APPEND CMAKE_REQUIRED_INCLUDES "${FFmpeg_AVUTIL_INCLUDE_DIRS}")