From eea8042d00f5bb270a2c77ff81dafeb39a09c90e Mon Sep 17 00:00:00 2001
From: Matthew Oliver <protogonoi@gmail.com>
Date: Tue, 7 Dec 2021 16:27:58 +1100
Subject: [PATCH] [ffmpeg] Fix detection of x264. (#21875)

---
 ...0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch | 5 ++---
 ports/ffmpeg/vcpkg.json                                      | 2 +-
 versions/baseline.json                                       | 2 +-
 versions/f-/ffmpeg.json                                      | 5 +++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch
index 7a0fb4bcac..f3c5bf04d6 100644
--- a/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch
+++ b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch
@@ -12,7 +12,7 @@ diff --git a/configure b/configure
 index ede8f9777b..b35728aace 100755
 --- a/configure
 +++ b/configure
-@@ -6535,11 +6535,9 @@ enabled libvpx            && {
+@@ -6535,11 +6535,8 @@ enabled libvpx            && {
  enabled libwebp           && {
      enabled libwebp_encoder      && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
      enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
@@ -22,8 +22,7 @@ index ede8f9777b..b35728aace 100755
 -                             require_cpp_condition libx264 x264.h "X264_BUILD >= 118" &&
 -                             check_cpp_condition libx262 x264.h "X264_MPEG2"
 +enabled libx264           && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
-+                             require_cpp_condition libx264 x264.h "X264_BUILD >= 158" &&
-+                             check_cpp_condition libx264 x264.h "X264_MPEG2"
++                             require_cpp_condition libx264 x264.h "X264_BUILD >= 158"
  enabled libx265           && { check_pkg_config libx265 x265 x265.h x265_api_get ||
                                 { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" ||
                                 require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } &&
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index b0f9d372a0..ecfe5e3837 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "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."
diff --git a/versions/baseline.json b/versions/baseline.json
index 8b59d548fc..42656c97dd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2142,7 +2142,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 1
+      "port-version": 2
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 053d53caa6..3fd1fd6b8c 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7576aa6e0cfa9b2e58abe51484cab6fd16337465",
+      "version": "4.4.1",
+      "port-version": 2
+    },
     {
       "git-tree": "c73820dc30c5ade90b5ae3da082420669b78d953",
       "version": "4.4.1",