From a00ea194faf9f2aab7d70006f5406548866b8367 Mon Sep 17 00:00:00 2001
From: gaoshan <vipgs99@gmail.com>
Date: Wed, 21 Aug 2024 14:37:38 +0800
Subject: [PATCH] [ffmpeg] reenable osx platform support for ffmpeg[sdl2]
 (#40391)

Co-authored-by: gs <gaoshan_yy@migu.cn>
Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
Co-authored-by: Monica <liuyumei01@beyondsoft.com>
---
 ports/ffmpeg/vcpkg.json | 17 ++++++++---------
 versions/baseline.json  |  2 +-
 versions/f-/ffmpeg.json |  5 +++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index a82d43d6fa..6c23c3f944 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "7.0.2",
-  "port-version": 2,
+  "port-version": 3,
   "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."
@@ -30,6 +30,13 @@
     "all": {
       "description": "Build with all allowed dependencies selected that are compatible with the lgpl license",
       "dependencies": [
+        {
+          "name": "ffmpeg",
+          "default-features": false,
+          "features": [
+            "sdl2"
+          ]
+        },
         {
           "name": "ffmpeg",
           "default-features": false,
@@ -68,14 +75,6 @@
           ],
           "platform": "linux"
         },
-        {
-          "name": "ffmpeg",
-          "default-features": false,
-          "features": [
-            "sdl2"
-          ],
-          "platform": "!osx"
-        },
         {
           "name": "ffmpeg",
           "default-features": false,
diff --git a/versions/baseline.json b/versions/baseline.json
index 1b480dfa81..d5fa46f204 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2706,7 +2706,7 @@
     },
     "ffmpeg": {
       "baseline": "7.0.2",
-      "port-version": 2
+      "port-version": 3
     },
     "ffnvcodec": {
       "baseline": "12.1.14.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 4ccc557cdd..6ac2344e96 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3bd67b806413f3013f1b3f303f757a3dd47e9f11",
+      "version": "7.0.2",
+      "port-version": 3
+    },
     {
       "git-tree": "c79d0466ceabb1aad30e085d2c35ce73a89b289d",
       "version": "7.0.2",