From 48cc0c71ed61be1c0e3c9543dd0f2b997037d1c9 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Fri, 28 Oct 2022 02:56:00 +0800
Subject: [PATCH] [ffmpeg] Remove the download address of gcc under windows arm
 (#26594)

* [ffmpeg] Update the download address of gcc under windows arm

* Never gcc download under windows arm

* update ffmpeg.json

* Removed download requirement for "cpp.exe" preprocessor

* x-add-version
---
 ports/ffmpeg/portfile.cmake | 22 +---------------------
 ports/ffmpeg/vcpkg.json     |  2 +-
 versions/baseline.json      |  2 +-
 versions/f-/ffmpeg.json     |  5 +++++
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index bc4114859ca904..97bc4fc1742cca 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -66,27 +66,7 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUA
 endif()
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        vcpkg_acquire_msys(MSYS_ROOT
-            DIRECT_PACKAGES
-                # Required for "cpp.exe" preprocessor
-                "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.25-2-x86_64.pkg.tar.zst"
-                9fcf50d18694ba983a1223f46312128bcdde700f72d3dc7b905acf1a8c167e5343ebf7957468fa943ad6f66259c316e437fc60c2456e18617e1ae1990eaf226b
-                "https://repo.msys2.org/msys/x86_64/zlib-1.2.12-2-x86_64.pkg.tar.zst"
-                5470a5da1acaf1e5639c5c1f396ca5dfdef58cb652168b04291c6c1a6cd90c6427f7d5b8e6620ad110e2c8ad1fe0d62a94e385a8d60bf41022754994b9bf39eb
-                "https://repo.msys2.org/msys/x86_64/mpc-1.2.1-1-x86_64.pkg.tar.zst"
-                31d9cd84bbd0b83ffc77ff0b0356d2c1e3dd8880e9f73f09c5140442c1ed17b93af08804038bd3cd1f90ac1e4cfe52bfeac1fe0b349ed5699088b7aa8420e550
-                "https://repo.msys2.org/msys/x86_64/mpfr-4.1.0-1-x86_64.pkg.tar.zst"
-                d64fa60e188124591d41fc097d7eb51d7ea4940bac05cdcf5eafde951ed1eaa174468f5ede03e61106e1633e3428964b34c96de76321ed8853b398fbe8c4d072
-                "https://repo.msys2.org/msys/x86_64/gmp-6.2.1-2-x86_64.pkg.tar.zst"
-                b2df273243ba08ed2b1117d2b4826900706859c51c1c39ca6e47df2b44b006b2512f7db801738fdbb9411594bc8bc67d308cf205f7fa1aab179863844218e513
-        )
-    else()
-        vcpkg_acquire_msys(MSYS_ROOT)
-    endif()
-
+    vcpkg_acquire_msys(MSYS_ROOT)
     set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
 else()
     set(SHELL /bin/sh)
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index ad9aa67c007cb0..0d41392792bb61 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.1",
-  "port-version": 21,
+  "port-version": 22,
   "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 82608314061564..9e2877d72469cf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2298,7 +2298,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.1",
-      "port-version": 21
+      "port-version": 22
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index 77c7f77827e73e..095437919d82d8 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1a56131c12116cc5ee8b86c329ee6e815ec2c17e",
+      "version": "4.4.1",
+      "port-version": 22
+    },
     {
       "git-tree": "8429893dd135ce02c91222b8280f2d5e224c2706",
       "version": "4.4.1",