diff --git a/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 8a7237fc43421a..4f18873a25ac75 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -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) foreach(lib_name ${arg_NAMES}) if("${lib_name}" STREQUAL "-pthread") list(APPEND ${out} "-pthread") @@ -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) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index dbdfd7c4e2f89e..82610a0a34bc9d 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -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." diff --git a/versions/baseline.json b/versions/baseline.json index 6a4fa26dc6c414..dfe16958621b2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2682,7 +2682,7 @@ }, "ffmpeg": { "baseline": "6.1.1", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "12.1.14.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 67603c7d259489..7f6cec2b4d5eb1 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01b8f7828a63910ba312e7bc075e84c459579148", + "version": "6.1.1", + "port-version": 10 + }, { "git-tree": "0040c226f856a9459758185879970417ad5244d6", "version": "6.1.1",