diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2021-07-16 09:39:25 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:39:25 -0700 |
| commit | ee66b890593983968d77688b90d4f287549b4f7b (patch) | |
| tree | 7d3bca17aa96dd0d6945772ae0a0d627ee58a392 | |
| parent | 7a4e5af20a71d32cb2725f12ce50826174b41b4e (diff) | |
| download | vcpkg-ee66b890593983968d77688b90d4f287549b4f7b.tar.gz vcpkg-ee66b890593983968d77688b90d4f287549b4f7b.zip | |
[ffmpeg] Enable fdk on arm or uwp. (#18659)
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 8 insertions, 16 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9b70694c2..1b677396e 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -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)'") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8ce76f9e3..efdb888bf 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -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" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 1b8e387e6..9c13bff86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1986,7 +1986,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 7 + "port-version": 8 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index c510b16ed..04750b6af 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", + "version": "4.4", + "port-version": 8 + }, + { "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", "version": "4.4", "port-version": 7 |