From 0d1229d34babdc9c8fbfe2e1b43b38e657519093 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 17 Dec 2018 09:34:45 +0100 Subject: [PATCH 1/2] update msys2 to latest release --- scripts/cmake/vcpkg_acquire_msys.cmake | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index ed4f7ac294..adbd58ca5b 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -53,20 +53,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) if(_vam_HOST_ARCHITECTURE STREQUAL "AMD64") set(TOOLSUBPATH msys64) set(URLS - "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-x86_64-20161025.tar.xz") - set(HASH 6c4c18ec59db80b8269698d074866438a624f1ce735ee5005a01b148b02e8f2e966ae381aa1cb4c50f6226c3b7feb271e36907cf26580df084d695b3c9f5c0eb) + set(ARCHIVE "msys2-base-x86_64-20181211.tar.xz") + set(HASH 1efb9a7ff1daa2d3147ac0fda8e9a645696dbd19a33c986b844bc037d946dddb3353db5a52794ac668718812854400d918e4db13b4a2d0e6f5a9dfe716b48056) set(STAMP "initialized-msys2_64.stamp") else() set(TOOLSUBPATH msys32) set(URLS - "http://repo.msys2.org/distrib/i686/msys2-base-i686-20161025.tar.xz" - "https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20161025.tar.xz/download" + "http://repo.msys2.org/distrib/i686/msys2-base-i686-20181211.tar.xz" ) - set(ARCHIVE "msys2-base-i686-20161025.tar.xz") - set(HASH c9260a38e0c6bf963adeaea098c4e376449c1dd0afe07480741d6583a1ac4c138951ccb0c5388bd148e04255a5c1a23bf5ee2d58dcd6607c14f1eaa5639a7c85) + set(ARCHIVE "msys2-base-i686-20181211.tar.xz") + set(HASH a9b9680a511bb205b87811b303eb29d62e2fd851000304f8b087c5893a3891c2aa2d46217ae989e31b5d52a6ba34ac5e6a5e624d9c917df00a752ade4debc20f) set(STAMP "initialized-msys2_32.stamp") endif() From bf4a864a73dfe0f68a70598c9f5087beca57f2c7 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 21 Dec 2018 00:42:50 -0800 Subject: [PATCH 2/2] [msys2] bump control version in msys dependant ports --- ports/ffmpeg/CONTROL | 2 +- ports/icu/CONTROL | 2 +- ports/libgd/CONTROL | 2 +- ports/libvpx/CONTROL | 2 +- ports/openal-soft/CONTROL | 2 +- ports/openssl-unix/CONTROL | 2 +- ports/x264/CONTROL | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 35b3e257e8..ce69402dc9 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.1 +Version: 4.1-1 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/ports/icu/CONTROL b/ports/icu/CONTROL index 0cb924a2a7..171eb1129b 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,3 @@ Source: icu -Version: 61.1-4 +Version: 61.1-5 Description: Mature and widely used Unicode and localization library. diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index a8373f5157..d9eb37c754 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,4 +1,4 @@ Source: libgd -Version: 2.2.4-4 +Version: 2.2.4-5 Description: Open source code library for the dynamic creation of images by programmers. Build-Depends: freetype, libjpeg-turbo, libpng, libwebp, tiff, fontconfig diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index fa15226290..77a44f1959 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,3 +1,3 @@ Source: libvpx -Version: 1.7.0 +Version: 1.7.0-1 Description: The reference software implementation for the video coding formats VP8 and VP9. diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 6f16b26bda..cc30df1def 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,3 @@ Source: openal-soft -Version: 1.19.1 +Version: 1.19.1-1 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL index 28dc5da98e..a7e532afe9 100644 --- a/ports/openssl-unix/CONTROL +++ b/ports/openssl-unix/CONTROL @@ -1,3 +1,3 @@ Source: openssl-unix -Version: 1.0.2p-1 +Version: 1.0.2p-2 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. diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 44b664142e..66fda9beef 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,3 +1,3 @@ Source: x264 -Version: 157-303c484ec828ed0 +Version: 157-303c484ec828ed0-1 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format