Skip to content

Commit

Permalink
[ffmpeg] add implicit link libs (#42676) (#42677)
Browse files Browse the repository at this point in the history
  • Loading branch information
wikiwang1991 authored Dec 19, 2024
1 parent d18ed2b commit 5a1b13c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions ports/ffmpeg/FindFFMPEG.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ function(append_dependencies out)
cmake_parse_arguments(PARSE_ARGV 1 "arg" "DEBUG" "NAMES" "")
if(${arg_DEBUG})
set(config DEBUG)
set(path "${CURRENT_INSTALLED_DIR}/debug/lib/")
set(path "${SEARCH_PATH}/debug/lib/")
else()
set(config RELEASE)
set(path "${CURRENT_INSTALLED_DIR}/lib/")
set(path "${SEARCH_PATH}/lib/")
endif()
if("${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}" STREQUAL "")
enable_language(CXX)
endif()
set(pass_through
${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}
bcrypt gdi32 mfuuid ole32 oleaut32 psapi secur32 shlwapi strmiids user32 uuid vfw32 ws2_32
advapi32 bcrypt crypt32 gdi32 mfuuid ole32 oleaut32 psapi secur32 shlwapi strmiids user32 uuid vfw32 ws2_32
-pthread -pthreads pthread atomic m
)
cmake_policy(SET CMP0057 NEW)
Expand Down
2 changes: 1 addition & 1 deletion ports/ffmpeg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "7.1",
"port-version": 1,
"port-version": 2,
"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
Original file line number Diff line number Diff line change
Expand Up @@ -2758,7 +2758,7 @@
},
"ffmpeg": {
"baseline": "7.1",
"port-version": 1
"port-version": 2
},
"ffnvcodec": {
"baseline": "12.2.72.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "88c48d9d8743bb6641072c4aa50e1da155c2eb50",
"version": "7.1",
"port-version": 2
},
{
"git-tree": "8bf6bad9b522d47e259a13d9033a825a6abd41a9",
"version": "7.1",
Expand Down

0 comments on commit 5a1b13c

Please sign in to comment.