Skip to content

Commit 2ace247

Browse files
Update to FFmpeg n6.1.2 to fix an issue with Rocky Linux 9 and vulkan (#633)
### Fix FFMPEG build error in Rocky Linux 9 CI ### Linked issues n/a ### Summarize your change. Updated FFmpeg to version n6.1.2 to fix the issue. ### Describe the reason for the change. Rocky Linux 9 CI is failing. ### Describe what you have tested and on which operating system. - [x] Rocky Linux 9 Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent faeef40 commit 2ace247

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

cmake/dependencies/ffmpeg.cmake

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ IF(RV_FFMPEG_7)
3333
)
3434
ELSEIF(RV_FFMPEG_6)
3535
SET(_version
36-
"n6.1.1"
36+
"n6.1.2"
3737
)
3838

3939
SET(_download_hash
40-
"6dfc27fcb6da6f653c6ec025c2cd9b00"
40+
"953b858e5be3ab66232bdbb90e42f50d"
4141
)
4242
ELSE()
43-
# This shouldn't happen, but it could if there are changes the acceptable
44-
# versions of FFmpeg in ffmpeg.cmake and this section is not
45-
# updated accordingly.
46-
message( FATAL_ERROR "The requested version of FFmpeg is not supported." )
43+
# 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.
44+
MESSAGE(FATAL_ERROR "The requested version of FFmpeg is not supported.")
4745
ENDIF()
4846

4947
SET(_download_url
@@ -81,7 +79,6 @@ ELSE()
8179
)
8280
ENDIF()
8381

84-
8582
IF(RV_FFMPEG_7)
8683
IF(RV_TARGET_DARWIN)
8784
SET(_ffmpeg_avutil_lib_name
@@ -183,10 +180,8 @@ ELSEIF(RV_FFMPEG_6)
183180
)
184181
ENDIF()
185182
ELSE()
186-
# This shouldn't happen. But it could if there are changes the acceptable
187-
# versions of FFmpeg in ffmpeg.cmake and this section is not
188-
# updated accordingly.
189-
message( FATAL_ERROR "The requested version of FFmpeg is not supported." )
183+
# 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.
184+
MESSAGE(FATAL_ERROR "The requested version of FFmpeg is not supported.")
190185
ENDIF()
191186

192187
SET(_ffmpeg_libs

0 commit comments

Comments
 (0)