From bb1053c75f444818f441454bed7c29867b49edf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Wed, 20 Nov 2024 11:20:23 -0500 Subject: [PATCH] Tentative fix for Rocky Linux 9 CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- cmake/dependencies/ffmpeg.cmake | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/cmake/dependencies/ffmpeg.cmake b/cmake/dependencies/ffmpeg.cmake index 0c62868d1..ddb3fbc10 100644 --- a/cmake/dependencies/ffmpeg.cmake +++ b/cmake/dependencies/ffmpeg.cmake @@ -33,17 +33,15 @@ IF(RV_FFMPEG_7) ) ELSEIF(RV_FFMPEG_6) SET(_version - "n6.1.1" + "n6.1.2" ) SET(_download_hash - "6dfc27fcb6da6f653c6ec025c2cd9b00" + "953b858e5be3ab66232bdbb90e42f50d" ) ELSE() - # This shouldn't happen, but it could if there are changes the acceptable - # versions of FFmpeg in ffmpeg.cmake and this section is not - # updated accordingly. - message( FATAL_ERROR "The requested version of FFmpeg is not supported." ) + # This shouldn't happen, but it could if there are changes the acceptable versions of FFmpeg in ffmpeg.cmake and this section is not updated accordingly. + MESSAGE(FATAL_ERROR "The requested version of FFmpeg is not supported.") ENDIF() SET(_download_url @@ -81,7 +79,6 @@ ELSE() ) ENDIF() - IF(RV_FFMPEG_7) IF(RV_TARGET_DARWIN) SET(_ffmpeg_avutil_lib_name @@ -183,10 +180,8 @@ ELSEIF(RV_FFMPEG_6) ) ENDIF() ELSE() - # This shouldn't happen. But it could if there are changes the acceptable - # versions of FFmpeg in ffmpeg.cmake and this section is not - # updated accordingly. - message( FATAL_ERROR "The requested version of FFmpeg is not supported." ) + # This shouldn't happen. But it could if there are changes the acceptable versions of FFmpeg in ffmpeg.cmake and this section is not updated accordingly. + MESSAGE(FATAL_ERROR "The requested version of FFmpeg is not supported.") ENDIF() SET(_ffmpeg_libs