From d013bcf433472e9d1349634bea9136eb2d53f449 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 16 May 2021 19:19:37 +0300 Subject: [PATCH] Update msys2 environment to 210515 level - Based on upstream snapshot 20210228 - Replace pkg-config with mingw-w64--pkgconf - Install just automake1.16, not all automake versions via the automake meta package See osdn #42035 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 16 ++++++++-------- windows/installer_msys2/Makefile | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 421da03255..37ad338d68 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -24,7 +24,7 @@ using MSYS2 from http://msys2.github.io 1) Install MSYS2 following the documentation on their homepage 1.1) Download - https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20210215.exe + https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20210228.exe for win64 host 1.2) Run it to install MSYS2 on build system @@ -47,7 +47,6 @@ using MSYS2 from http://msys2.github.io - make - gettext - - pkg-config 2.1.1.2) Arch independent packages needed for getting and extracting freeciv source tarball @@ -59,7 +58,7 @@ using MSYS2 from http://msys2.github.io freeciv. - git - - automake + - automake1.16 - libtool - autoconf @@ -67,6 +66,7 @@ using MSYS2 from http://msys2.github.io 2.1.2.1) Arch-specific packages for building common parts - mingw-w64-i686-gcc / mingw-w64-x86_64-gcc + - mingw-w64-i686-pkgconf / mingw-w64-x86_64-pkgconf - mingw-w64-i686-icu / mingw-w64-x86_64-icu - mingw-w64-i686-curl / mingw-w64-x86_64-curl - mingw-w64-i686-imagemagick / mingw-w64-x86_64-imagemagick @@ -108,9 +108,9 @@ Current version is win64 host: ----------- -msys2-freeciv-win64-210226.7z, based on -https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20210215.exe -with packages updated to 26-Feb-2021 level. +msys2-freeciv-win64-210515.7z, based on +https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20210228.exe +with packages updated to 15-May-2021 level. Both win32 and win64 targets are included. For each package listed below with in the name, actually two packages is installed; one with a name where is @@ -119,16 +119,16 @@ replaced by 'i686' and one where is replaced by 'x86_64' Following packages have been installed: - make -- pkg-config - tar - git - patch - nano -- automake +- automake1.16 - libtool - autoconf - gdb - mingw-w64--gcc +- mingw-w64--pkgconf - mingw-w64--icu - mingw-w64--curl - mingw-w64--sqlite3 diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index c87255a90d..e3ed7973fb 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -147,7 +147,7 @@ SOUND_DLLS := \ SDL2.dll \ SDL2_mixer.dll \ libFLAC-8.dll \ - libfluidsynth-2.dll \ + libfluidsynth-3.dll \ libmodplug-1.dll \ libvorbis-0.dll \ libvorbisenc-2.dll \ -- 2.30.2