From cf11eedf98a41455bf724da2bf713b71349c7ee2 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 23 Jun 2020 19:46:05 -0700 Subject: [PATCH 1/3] Fix bootstrapping MSYS2 pacman (#11499) MSYS2 pacman recently transitioned to using .zstd packages from .xz packages, but we bootstrap from a pacman that doesn't support those. We need to add some additional bootstrap steps before pacman works. --- scripts/cmake/vcpkg_acquire_msys.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 8fa6a6d662651c..1b045985906da7 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} From 36a10e22933539a1fdaa5ceccb30b92f8cb4fc5b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Jun 2020 21:09:44 -0700 Subject: [PATCH 2/3] Bump version on all ports that call vcpkg_acquire_msys. --- ports/ffmpeg/CONTROL | 2 +- ports/ffnvcodec/CONTROL | 2 +- ports/icu/CONTROL | 2 +- ports/libpq/CONTROL | 2 +- ports/libvpx/CONTROL | 2 +- ports/openssl-unix/CONTROL | 2 +- ports/tensorflow-cc/CONTROL | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index fb55a07ef7103f..e2694ba689f0b9 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 5779ec9e3dd385..4a2ce6d71c70d8 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 282e5080eff347..4ba1c8e96f774a 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 b4e4abcfe1cbc6..59154b657f9809 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 bc79a7e6694262..63ea7bb2f17017 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/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 0e1d8b8f6e24ef..49bfd9dd803498 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,4 +1,4 @@ Source: openssl-unix -Version: 1.1.1d-4 +Version: 1.1.1d-5 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. Supports: !(windows|uwp) diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL index 60c30234666f35..a9830adb24f719 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 From 7dbb7c62780785073d07e74190af123cc595bec5 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Wed, 24 Jun 2020 03:41:37 -0700 Subject: [PATCH 3/3] Revert unneeded change to openssl-unix --- ports/openssl-unix/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 49bfd9dd803498..0e1d8b8f6e24ef 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,4 +1,4 @@ Source: openssl-unix -Version: 1.1.1d-5 +Version: 1.1.1d-4 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. Supports: !(windows|uwp)