Просмотр исходного кода

ci: vita's lame does not declare mpg123 dependency, so disable testffmpeg

[sdl-ci-filter *vita*]
Anonymous Maarten 4 недель назад
Родитель
Сommit
80ad29564c
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      .github/workflows/create-test-plan.py
  2. 1 1
      test/CMakeLists.txt

+ 1 - 0
.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",
                 ))

+ 1 - 1
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}")