From 9b97d48573f7026241f45f15547335cbc11137f3 Mon Sep 17 00:00:00 2001 From: Yann Salmon Date: Fri, 22 Nov 2024 21:43:57 +0100 Subject: [PATCH] cmake: Fix regexp to detect installed FFmpeg version The regexp was not tolerating a + sign is the version string, causing configuration to fail on Ubuntu 24.04 when the installed version is 6.1.1-3ubuntu5+esm2. --- cmake/finders/FindFFmpeg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/finders/FindFFmpeg.cmake b/cmake/finders/FindFFmpeg.cmake index c91dba0e4c09f8..d5200ced887e80 100644 --- a/cmake/finders/FindFFmpeg.cmake +++ b/cmake/finders/FindFFmpeg.cmake @@ -295,7 +295,7 @@ if(EXISTS "${FFmpeg_avutil_INCLUDE_DIR}/libavutil/ffversion.h") STRINGS "${FFmpeg_avutil_INCLUDE_DIR}/libavutil/ffversion.h" _version_string - REGEX "^.*FFMPEG_VERSION[ \t]+\"n?[0-9a-z\\~.-]+\"[ \t]*$" + REGEX "^.*FFMPEG_VERSION[ \t]+\"n?[0-9a-z\\~+.-]+\"[ \t]*$" ) string(REGEX REPLACE ".*FFMPEG_VERSION[ \t]+\"n?([0-9]+\\.[0-9]).*\".*" "\\1" FFmpeg_VERSION "${_version_string}") endif()