From 41e6cdbe043649336c2cd35d71abb957f33f80d1 Mon Sep 17 00:00:00 2001 From: Mark Reid Date: Fri, 8 Dec 2023 12:17:27 -0800 Subject: [PATCH 1/2] Fix setting RV_FFMPEG_CONFIG_OPTIONS via cmake commandline Signed-off-by: Mark Reid --- cmake/dependencies/ffmpeg.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/dependencies/ffmpeg.cmake b/cmake/dependencies/ffmpeg.cmake index 956f89acc..8e0e0b5fa 100644 --- a/cmake/dependencies/ffmpeg.cmake +++ b/cmake/dependencies/ffmpeg.cmake @@ -231,6 +231,8 @@ IF(NOT RV_FFMPEG_CONFIG_OPTIONS) SET(RV_FFMPEG_CONFIG_OPTIONS "${_disabled_decoders} ${_disabled_encoders} ${_disabled_filters} ${_disabled_parsers} ${_disabled_protocols}" ) +ELSE() + SEPARATE_ARGUMENTS(RV_FFMPEG_CONFIG_OPTIONS) ENDIF() LIST(REMOVE_DUPLICATES RV_FFMPEG_DEPENDS) From 612fc8793376c57d6ae04b94dc4219033f593a95 Mon Sep 17 00:00:00 2001 From: Mark Reid Date: Tue, 9 Jan 2024 14:22:20 -0800 Subject: [PATCH 2/2] Use PKG_CONFIG_PATH env var for configuring ffmpeg Signed-off-by: Mark Reid --- cmake/dependencies/ffmpeg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/ffmpeg.cmake b/cmake/dependencies/ffmpeg.cmake index 8e0e0b5fa..356aa62cd 100644 --- a/cmake/dependencies/ffmpeg.cmake +++ b/cmake/dependencies/ffmpeg.cmake @@ -266,7 +266,7 @@ EXTERNALPROJECT_ADD( SOURCE_DIR ${RV_DEPS_BASE_DIR}/${_target}/src ${RV_FFMPEG_PATCH_COMMAND_STEP} CONFIGURE_COMMAND - ${CMAKE_COMMAND} -E env "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${_ffmpeg_david_cmake_lib_dir_path}/pkgconfig" ${_configure_command} --prefix=${_install_dir} + ${CMAKE_COMMAND} -E env "PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}:${_ffmpeg_david_cmake_lib_dir_path}/pkgconfig" ${_configure_command} --prefix=${_install_dir} ${RV_FFMPEG_COMMON_CONFIG_OPTIONS} ${RV_FFMPEG_CONFIG_OPTIONS} ${RV_FFMPEG_EXTRA_C_OPTIONS} ${RV_FFMPEG_EXTRA_LIBPATH_OPTIONS} ${RV_FFMPEG_EXTERNAL_LIBS} BUILD_COMMAND ${_make_command} -j${_cpu_count} INSTALL_COMMAND ${_make_command} install