[ffmpeg] Enable fdk on arm or uwp. (#18659)

This commit is contained in:
Matthew Oliver 2021-07-16 09:39:25 +10:00 committed by GitHub
parent 7a4e5af20a
commit ee66b89059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 16 deletions

View File

@ -31,12 +31,6 @@ if("dav1d" IN_LIST FEATURES)
endif()
endif()
if("fdk-aac" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'fdk-aac' does not support 'uwp | arm'")
endif()
endif()
if("fontconfig" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'")

View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "4.4",
"port-version": 7,
"port-version": 8,
"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."
@ -222,17 +222,10 @@
"default-features": false,
"features": [
"all-gpl",
"fdk-aac",
"nonfree",
"openssl"
]
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fdk-aac"
],
"platform": "!arm & !uwp"
}
]
},

View File

@ -1986,7 +1986,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 7
"port-version": 8
},
"ffnvcodec": {
"baseline": "10.0.26.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b",
"version": "4.4",
"port-version": 8
},
{
"git-tree": "efdbc20f5003313df2fde681a28ab8718455495f",
"version": "4.4",