[ffmpeg] enable opengl feature on osx (#18624)

* [ffmpeg] enable opengl feature on osx * [ffmpeg] x-add-version * [ffmpeg] remove opengl osx check in portfile * [ffmpeg] x-add-version * Update ports/ffmpeg/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [ffmpeg] x-add-version * [ffmpeg] bump port version * [ffmpeg] x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Jul 16, 2021 · 30d8b36 · 30d8b36
1 parent 394e6f0
commit 30d8b36
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
@@ -66,8 +66,8 @@ 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 OR VCPKG_TARGET_IS_OSX)
-        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'")
+    if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP)
+        message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)")
     endif()
 endif()
 

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4",
-  "port-version": 8,
+  "port-version": 9,
   "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."
@@ -122,33 +122,33 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "dav1d"
+            "opengl"
           ],
-          "platform": "!(uwp | arm | x86 | osx)"
+          "platform": "!uwp & !(windows & arm)"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "modplug"
+            "dav1d"
           ],
-          "platform": "!(windows & static) & !uwp"
+          "platform": "!(uwp | arm | x86 | osx)"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "tensorflow"
+            "modplug"
           ],
-          "platform": "!(x86 | arm | uwp) & !static"
+          "platform": "!(windows & static) & !uwp"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "opengl"
+            "tensorflow"
           ],
-          "platform": "!uwp & !(windows & arm) & !osx"
+          "platform": "!(x86 | arm | uwp) & !static"
         },
         {
           "name": "ffmpeg",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1990,7 +1990,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4",
-      "port-version": 8
+      "port-version": 9
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",

diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4",
+      "version": "4.4",
+      "port-version": 9
+    },
     {
       "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b",
       "version": "4.4",