From 7434ad209538ed6def5eda0519718e6e4ce3f391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 5 Apr 2023 21:12:03 +0200
Subject: [PATCH 1/3] [ffmpeg] Fix off-by-one issue when looping over the
 OSX_ARCHS

This fixes crosscompiling e.g. arm64 on x64
---
 ports/ffmpeg/build.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in
index 5f64794ae205bd..de00885e2f0ccb 100644
--- a/ports/ffmpeg/build.sh.in
+++ b/ports/ffmpeg/build.sh.in
@@ -130,7 +130,7 @@ build_ffmpeg() {
 
 cd "$PATH_TO_BUILD_DIR"
 
-if [ $OSX_ARCH_COUNT -gt 1 ]; then
+if [ $OSX_ARCH_COUNT -gt 0 ]; then
     for ARCH in $OSX_ARCHS; do
         echo "=== CLEANING FOR $ARCH ==="
 

From 04353d9653fe6491e7253e17d32a3c9bd5ec93b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 6 Apr 2023 00:24:09 +0200
Subject: [PATCH 2/3] [ffmpeg] Remove redundant --enable-cross-compile flag

---
 ports/ffmpeg/build.sh.in    | 2 +-
 ports/ffmpeg/portfile.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in
index de00885e2f0ccb..462737587b7b89 100644
--- a/ports/ffmpeg/build.sh.in
+++ b/ports/ffmpeg/build.sh.in
@@ -136,7 +136,7 @@ if [ $OSX_ARCH_COUNT -gt 0 ]; then
 
         make clean && make distclean
 
-        build_ffmpeg $ARCH --enable-cross-compile --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
+        build_ffmpeg $ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
 
         echo "=== COLLECTING BINARIES FOR $ARCH ==="
 
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index b7178acdc658e0..35bac875b9e341 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -513,7 +513,7 @@ else()
     set(OPTIONS "${OPTIONS} --disable-libmfx")
 endif()
 
-set(OPTIONS_CROSS " --enable-cross-compile")
+set(OPTIONS_CROSS "--enable-cross-compile")
 
 # ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling.
 if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")

From 81af9459cb95ff64eb55f6369d33c2293e73f022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 6 Apr 2023 01:10:04 +0200
Subject: [PATCH 3/3] [ffmpeg] Bump port version

---
 ports/ffmpeg/vcpkg.json | 2 +-
 versions/baseline.json  | 2 +-
 versions/f-/ffmpeg.json | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 631323a175cf00..0c6330ccd08b9c 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "5.1.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 bc2a5ea9001a3b..3416376e13ce0e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2450,7 +2450,7 @@
     },
     "ffmpeg": {
       "baseline": "5.1.2",
-      "port-version": 5
+      "port-version": 6
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 43a3d70c69ab05..625ae0d65470bb 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a7e0c378cd0a6564b28c28d6d970e3d633b4382e",
+      "version": "5.1.2",
+      "port-version": 6
+    },
     {
       "git-tree": "14577b12f56accfce4428caf17e4b47542f365ec",
       "version": "5.1.2",