diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9b70694c2a5688..1b677396eef14d 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 8ce76f9e343ce4..efdb888bf1d341 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 a4360fc3e0a0a4..4e52e84c29d8b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,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 c510b16ed25c50..04750b6afad5ca 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", + "version": "4.4", + "port-version": 8 + }, { "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", "version": "4.4",