[ffmpeg] fix cross builds on windows. (#41535)

This commit is contained in:
lemourin 2024-10-15 09:20:50 +02:00 committed by GitHub
parent 98ffd29b9e
commit 2ed7067db9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions

View File

@ -31,7 +31,7 @@ if(NOT z_vcpkg_using_vcpkg_find_ffmpeg)
include(SelectLibraryConfigurations)
if(WIN32)
if(CMAKE_HOST_WIN32)
set(PKG_CONFIG_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/../../../@_HOST_TRIPLET@/tools/pkgconf/pkgconf.exe" CACHE STRING "" FORCE)
endif()

View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "7.0.2",
"port-version": 4,
"port-version": 5,
"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."

View File

@ -2730,7 +2730,7 @@
},
"ffmpeg": {
"baseline": "7.0.2",
"port-version": 4
"port-version": 5
},
"ffnvcodec": {
"baseline": "12.2.72.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d4bc112c6581274674b70429dacd87e5d0715ac4",
"version": "7.0.2",
"port-version": 5
},
{
"git-tree": "5acfbf7401c2c1e3b37db1b2c0cd11de7c3da29e",
"version": "7.0.2",