Skip to content

Update to FFmpeg n6.1.2 to fix an issue with Rocky Linux 9 and vulkan #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cedrik-fuoco-adsk merged 2 commits into from
Nov 20, 2024
Merged

Update to FFmpeg n6.1.2 to fix an issue with Rocky Linux 9 and vulkan #633

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb1053c
Tentative fix for Rocky Linux 9 CI
cedrik-fuoco-adsk Nov 20, 2024
ae0dad0
Merge branch 'main' into ci-fix-issue-ffmpeg-rocky9
cedrik-fuoco-adsk Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions cmake/dependencies/ffmpeg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -81,7 +79,6 @@ ELSE()
)
ENDIF()


IF(RV_FFMPEG_7)
IF(RV_TARGET_DARWIN)
SET(_ffmpeg_avutil_lib_name
Expand Down Expand Up @@ -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
Expand Down