From b456def9333c2092dea76624fd35e6146e2074f5 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sun, 20 Oct 2024 11:08:51 +0200
Subject: [PATCH] [ffmpeg] Decouple from automake1.16

---
 ports/ffmpeg/portfile.cmake | 11 +++++++++--
 ports/ffmpeg/vcpkg.json     |  2 +-
 versions/baseline.json      |  2 +-
 versions/f-/ffmpeg.json     |  5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 8d3b41ffbc322d..45b4c149856c28 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -151,9 +151,16 @@ if(VCPKG_DETECTED_CMAKE_STRIP)
 endif()
 
 if(VCPKG_HOST_IS_WINDOWS)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake)
     set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
-    list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${MSYS_ROOT}/usr/share/automake-1.16")
+    vcpkg_execute_required_process(
+        COMMAND "${MSYS_ROOT}/usr/bin/automake" --print-lib
+        OUTPUT_VARIABLE automake_lib
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+        LOGNAME automake-print-lib
+    )
+    list(APPEND prog_env "${MSYS_ROOT}/usr/bin" "${automake_lib}")
 else()
     find_program(SHELL bash)
 endif()
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 4a32b7c8c1f280..25b58d117adfbd 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "7.0.2",
-  "port-version": 5,
+  "port-version": 6,
   "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 3253b3b73bb7da..7927ac7e0e8a87 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2734,7 +2734,7 @@
     },
     "ffmpeg": {
       "baseline": "7.0.2",
-      "port-version": 5
+      "port-version": 6
     },
     "ffnvcodec": {
       "baseline": "12.2.72.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index efe1fd13a1e92a..33c73500e071a2 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7506f1ca32c4d750d58714d9d25c53900028d213",
+      "version": "7.0.2",
+      "port-version": 6
+    },
     {
       "git-tree": "d4bc112c6581274674b70429dacd87e5d0715ac4",
       "version": "7.0.2",