diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index a24388aa3c..24a3a7bea9 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -409,7 +409,7 @@ if("openssl" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-openssl") else() set(OPTIONS "${OPTIONS} --disable-openssl") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) string(APPEND OPTIONS " --enable-schannel") elseif(VCPKG_TARGET_IS_OSX) string(APPEND OPTIONS " --enable-securetransport") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index c8f5460768..861822add5 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "5.1.2", - "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." diff --git a/versions/baseline.json b/versions/baseline.json index a31456ca10..dbe99952ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2370,7 +2370,7 @@ }, "ffmpeg": { "baseline": "5.1.2", - "port-version": 1 + "port-version": 2 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index fe2f56fbfc..46fa877ea9 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fc49d75d6cee24655b879b09ee0cd48d8d1b805", + "version": "5.1.2", + "port-version": 2 + }, { "git-tree": "5b241f0d72b16fbf34178d215d17f21e33d356af", "version": "5.1.2",