ffmpeg: don't request schannel on uwp. (#29337)

schannel is not available on uwp.
This commit is contained in:
Paweł Wegner 2023-02-06 19:15:24 +01:00 committed by GitHub
parent a0c74da208
commit 11fbf278cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions

View File

@ -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")

View File

@ -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."

View File

@ -2370,7 +2370,7 @@
},
"ffmpeg": {
"baseline": "5.1.2",
"port-version": 1
"port-version": 2
},
"ffnvcodec": {
"baseline": "11.1.5.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7fc49d75d6cee24655b879b09ee0cd48d8d1b805",
"version": "5.1.2",
"port-version": 2
},
{
"git-tree": "5b241f0d72b16fbf34178d215d17f21e33d356af",
"version": "5.1.2",