From ee388aaa69637d2c7b2bd5832198e834ed826fd8 Mon Sep 17 00:00:00 2001
From: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:54:59 +0200
Subject: [PATCH] [FFmpeg] Fix build on ARM64 (#27184)

I tried to build FFmpeg for ARM64 but I got an error.
The problem happens because portfile.cmake uses gcc-9.3.0 but it has been removed from repository.
See:
https://repo.msys2.org/msys/x86_64/
So, it is just needed to update that file to the newer updated version and you will be able to build FFmpeg for ARM64 again.
---
 ports/ffmpeg/portfile.cmake | 4 ++--
 ports/ffmpeg/vcpkg.json     | 2 +-
 versions/baseline.json      | 2 +-
 versions/f-/ffmpeg.json     | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 2c049c72a0..fd796f4cb9 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -70,8 +70,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
         vcpkg_acquire_msys(MSYS_ROOT
             DIRECT_PACKAGES
                 # Required for "cpp.exe" preprocessor
-                "https://repo.msys2.org/msys/x86_64/gcc-9.3.0-1-x86_64.pkg.tar.xz"
-                76af0192a092278e6b26814b2d92815a2c519902a3fec056b057faec19623b1770ac928a59a39402db23cfc23b0d7601b7f88b367b27269361748c69d08654b2
+                "https://repo.msys2.org/msys/x86_64/gcc-11.3.0-2-x86_64.pkg.tar.zst"
+                1efc34aa8312eb5a8fef02c7c903d9ed98c4d50b13b8cf9679df1d545847eb9e0e9a42a810b2e085c6f938796a2a9846cb8b515e9380fdd6bec8ae4a1a131d9e
                 "https://repo.msys2.org/msys/x86_64/isl-0.22.1-1-x86_64.pkg.tar.xz"
                 f4db50d00bad0fa0abc6b9ad965b0262d936d437a9faa35308fa79a7ee500a474178120e487b2db2259caf51524320f619e18d92acf4f0b970b5cbe5cc0f63a2
                 "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz"
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index cb7d574e00..d1992f42cf 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 19,
+  "port-version": 20,
   "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 9299a7ef6c..e0f71bffa8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2294,7 +2294,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 19
+      "port-version": 20
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 5a37dac458..7b07ea70b4 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a4a2ee724ee276834d3f5715bac6bf6ec179c31b",
+      "version": "4.4.1",
+      "port-version": 20
+    },
     {
       "git-tree": "42edfcee5ee9a8884b7c1733c6b560092cad9576",
       "version": "4.4.1",