Fix bootstrapping MSYS2 pacman (#11499) (#12080)

7 files changed, 18 insertions, 6 deletions

diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL
index fb55a07ef..e2694ba68 100644
--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.2-11
+Version: 4.2-12
 Build-Depends: zlib
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
diff --git a/ports/ffnvcodec/CONTROL b/ports/ffnvcodec/CONTROL
index 5779ec9e3..4a2ce6d71 100644
--- a/ports/ffnvcodec/CONTROL
+++ b/ports/ffnvcodec/CONTROL
@@ -1,4 +1,4 @@
 Source: ffnvcodec
-Version: 9.1.23.1
+Version: 9.1.23.1-1
 Homepage: https://github.com/FFmpeg/nv-codec-headers
 Description: FFmpeg version of Nvidia Codec SDK headers.
diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 282e5080e..4ba1c8e96 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,5 +1,5 @@
 Source: icu

-Version: 67.1-1

+Version: 67.1-2

 Homepage: http://icu-project.org/apiref/icu4c/

 Description: Mature and widely used Unicode and localization library.

 Supports: !(arm|uwp)

diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL
index b4e4abcfe..59154b657 100644
--- a/ports/libpq/CONTROL
+++ b/ports/libpq/CONTROL
@@ -1,5 +1,5 @@
 Source: libpq
-Version: 12.2-2
+Version: 12.2-3
 Build-Depends: libpq[bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL
index bc79a7e66..63ea7bb2f 100644
--- a/ports/libvpx/CONTROL
+++ b/ports/libvpx/CONTROL
@@ -1,5 +1,5 @@
 Source: libvpx

-Version: 1.8.1-6

+Version: 1.8.1-7

 Homepage: https://github.com/webmproject/libvpx

 Description: The reference software implementation for the video coding formats VP8 and VP9.

 Supports: !(uwp&arm)
\ No newline at end of file
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL
index 60c302346..a9830adb2 100644
--- a/ports/tensorflow-cc/CONTROL
+++ b/ports/tensorflow-cc/CONTROL
@@ -1,5 +1,5 @@
 Source: tensorflow-cc
-Version: 1.14-2
+Version: 1.14-3
 Description: Library for computation using data flow graphs for scalable machine learning
 Build-Depends: c-ares
 Supports: !x86
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index 8fa6a6d66..1b0459859 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -98,6 +98,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
       COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;gpgconf --homedir /etc/pacman.d/gnupg --kill all"
       WORKING_DIRECTORY ${TOOLPATH}
     )
+    # we need to update pacman before anything else due to pacman transitioning
+    # to using zstd packages, and our pacman is too old to support those
+    _execute_process(
+      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Sy pacman --noconfirm"
+      WORKING_DIRECTORY ${TOOLPATH}
+    )
+    # dash relies on specific versions of the base packages, which prevents us
+    # from doing a proper update. However, we don't need it so we remove it
+    _execute_process(
+      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Rc dash --noconfirm"
+      WORKING_DIRECTORY ${TOOLPATH}
+    )
     _execute_process(
       COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm"
       WORKING_DIRECTORY ${TOOLPATH}