From 2af5b30983abcc5e6852bed8cfe919cea17037eb Mon Sep 17 00:00:00 2001 From: ikas <65895428+ikas-mc@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:32:25 +0800 Subject: [PATCH] [ffmpeg] Fix UWP build (#52649) --- ports/ffmpeg/portfile.cmake | 1 + ports/ffmpeg/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index a60a52ab18..3da5c61bef 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -635,6 +635,7 @@ endif() if(VCPKG_TARGET_IS_UWP) set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") string(APPEND OPTIONS " --disable-programs") + string(APPEND OPTIONS " --disable-filter=gfxcapture") string(APPEND OPTIONS " --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") string(APPEND OPTIONS " --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib --extra-ldflags=dxguid.lib") endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index f1a26b3eb0..147045671b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "8.1.2", + "port-version": 1, "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 b3898cf0de..12670d1688 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3030,7 +3030,7 @@ }, "ffmpeg": { "baseline": "8.1.2", - "port-version": 0 + "port-version": 1 }, "ffmpeg-bin2c": { "baseline": "8.1.1", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index b3de0200f9..295dc84bf7 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4053ba466199b3534e8fbf78b16cc136aa749855", + "version": "8.1.2", + "port-version": 1 + }, { "git-tree": "30b94bdee9a6a13b7cde083f0965b96aece6c65b", "version": "8.1.2",