Skip to content

[ffmpeg] FindFFMPEG.cmake needs to handle dependencies on libs from the WindowsSDK #38401

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

Closed
petersteneteg wants to merge 2 commits into from
Closed

[ffmpeg] FindFFMPEG.cmake needs to handle dependencies on libs from the WindowsSDK #38401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d0927
[ffmpeg] FindFFMPEG.cmake needs to handle dependencies on libs from t…
petersteneteg Apr 24, 2024
eaa55e3
v db
petersteneteg Jun 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
3 changes: 3 additions & 0 deletions ports/ffmpeg/FindFFMPEG.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function(append_dependencies out)
set(config RELEASE)
set(path "${CURRENT_INSTALLED_DIR}/lib/")
endif()
set(windowsSDKLibs psapi uuid oleaut32 shlwapi gdi32 vfw32 secur32 ws2_32 mfuuid strmiids ole32 user32 bcrypt)
Copy link
Contributor

@dg0yt dg0yt Jun 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set(windowsSDKLibs psapi uuid oleaut32 shlwapi gdi32 vfw32 secur32 ws2_32 mfuuid strmiids ole32 user32 bcrypt)
set(windowsSDKLibs psapi uuid oleaut32 shlwapi gdi32 vfw32 secur32 ws2_32 mfuuid strmiids ole32 user32 bcrypt)
cmake_policy(SET CMP0057 NEW)

for IN_LIST.
(Push/pop/save/restore as you like, but IN_LIST should rarely be a problem.)

foreach(lib_name ${arg_NAMES})
if("${lib_name}" STREQUAL "-pthread")
list(APPEND ${out} "-pthread")
Expand All @@ -63,6 +64,8 @@ function(append_dependencies out)
list(APPEND ${out} "-lstdc++")
elseif("${lib_name}" STREQUAL "atomic")
list(APPEND ${out} "-latomic")
elseif(lib_name IN_LIST windowsSDKLibs)
list(APPEND ${out} "${lib_name}")
else()
# first look in ${path} specifically to ensure we find the right release/debug variant
find_library(FFMPEG_DEPENDENCY_${lib_name}_${config} NAMES "${lib_name}" PATHS "${path}" NO_DEFAULT_PATH)
Expand Down
2 changes: 1 addition & 1 deletion ports/ffmpeg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "6.1.1",
"port-version": 9,
"port-version": 10,
"description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2682,7 +2682,7 @@
},
"ffmpeg": {
"baseline": "6.1.1",
"port-version": 9
"port-version": 10
},
"ffnvcodec": {
"baseline": "12.1.14.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "01b8f7828a63910ba312e7bc075e84c459579148",
"version": "6.1.1",
"port-version": 10
},
{
"git-tree": "0040c226f856a9459758185879970417ad5244d6",
"version": "6.1.1",
Expand Down