From 2ed7067db9e6bade44f261c32122c31f1438a00e Mon Sep 17 00:00:00 2001 From: lemourin Date: Tue, 15 Oct 2024 09:20:50 +0200 Subject: [PATCH] [ffmpeg] fix cross builds on windows. (#41535) --- ports/ffmpeg/vcpkg-cmake-wrapper.cmake | 2 +- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake index eaa4f359af..7271f13876 100644 --- a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake +++ b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -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() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index de583231f4..4a32b7c8c1 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -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." diff --git a/versions/baseline.json b/versions/baseline.json index 8a4952a7fa..cf7a7e0f84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2730,7 +2730,7 @@ }, "ffmpeg": { "baseline": "7.0.2", - "port-version": 4 + "port-version": 5 }, "ffnvcodec": { "baseline": "12.2.72.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index b3bb62a508..efe1fd13a1 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4bc112c6581274674b70429dacd87e5d0715ac4", + "version": "7.0.2", + "port-version": 5 + }, { "git-tree": "5acfbf7401c2c1e3b37db1b2c0cd11de7c3da29e", "version": "7.0.2",