[ffmpeg] Update dependency support for recent changes. (#21980)

* [ffmpeg] Update dependency support for recent changes.

Updates for changes in commits:
7bb175e [aom/libavif] Add support for ARM and UWP
a8204d9 [fribidi] Support new platform

* update

* [ffmpeg] update x264 supports.

* Fix version database.

* update

* Update all platform checks and error messages

* Update vcpkg.json

* Update ffmpeg.json

* fixup osx.

* another osx fixup

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

ports/ffmpeg/portfile.cmake

@@ -12,61 +12,15 @@ if("ffprobe" IN_LIST FEATURES)
     vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffprobe' does not support 'uwp'")
 endif()
 
-if ("alsa" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX)
-    message(FATAL_ERROR "Feature 'alsa' only support 'linux'")
-endif()
-
-if("aom" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'aom' does not support 'uwp | arm'")
-    endif()
-endif()
-
-if("ass" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'ass' does not support 'uwp | arm'")
-    endif()
-endif()
-
 if("avisynthplus" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
+    if ((NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
-        message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp | static'")
+        message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | static'")
     endif()
 endif()
 
 if("dav1d" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
+    if (VCPKG_TARGET_IS_OSX)
-        message(FATAL_ERROR "Feature 'dav1d' does not support 'uwp | arm | x86 | osx'")
+        message(FATAL_ERROR "Feature 'dav1d' does not support 'osx'")
-    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)'")
-    endif()
-endif()
-
-if("fribidi" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'fribidi' does not support 'uwp | arm'")
-    endif()
-endif()
-
-if("ilbc" IN_LIST FEATURES)
-    if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'ilbc' does not support 'uwp & arm'")
-    endif()
-endif()
-
-if("modplug" IN_LIST FEATURES)
-    if (VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'modplug' does not support 'uwp'")
-    endif()
-endif()
-
-if("nvcodec" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR ((NOT VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_LINUX)))
-        message(FATAL_ERROR "Feature 'nvcodec' does not support '!(windows | linux) | uwp | arm'")
     endif()
 endif()
 
@@ -75,58 +29,20 @@ if("opencl" IN_LIST FEATURES)
 endif()
 
 if("opengl" IN_LIST FEATURES)
-    if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP)
+    if (VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)")
+        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp")
-    endif()
-endif()
-
-if("openh264" IN_LIST FEATURES)
-    vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'openh264' does not support 'uwp'")
-endif()
-
-if("sdl2" IN_LIST FEATURES)
-    vcpkg_fail_port_install(ON_TARGET "OSX" MESSAGE "Feature 'sdl2' does not support 'osx'")
-endif()
-
-if("ssh" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature 'ssh' does not support 'uwp | arm | static'")
-    endif()
-endif()
-
-if("tensorflow" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-        message(FATAL_ERROR "Feature 'tensorflow' does not support 'x86 | arm | uwp | static'")
     endif()
 endif()
 
 if("tesseract" IN_LIST FEATURES)
-    if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature 'tesseract' does not support 'uwp | (windows & arm) | static'")
-    endif()
-endif()
-
-if("wavpack" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        message(FATAL_ERROR "Feature 'wavpack' does not support 'arm'")
-    endif()
-endif()
-
-if("x264" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        message(FATAL_ERROR "Feature 'x264' does not support 'arm'")
-    endif()
-endif()
-
-if("x265" IN_LIST FEATURES)
-    if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
-        message(FATAL_ERROR "Feature 'x265' does not support 'uwp | arm'")
-    endif()
-endif()
-
-if("xml2" IN_LIST FEATURES)
     if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        message(FATAL_ERROR "Feature 'xml2' does not support 'static'")
+        message(FATAL_ERROR "Feature 'tesseract' does not support 'static'")
+    endif()
+endif()
+
+if("tensorflow" IN_LIST FEATURES)
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+        message(FATAL_ERROR "Feature 'tensorflow' does not support 'static'")
     endif()
 endif()
 

ports/ffmpeg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 3,
+  "port-version": 4,
   "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."
@@ -33,12 +33,14 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
+            "ass",
             "avcodec",
             "avdevice",
             "avfilter",
             "avformat",
             "avresample",
             "bzip2",
+            "fontconfig",
             "freetype",
             "iconv",
             "lzma",
@@ -54,6 +56,7 @@
             "vorbis",
             "vpx",
             "webp",
+            "xml2",
             "zlib"
           ]
         },
@@ -73,6 +76,14 @@
           ],
           "platform": "!osx"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "fribidi"
+          ],
+          "platform": "!uwp"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -89,6 +100,14 @@
           ],
           "platform": "!uwp"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ],
+          "platform": "!uwp"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -101,7 +120,7 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "xml2"
+            "tensorflow"
           ],
           "platform": "!static"
         },
@@ -113,29 +132,21 @@
           ],
           "platform": "!(arm & uwp)"
         },
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "ssh"
+          ],
+          "platform": "!(uwp | arm)"
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
             "aom"
           ],
-          "platform": "!(uwp | arm)"
+          "platform": "!(windows & arm & !uwp)"
-        },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "ass"
-          ],
-          "platform": "!(uwp | arm)"
-        },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "fribidi"
-          ],
-          "platform": "!(uwp | arm)"
         },
         {
           "name": "ffmpeg",
@@ -145,37 +156,13 @@
           ],
           "platform": "!(uwp | arm | x86 | osx)"
         },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "ssh"
-          ],
-          "platform": "!(uwp | arm) & !static"
-        },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "opengl"
-          ],
-          "platform": "!uwp & !(windows & arm)"
-        },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "tensorflow"
-          ],
-          "platform": "!(x86 | arm | uwp) & !static"
-        },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
             "nvcodec"
           ],
-          "platform": "(windows | linux) & !uwp & !arm"
+          "platform": "(windows | linux) & !uwp"
         },
         {
           "name": "ffmpeg",
@@ -183,15 +170,7 @@
           "features": [
             "tesseract"
           ],
-          "platform": "!uwp & !(windows & arm) & !static"
+          "platform": "!(windows & arm) & !static"
-        },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "fontconfig"
-          ],
-          "platform": "!(windows & static) & !(uwp | arm)"
         }
       ]
     },
@@ -211,17 +190,17 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "x264"
+            "x265"
           ],
-          "platform": "!arm"
+          "platform": "!(uwp | arm)"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "x265"
+            "x264"
           ],
-          "platform": "!arm & !uwp"
+          "platform": "!(arm & windows)"
         },
         {
           "name": "ffmpeg",

versions/baseline.json

@@ -2146,7 +2146,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 3
+      "port-version": 4
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",

versions/f-/ffmpeg.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d7e12377ceb86caf3720807cb4be9f0f51c93798",
+      "version": "4.4.1",
+      "port-version": 4
+    },
     {
       "git-tree": "00480edd2a451f2a3a55452779f524709ee52585",
       "version": "4.4.1",