diff --git a/CMakeLists.txt b/CMakeLists.txt index b28f0280..4633cd69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ if(HAS_SETXATTR) add_definitions(-DHAS_SETXATTR) endif() +include(cmake/hashes.cmake) + include(cmake/versions.cmake) include(cmake/arch.cmake) include(cmake/os.cmake) diff --git a/cmake/hashes.cmake b/cmake/hashes.cmake new file mode 100644 index 00000000..fc6e0e51 --- /dev/null +++ b/cmake/hashes.cmake @@ -0,0 +1,42 @@ + +set(FMT_HASH 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f) +set(CPP_HTTPLIB_HASH c1742fc7179aaae2a67ad9bba0740b7e9ffaf4f5e62feef53101ecdef1478716) +set(OGG_HASH 0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664) +set(ROCKSDB_HASH e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855) +set(WXWIDGETS_HASH 0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51) +set(FONTCONFIG_HASH f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4) +set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1) +set(FREETYPE2_HASH 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747) +set(NUSPELL_HASH 5d4baa1daf833a18dc06ae0af0571d9574cc849d47daff6b9ce11dac0a5ded6a) +set(LIBEVENT_HASH 7180a979aaa7000e1264da484f712d403fcf7679b1e9212c4e3d09f5c93efc24) +set(CXXOPTS_HASH 9f43fa972532e5df6c5fd5ad0f5bac606cdec541ccaf1732463d8070bbb7f03b) +set(SFML_HASH 82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d) +set(ICU_HASH 925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e) +set(SECP256K1_HASH 61583939f1f25b92e6401e5b819e399da02562de663873df3056993b40148701) +set(LIBDSM_HASH 747c4563d6291303d9b085c9e7dc96ac44f91871dcac3e20480fdcc066eee88a) +set(GTEST_HASH 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926) +set(FLAC_HASH 0a4bb82a30609b606650d538a804a7b40205366ce8fc98871b0ecf3fbb0611ee) +set(CURL_HASH d714818f6ac41ae9154850158fed44b7a87650a6d52f83d3bcb9aa527be354d7) +set(SQLITE_HASH 77823cb110929c2bcb0f5d48e4833b5c59a8a6e40cdea3936b99e199dbbe5784) +set(CLI11_HASH f2d893a65c3b1324c50d4e682c0cdc021dd0477ae2c048544f39eed6654b699a) +set(LIBPNG_HASH fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a) +set(MINGW_HASH 3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10) +set(LIBTASN_HASH 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a) +set(ZLIB_HASH 17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c) +set(PUGIXML_HASH 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015) +set(OPENSSL_HASH 777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e) +set(SPDLOG_HASH 1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b) +set(OPENAL_HASH dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a) +set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293) +set(BINUTILS_HASH ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450) +set(SDL_HASH 254a767aa486fa6308d4473159c1f23c794610be775d63e98084111d96814b85) +set(LIBICONV_HASH 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313) +set(LIBJPEG_TURBO_HASH a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21) +set(VORBIS_HASH 270c76933d0934e42c5ee0a54a36280e2d87af1de3cc3e584806357e237afd13) +set(EXPAT_HASH fbd032683370d761ba68dba2566d3280a154f5290634172d60a79b24d366d9dc) +set(STDUUID_HASH b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3) +set(JSON_HASH 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406) +set(NANA_HASH e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855) +set(PKG_CONFIG_HASH 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591) +set(BOOST_HASH 2575e74ffc3ef1cd0babac2c1ee8bdb5782a0ee672b1912da40e5b4b591ca01f) +set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca) diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index 6248309d..54a4e159 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -82,9 +82,9 @@ if(PROJECT_ENABLE_BOOST) ) if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) - set(BOOST_URL_HASH SHA256=7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca) + set(BOOST_URL_HASH SHA256=${BOOST2_HASH}) else() - set(BOOST_URL_HASH SHA256=2575e74ffc3ef1cd0babac2c1ee8bdb5782a0ee672b1912da40e5b4b591ca01f) + set(BOOST_URL_HASH SHA256=${BOOST_HASH}) endif() ExternalProject_Add(boost_project diff --git a/cmake/libraries/cpp_httplib.cmake b/cmake/libraries/cpp_httplib.cmake index f2b3cd01..083ce530 100644 --- a/cmake/libraries/cpp_httplib.cmake +++ b/cmake/libraries/cpp_httplib.cmake @@ -10,7 +10,7 @@ if(PROJECT_ENABLE_CPP_HTTPLIB) ExternalProject_Add(cpphttplib_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/cpp-httplib-${CPP_HTTPLIB_VERSION}.tar.gz - URL_HASH SHA256=c1742fc7179aaae2a67ad9bba0740b7e9ffaf4f5e62feef53101ecdef1478716 + URL_HASH SHA256=${CPP_HTTPLIB_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake index 90a2c141..8e5a4f5d 100644 --- a/cmake/libraries/curl.cmake +++ b/cmake/libraries/curl.cmake @@ -16,7 +16,7 @@ if(PROJECT_ENABLE_CURL) ExternalProject_Add(curl_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/curl-${CURL_VERSION}.tar.gz - URL_HASH SHA256=291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5 + URL_HASH SHA256=${CURL_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} diff --git a/cmake/libraries/json.cmake b/cmake/libraries/json.cmake index 1648375f..632e6ba6 100644 --- a/cmake/libraries/json.cmake +++ b/cmake/libraries/json.cmake @@ -13,7 +13,7 @@ if(PROJECT_ENABLE_JSON) ExternalProject_Add(json_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/json-${JSON_VERSION}.tar.gz - URL_HASH SHA256=0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 + URL_HASH SHA256=${JSON_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/libraries/libsodium.cmake b/cmake/libraries/libsodium.cmake index 4b04a832..57953444 100644 --- a/cmake/libraries/libsodium.cmake +++ b/cmake/libraries/libsodium.cmake @@ -31,7 +31,7 @@ if(PROJECT_ENABLE_LIBSODIUM) ExternalProject_Add(libsodium_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/libsodium-${LIBSODIUM_VERSION}.tar.gz - URL_HASH SHA256=ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19 + URL_HASH SHA256=${LIBSODIUM_HASH} BUILD_IN_SOURCE 1 LIST_SEPARATOR | CONFIGURE_COMMAND ${PROJECT_3RD_PARTY_DIR}/libsodium_configure.sh diff --git a/cmake/libraries/openssl.cmake b/cmake/libraries/openssl.cmake index 9758745d..699d4663 100644 --- a/cmake/libraries/openssl.cmake +++ b/cmake/libraries/openssl.cmake @@ -34,7 +34,7 @@ if(PROJECT_ENABLE_OPENSSL) ExternalProject_Add(openssl_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/openssl-${OPENSSL_VERSION}.tar.gz - URL_HASH SHA256=777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e + URL_HASH SHA256=${OPENSSL_HASH} BUILD_IN_SOURCE 1 LIST_SEPARATOR | CONFIGURE_COMMAND ./Configure diff --git a/cmake/libraries/pugixml.cmake b/cmake/libraries/pugixml.cmake index f16f84e5..88105416 100644 --- a/cmake/libraries/pugixml.cmake +++ b/cmake/libraries/pugixml.cmake @@ -15,7 +15,7 @@ if(PROJECT_ENABLE_PUGIXML) ExternalProject_Add(pugixml_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/pugixml-${PUGIXML_VERSION}.tar.gz - URL_HASH SHA256=2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 + URL_HASH SHA256=${PUGIXML_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/libraries/spdlog.cmake b/cmake/libraries/spdlog.cmake index 47e2e95f..21972d54 100644 --- a/cmake/libraries/spdlog.cmake +++ b/cmake/libraries/spdlog.cmake @@ -11,7 +11,7 @@ if(PROJECT_ENABLE_SPDLOG) ExternalProject_Add(spdlog_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/spdlog-${SPDLOG_VERSION}.tar.gz - URL_HASH SHA256=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b + URL_HASH SHA256=${SPDLOG_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/libraries/sqlite.cmake b/cmake/libraries/sqlite.cmake index bd272418..b36619b2 100644 --- a/cmake/libraries/sqlite.cmake +++ b/cmake/libraries/sqlite.cmake @@ -13,7 +13,7 @@ if(PROJECT_ENABLE_SQLITE) ExternalProject_Add(sqlite_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/sqlite-amalgamation-${SQLITE_VERSION}.zip - URL_HASH SHA256=77823cb110929c2bcb0f5d48e4833b5c59a8a6e40cdea3936b99e199dbbe5784 + URL_HASH SHA256=${SQLITE_HASH} CONFIGURE_COMMAND echo "No configure" BUILD_COMMAND echo "No build" INSTALL_COMMAND echo "No install" diff --git a/cmake/libraries/stduuid.cmake b/cmake/libraries/stduuid.cmake index 94e7d3db..87ffc05a 100644 --- a/cmake/libraries/stduuid.cmake +++ b/cmake/libraries/stduuid.cmake @@ -11,7 +11,7 @@ if(PROJECT_ENABLE_STDUUID) ExternalProject_Add(stduuid_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/stduuid-${STDUUID_VERSION}.tar.gz - URL_HASH SHA256=b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3 + URL_HASH SHA256=${STDUUID_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/libraries/testing.cmake b/cmake/libraries/testing.cmake index 73985908..a72d5b3c 100644 --- a/cmake/libraries/testing.cmake +++ b/cmake/libraries/testing.cmake @@ -5,7 +5,7 @@ if (PROJECT_ENABLE_TESTING) ExternalProject_Add(gtest_project PREFIX external URL ${PROJECT_3RD_PARTY_DIR}/googletest-${GTEST_VERSION}.tar.gz - URL_HASH SHA256=7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926 + URL_HASH SHA256=${GTEST_HASH} LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} diff --git a/cmake/versions.cmake b/cmake/versions.cmake index c9b23334..d9690af9 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -9,7 +9,8 @@ set(BOOST2_MINOR_VERSION 76) set(LIBSODIUM_VERSION 1.0.20) set(BOOST_PATCH_VERSION 0) set(FREETYPE2_VERSION 2.13.3) -set(NUSPELL_VERSION 5.1.4) +set(NUSPELL_VERSION 5.1.6) +set(EXPAT2_VERSION 2_6_2) set(LIBEVENT_VERSION 2.1.12) set(CXXOPTS_VERSION 3.2.0) set(SFML_VERSION 2.6.1) @@ -37,6 +38,7 @@ set(GTKMM_VERSION 3.0) set(GCC_VERSION 14.2.0) set(BINUTILS_VERSION 2.41) set(SDL_VERSION 2.30.6) +set(CURL2_VERSION 8_9_1) set(LIBICONV_VERSION 1.17) set(LIBJPEG_TURBO_VERSION 3.0.3) set(VORBIS_VERSION 1.3.7) diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 8b203fc7..f2bf4491 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1,3 +1,4 @@ +#comment FROM alpine:3.20.2 RUN apk update @@ -112,7 +113,8 @@ ADD ./3rd_party /3rd_party ARG BINUTILS_VERSION ENV MY_BINUTILS_VERSION=${BINUTILS_VERSION} -RUN tar xvJf /3rd_party/mingw64/binutils-${MY_BINUTILS_VERSION}.tar.xz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./binutils-${MY_BINUTILS_VERSION}.tar.xz.sha256 && cd - \ + && tar xvJf /3rd_party/mingw64/binutils-${MY_BINUTILS_VERSION}.tar.xz \ && cd binutils-${MY_BINUTILS_VERSION} \ && ./configure \ --disable-lto \ @@ -132,10 +134,11 @@ RUN tar xvJf /3rd_party/mingw64/binutils-${MY_BINUTILS_VERSION}.tar.xz \ ARG MINGW_VERSION ENV MY_MINGW_VERSION=${MINGW_VERSION} -RUN tar xvzf /3rd_party/mingw64/mingw-w64-${MY_MINGW_VERSION}.tar.gz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./mingw-w64-v${MY_MINGW_VERSION}.tar.bz2.sha256 && cd - \ + && tar xvjf /3rd_party/mingw64/mingw-w64-v${MY_MINGW_VERSION}.tar.bz2 \ && mkdir mingw-w64 \ && cd mingw-w64 \ - && ../mingw-w64-${MY_MINGW_VERSION}/mingw-w64-headers/configure \ + && ../mingw-w64-v${MY_MINGW_VERSION}/mingw-w64-headers/configure \ --enable-sdk=all \ --host=${MY_MINGW_PREFIX} \ --prefix=/usr/local/${MY_MINGW_PREFIX} \ @@ -143,7 +146,8 @@ RUN tar xvzf /3rd_party/mingw64/mingw-w64-${MY_MINGW_VERSION}.tar.gz \ ARG GCC_VERSION ENV MY_GCC_VERSION=${GCC_VERSION} -RUN tar xvzf /3rd_party/mingw64/gcc-${MY_GCC_VERSION}.tar.gz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./gcc-${MY_GCC_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/mingw64/gcc-${MY_GCC_VERSION}.tar.gz \ && (mv gcc-releases-gcc-${MY_GCC_VERSION} gcc-${MY_GCC_VERSION} || echo "") \ && mkdir gcc \ && cd gcc \ @@ -186,7 +190,7 @@ RUN tar xvzf /3rd_party/mingw64/gcc-${MY_GCC_VERSION}.tar.gz \ && make install-gcc RUN cd mingw-w64 \ - && ../mingw-w64-${MY_MINGW_VERSION}/mingw-w64-crt/configure \ + && ../mingw-w64-v${MY_MINGW_VERSION}/mingw-w64-crt/configure \ --disable-lib32 \ --enable-lib64 \ --enable-wildcard \ @@ -196,7 +200,7 @@ RUN cd mingw-w64 \ && make install RUN cd mingw-w64 \ - && ../mingw-w64-${MY_MINGW_VERSION}/mingw-w64-libraries/winpthreads/configure \ + && ../mingw-w64-v${MY_MINGW_VERSION}/mingw-w64-libraries/winpthreads/configure \ --enable-shared \ --enable-static \ --host=${MY_MINGW_PREFIX} \ @@ -211,11 +215,12 @@ RUN cd gcc \ RUN cp /usr/local/${MY_MINGW_PREFIX}/lib/*.dll ${MY_MINGW_DIR}/bin \ && cp /usr/local/${MY_MINGW_PREFIX}/bin/*.dll ${MY_MINGW_DIR}/bin \ && rm -r gcc gcc-${MY_GCC_VERSION} \ - && rm -r mingw-w64 mingw-w64-${MY_MINGW_VERSION} + && rm -r mingw-w64 mingw-w64-v${MY_MINGW_VERSION} ARG PKG_CONFIG_VERSION ENV MY_PKG_CONFIG_VERSION=${PKG_CONFIG_VERSION} -RUN tar xvzf /3rd_party/mingw64/pkg-config-${MY_PKG_CONFIG_VERSION}.tar.gz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./pkg-config-${MY_PKG_CONFIG_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/mingw64/pkg-config-${MY_PKG_CONFIG_VERSION}.tar.gz \ && cd pkg-config-${MY_PKG_CONFIG_VERSION} \ && ./configure \ --disable-nls \ @@ -239,7 +244,8 @@ ENV PKG_CONFIG_PATH="${MY_MINGW_DIR}/lib/pkgconfig:${MY_MINGW_DIR}/lib64/pkgconf ARG ZLIB_VERSION ENV MY_ZLIB_VERSION=${ZLIB_VERSION} -RUN tar xvzf /3rd_party/mingw64/zlib-${MY_ZLIB_VERSION}.tar.gz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./zlib-${MY_ZLIB_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/mingw64/zlib-${MY_ZLIB_VERSION}.tar.gz \ && cd zlib-${MY_ZLIB_VERSION} \ && mkdir build \ && cd build \ @@ -257,7 +263,8 @@ RUN tar xvzf /3rd_party/mingw64/zlib-${MY_ZLIB_VERSION}.tar.gz \ ARG LIBJPEG_TURBO_VERSION ENV MY_LIBJPEG_TURBO_VERSION=${LIBJPEG_TURBO_VERSION} RUN if [ -f "/3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz \ && cd libjpeg-turbo-${MY_LIBJPEG_TURBO_VERSION} \ && mkdir _build \ && cd _build \ @@ -280,7 +287,8 @@ RUN if [ -f "/3rd_party/libjpeg_turbo-${MY_LIBJPEG_TURBO_VERSION}.tar.gz" ]; the ARG LIBPNG_VERSION ENV MY_LIBPNG_VERSION=${LIBPNG_VERSION} RUN if [ -f "/3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./libpng-v${MY_LIBPNG_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz \ && cd libpng-${MY_LIBPNG_VERSION} \ && mkdir _build \ && cd _build \ @@ -304,7 +312,8 @@ RUN if [ -f "/3rd_party/libpng-v${MY_LIBPNG_VERSION}.tar.gz" ]; then \ ARG FREETYPE2_VERSION ENV MY_FREETYPE2_VERSION=${FREETYPE2_VERSION} RUN if [ -f "/3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./freetype-${MY_FREETYPE2_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz \ && cd freetype-${MY_FREETYPE2_VERSION} \ && meson setup \ --cross-file ${MY_TOOLCHAIN_FILE_MESON} \ @@ -320,8 +329,9 @@ RUN if [ -f "/3rd_party/freetype-${MY_FREETYPE2_VERSION}.tar.gz" ]; then \ ARG EXPAT_VERSION ENV MY_EXPAT_VERSION=${EXPAT_VERSION} -RUN tar xvzf /3rd_party/mingw64/expat-${MY_EXPAT_VERSION}.tar.gz \ - && cd expat-${MY_EXPAT_VERSION} \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./expat-${MY_EXPAT_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/mingw64/expat-${MY_EXPAT_VERSION}.tar.gz \ + && cd libexpat-*/expat \ && mkdir build \ && cd build \ && cmake .. \ @@ -336,12 +346,13 @@ RUN tar xvzf /3rd_party/mingw64/expat-${MY_EXPAT_VERSION}.tar.gz \ && make -j${MY_NUM_JOBS} \ && make install \ && cd ${MY_WORKDIR} \ - && rm -r expat-${MY_EXPAT_VERSION} + && rm -r libexpat-* ARG FONTCONFIG_VERSION ENV MY_FONTCONFIG_VERSION=${FONTCONFIG_VERSION} RUN if [ -f "/3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz \ && cd fontconfig-${MY_FONTCONFIG_VERSION} \ && meson setup \ --cross-file ${MY_TOOLCHAIN_FILE_MESON} \ @@ -361,7 +372,8 @@ RUN if [ -f "/3rd_party/fontconfig-${MY_FONTCONFIG_VERSION}.tar.gz" ]; then \ ARG OPENAL_VERSION ENV MY_OPENAL_VERSION=${OPENAL_VERSION} RUN if [ -f "/3rd_party/openal-${MY_OPENAL_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/openal-${MY_OPENAL_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./openal-${MY_OPENAL_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/openal-${MY_OPENAL_VERSION}.tar.gz \ && cd openal-soft-${MY_OPENAL_VERSION} \ && mkdir _build \ && cd _build \ @@ -378,7 +390,8 @@ RUN if [ -f "/3rd_party/openal-${MY_OPENAL_VERSION}.tar.gz" ]; then \ ARG ICU_VERSION ENV MY_ICU_VERSION=${ICU_VERSION} -RUN tar xvzf /3rd_party/mingw64/icu-release-${MY_ICU_VERSION}.tar.gz \ +RUN cd /3rd_party/mingw64 && sha256sum -c ./icu-release-${MY_ICU_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/mingw64/icu-release-${MY_ICU_VERSION}.tar.gz \ && cp -r icu-release-${MY_ICU_VERSION} icu-release-${MY_ICU_VERSION}-cross \ && cd icu-release-${MY_ICU_VERSION}-cross/icu4c/source \ && CXXFLAGS="-std=gnu++17" ./configure \ @@ -411,7 +424,8 @@ RUN cd ${MY_WORKDIR} \ ARG OPENSSL_VERSION ENV MY_OPENSSL_VERSION=${OPENSSL_VERSION} RUN if [ -f "/3rd_party/openssl-${MY_OPENSSL_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/openssl-${MY_OPENSSL_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./openssl-${MY_OPENSSL_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/openssl-${MY_OPENSSL_VERSION}.tar.gz \ && cd openssl-${MY_OPENSSL_VERSION} \ && ./Configure \ --cross-compile-prefix=${MY_MINGW_PREFIX}- \ @@ -434,13 +448,14 @@ ARG BOOST2_PATCH_VERSION ENV MY_BOOST2_PATCH_VERSION=${BOOST2_PATCH_VERSION} ENV MY_BOOST2_VERSION=${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSION}_${MY_BOOST2_PATCH_VERSION} RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSION}_${MY_BOOST2_PATCH_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSION}_${MY_BOOST2_PATCH_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSION}_${MY_BOOST2_PATCH_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSION}_${MY_BOOST2_PATCH_VERSION}.tar.gz \ && cd boost_${MY_BOOST2_VERSION} \ && ./bootstrap.sh \ --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread \ address-model=64 \ - cxxstd=${MY_CXX_STANDARD} \ - cxxstd-dialect=gnu \ + cxxstd=${MY_CXX_STANDARD} \ + cxxstd-dialect=gnu \ architecture=x86 \ link=static,shared \ target-os=windows \ @@ -453,8 +468,8 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSI --prefix=${MY_MINGW_DIR} \ -j${MY_NUM_JOBS} \ address-model=64 \ - cxxstd=${MY_CXX_STANDARD} \ - cxxstd-dialect=gnu \ + cxxstd=${MY_CXX_STANDARD} \ + cxxstd-dialect=gnu \ architecture=x86 \ link=static,shared \ target-os=windows \ @@ -474,7 +489,8 @@ ARG BOOST_PATCH_VERSION ENV MY_BOOST_PATCH_VERSION=${BOOST_PATCH_VERSION} ENV MY_BOOST_VERSION=${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION}_${MY_BOOST_PATCH_VERSION} RUN if [ -f "/3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION}_${MY_BOOST_PATCH_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION}_${MY_BOOST_PATCH_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION}_${MY_BOOST_PATCH_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION}_${MY_BOOST_PATCH_VERSION}.tar.gz \ && cd boost_${MY_BOOST_VERSION} \ && echo "using gcc : gcc : ${MY_MINGW_PREFIX}-g++ ;" \ >./user-config.jam \ @@ -509,7 +525,8 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION ARG OGG_VERSION ENV MY_OGG_VERSION=${OGG_VERSION} RUN if [ -f "/3rd_party/ogg-v${MY_OGG_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/ogg-v${MY_OGG_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./ogg-v${MY_OGG_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/ogg-v${MY_OGG_VERSION}.tar.gz \ && cd ogg-${MY_OGG_VERSION} \ && mkdir build \ && cd build \ @@ -528,7 +545,8 @@ RUN if [ -f "/3rd_party/ogg-v${MY_OGG_VERSION}.tar.gz" ]; then \ ARG VORBIS_VERSION ENV MY_VORBIS_VERSION=${VORBIS_VERSION} RUN if [ -f "/3rd_party/vorbis-v${MY_VORBIS_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/vorbis-v${MY_VORBIS_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./vorbis-v${MY_VORBIS_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/vorbis-v${MY_VORBIS_VERSION}.tar.gz \ && cd vorbis-${MY_VORBIS_VERSION} \ && mkdir build \ && cd build \ @@ -546,7 +564,8 @@ RUN if [ -f "/3rd_party/vorbis-v${MY_VORBIS_VERSION}.tar.gz" ]; then \ ARG FLAC_VERSION ENV MY_FLAC_VERSION=${FLAC_VERSION} RUN if [ -f "/3rd_party/flac-${MY_FLAC_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/flac-${MY_FLAC_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./flac-${MY_FLAC_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/flac-${MY_FLAC_VERSION}.tar.gz \ && cd flac-${MY_FLAC_VERSION} \ && mkdir build \ && cd build \ @@ -570,7 +589,8 @@ RUN if [ -f "/3rd_party/flac-${MY_FLAC_VERSION}.tar.gz" ]; then \ ARG SFML_VERSION ENV MY_SFML_VERSION=${SFML_VERSION} RUN if [ -f "/3rd_party/SFML-${MY_SFML_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/SFML-${MY_SFML_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./SFML-${MY_SFML_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/SFML-${MY_SFML_VERSION}.tar.gz \ && cd SFML-${MY_SFML_VERSION} \ && sed -i s/set_target_properties\(\$\{target\}\ PROPERTIES\ PREFIX\ \"\"\)// \ cmake/Macros.cmake \ @@ -593,7 +613,8 @@ RUN if [ -f "/3rd_party/SFML-${MY_SFML_VERSION}.tar.gz" ]; then \ ARG SPDLOG_VERSION ENV MY_SPDLOG_VERSION=${SPDLOG_VERSION} RUN if [ -f "/3rd_party/spdlog-${MY_SPDLOG_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/spdlog-${MY_SPDLOG_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./spdlog-${MY_SPDLOG_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/spdlog-${MY_SPDLOG_VERSION}.tar.gz \ && cd spdlog-${MY_SPDLOG_VERSION} \ && mkdir build \ && cd build \ @@ -614,7 +635,8 @@ RUN if [ -f "/3rd_party/spdlog-${MY_SPDLOG_VERSION}.tar.gz" ]; then \ ARG CLI11_VERSION ENV MY_CLI11_VERSION=${CLI11_VERSION} RUN if [ -f "/3rd_party/CLI11-${MY_CLI11_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/CLI11-${MY_CLI11_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./CLI11-${MY_CLI11_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/CLI11-${MY_CLI11_VERSION}.tar.gz \ && cd CLI11-${MY_CLI11_VERSION} \ && mkdir build \ && cd build \ @@ -637,9 +659,12 @@ RUN if [ -f "/3rd_party/CLI11-${MY_CLI11_VERSION}.tar.gz" ]; then \ ARG CURL_VERSION ENV MY_CURL_VERSION=${CURL_VERSION} +ARG CURL2_VERSION +ENV MY_CURL2_VERSION=${CURL2_VERSION} RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/curl-${MY_CURL_VERSION}.tar.gz \ - && cd curl-${MY_CURL_VERSION} \ + cd /3rd_party && sha256sum -c ./curl-${MY_CURL_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/curl-${MY_CURL_VERSION}.tar.gz \ + && cd curl-curl-${MY_CURL2_VERSION} \ && mkdir build \ && cd build \ && cmake .. \ @@ -664,13 +689,14 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \ && make -j${MY_NUM_JOBS} \ && make install \ && cd ${MY_WORKDIR} \ - && rm -r curl-${MY_CURL_VERSION} \ + && rm -r curl-curl-${MY_CURL2_VERSION} \ ; fi ARG CPP_HTTPLIB_VERSION ENV MY_CPP_HTTPLIB_VERSION=${CPP_HTTPLIB_VERSION} RUN if [ -f "/3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz \ && cd cpp-httplib-${MY_CPP_HTTPLIB_VERSION} \ && mkdir build \ && cd build \ @@ -692,7 +718,8 @@ RUN if [ -f "/3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz" ]; then \ ARG FMT_VERSION ENV MY_FMT_VERSION=${FMT_VERSION} RUN if [ -f "/3rd_party/fmt-${MY_FMT_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/fmt-${MY_FMT_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./fmt-${MY_FMT_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/fmt-${MY_FMT_VERSION}.tar.gz \ && cd fmt-${MY_FMT_VERSION} \ && mkdir build \ && cd build \ @@ -713,7 +740,8 @@ RUN if [ -f "/3rd_party/fmt-${MY_FMT_VERSION}.tar.gz" ]; then \ ARG GTEST_VERSION ENV MY_GTEST_VERSION=${GTEST_VERSION} RUN if [ -f "/3rd_party/googletest-${MY_GTEST_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/googletest-${MY_GTEST_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./googletest-${MY_GTEST_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/googletest-${MY_GTEST_VERSION}.tar.gz \ && cd googletest-${MY_GTEST_VERSION} \ && mkdir build \ && cd build \ @@ -731,7 +759,8 @@ RUN if [ -f "/3rd_party/googletest-${MY_GTEST_VERSION}.tar.gz" ]; then \ ARG JSON_VERSION ENV MY_JSON_VERSION=${JSON_VERSION} RUN if [ -f "/3rd_party/json-${MY_JSON_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/json-${MY_JSON_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./json-${MY_JSON_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/json-${MY_JSON_VERSION}.tar.gz \ && cd json-${MY_JSON_VERSION} \ && mkdir build \ && cd build \ @@ -752,7 +781,8 @@ RUN if [ -f "/3rd_party/json-${MY_JSON_VERSION}.tar.gz" ]; then \ ARG LIBEVENT_VERSION ENV MY_LIBEVENT_VERSION=${LIBEVENT_VERSION} RUN if [ -f "/3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz" ]; then \ - tar xvzf /3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz \ + cd /3rd_party && sha256sum -c ./libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz \ && cd libevent-${MY_LIBEVENT_VERSION}-stable \ && mkdir build \ && cd build \ @@ -774,8 +804,9 @@ RUN if [ -f "/3rd_party/libevent-${MY_LIBEVENT_VERSION}-stable.tar.gz" ]; then \ ARG LIBSODIUM_VERSION ENV MY_LIBSODIUM_VERSION=${LIBSODIUM_VERSION} RUN if [ -f "/3rd_party/libsodium-${MY_LIBSODIUM_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/libsodium-${MY_LIBSODIUM_VERSION}.tar.gz \ - && cd libsodium-${MY_LIBSODIUM_VERSION} \ + cd /3rd_party && sha256sum -c ./libsodium-${MY_LIBSODIUM_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libsodium-${MY_LIBSODIUM_VERSION}.tar.gz \ + && cd libsodium-${MY_LIBSODIUM_VERSION}-RELEASE \ && CFLAGS="-O3 -fomit-frame-pointer -m64 -mtune=generic" ./configure \ --enable-shared=yes \ --enable-static=yes \ @@ -784,13 +815,14 @@ RUN if [ -f "/3rd_party/libsodium-${MY_LIBSODIUM_VERSION}.tar.gz" ]; then \ && make -j${MY_NUM_JOBS} \ && make install \ && cd ${MY_WORKDIR} \ - && rm -r libsodium-${MY_LIBSODIUM_VERSION} \ + && rm -r libsodium-${MY_LIBSODIUM_VERSION}-RELEASE \ ; fi ARG NUSPELL_VERSION ENV MY_NUSPELL_VERSION=${NUSPELL_VERSION} RUN if [ -f "/3rd_party/nuspell-v${MY_NUSPELL_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/nuspell-v${MY_NUSPELL_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./nuspell-v${MY_NUSPELL_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/nuspell-v${MY_NUSPELL_VERSION}.tar.gz \ && cd nuspell-${MY_NUSPELL_VERSION} \ && mkdir build \ && cd build \ @@ -810,7 +842,8 @@ RUN if [ -f "/3rd_party/nuspell-v${MY_NUSPELL_VERSION}.tar.gz" ]; then \ ARG PUGIXML_VERSION ENV MY_PUGIXML_VERSION=${PUGIXML_VERSION} RUN if [ -f "/3rd_party/pugixml-${MY_PUGIXML_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/pugixml-${MY_PUGIXML_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./pugixml-${MY_PUGIXML_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/pugixml-${MY_PUGIXML_VERSION}.tar.gz \ && cd pugixml-${MY_PUGIXML_VERSION} \ && mkdir build \ && cd build \ @@ -828,7 +861,8 @@ RUN if [ -f "/3rd_party/pugixml-${MY_PUGIXML_VERSION}.tar.gz" ]; then \ ARG ROCKSDB_VERSION ENV MY_ROCKSDB_VERSION=${ROCKSDB_VERSION} RUN if [ -f "/3rd_party/rocksdb-${MY_ROCKSDB_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/rocksdb-${MY_ROCKSDB_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./rocksdb-${MY_ROCKSDB_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/rocksdb-${MY_ROCKSDB_VERSION}.tar.gz \ && cd rocksdb-${MY_ROCKSDB_VERSION} \ && echo -e "add_definitions(-include cstdint)">>CMakeLists.txt \ && mkdir build \ @@ -861,7 +895,8 @@ RUN if [ -f "/3rd_party/rocksdb-${MY_ROCKSDB_VERSION}.tar.gz" ]; then \ ARG SECP256K1_VERSION ENV MY_SECP256K1_VERSION=${SECP256K1_VERSION} RUN if [ -f "/3rd_party/secp256k1-${MY_SECP256K1_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/secp256k1-${MY_SECP256K1_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./secp256k1-${MY_SECP256K1_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/secp256k1-${MY_SECP256K1_VERSION}.tar.gz \ && cd secp256k1-${MY_SECP256K1_VERSION} \ && ./autogen.sh && ./configure \ --host=${MY_MINGW_PREFIX} \ @@ -879,7 +914,8 @@ RUN if [ -f "/3rd_party/secp256k1-${MY_SECP256K1_VERSION}.tar.gz" ]; then \ ARG STDUUID_VERSION ENV MY_STDUUID_VERSION=${STDUUID_VERSION} RUN if [ -f "/3rd_party/stduuid-${MY_STDUUID_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/stduuid-${MY_STDUUID_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./stduuid-${MY_STDUUID_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/stduuid-${MY_STDUUID_VERSION}.tar.gz \ && cd stduuid-${MY_STDUUID_VERSION} \ && mkdir build \ && cd build \ @@ -898,7 +934,8 @@ RUN if [ -f "/3rd_party/stduuid-${MY_STDUUID_VERSION}.tar.gz" ]; then \ ; fi RUN if [ -f "/3rd_party/tiny-process-library.tar.gz" ]; then \ - tar xvzf /3rd_party/tiny-process-library.tar.gz \ + cd /3rd_party && sha256sum -c ./tiny-process-library.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/tiny-process-library.tar.gz \ && cd tiny-process-library-master \ && mkdir build \ && cd build \ @@ -919,7 +956,8 @@ RUN if [ -f "/3rd_party/tiny-process-library.tar.gz" ]; then \ ARG WXWIDGETS_VERSION ENV MY_WXWIDGETS_VERSION=${WXWIDGETS_VERSION} RUN if [ -f "/3rd_party/wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2" ]; then \ - tar xvjf /3rd_party/wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2 \ + cd /3rd_party && sha256sum -c ./wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2.sha256 && cd - \ + && tar xvjf /3rd_party/wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2 \ && cd wxWidgets-${MY_WXWIDGETS_VERSION} \ && mkdir _build \ && cd _build \ @@ -941,7 +979,8 @@ RUN if [ -f "/3rd_party/wxWidgets-${MY_WXWIDGETS_VERSION}.tar.bz2" ]; then \ ARG CXXOPTS_VERSION ENV MY_CXXOPTS_VERSION=${CXXOPTS_VERSION} RUN if [ -f "/3rd_party/cxxopts-v${MY_CXXOPTS_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/cxxopts-v${MY_CXXOPTS_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./cxxopts-v${MY_CXXOPTS_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/cxxopts-v${MY_CXXOPTS_VERSION}.tar.gz \ && cd cxxopts-${MY_CXXOPTS_VERSION} \ && mkdir _build \ && cd _build \ @@ -966,7 +1005,8 @@ RUN if [ -f "/3rd_party/cxxopts-v${MY_CXXOPTS_VERSION}.tar.gz" ]; then \ ARG NANA_VERSION ENV MY_NANA_VERSION=${NANA_VERSION} RUN if [ -f "/3rd_party/nana-v${MY_NANA_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./nana-v${MY_NANA_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/nana-v${MY_NANA_VERSION}.tar.gz \ && cd nana-${MY_NANA_VERSION} \ && mkdir _build \ && cd _build \ @@ -990,7 +1030,8 @@ RUN if [ -f "/3rd_party/nana-v${MY_NANA_VERSION}.tar.gz" ]; then \ ARG SDL_VERSION ENV MY_SDL_VERSION=${SDL_VERSION} RUN if [ -f "/3rd_party/sdl-${MY_SDL_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/sdl-${MY_SDL_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./sdl-${MY_SDL_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/sdl-${MY_SDL_VERSION}.tar.gz \ && cd SDL-release-${MY_SDL_VERSION} \ && ./configure \ --host=${MY_MINGW_PREFIX} \ @@ -1006,7 +1047,8 @@ RUN if [ -f "/3rd_party/sdl-${MY_SDL_VERSION}.tar.gz" ]; then \ ARG LIBTASN_VERSION ENV MY_LIBTASN_VERSION=${LIBTASN_VERSION} RUN if [ -f "/3rd_party/libtasn1-${MY_LIBTASN_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/libtasn1-${MY_LIBTASN_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./libtasn1-${MY_LIBTASN_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libtasn1-${MY_LIBTASN_VERSION}.tar.gz \ && cd libtasn1-${MY_LIBTASN_VERSION} \ && ./configure \ --disable-doc \ @@ -1016,6 +1058,7 @@ RUN if [ -f "/3rd_party/libtasn1-${MY_LIBTASN_VERSION}.tar.gz" ]; then \ --prefix=${MY_MINGW_DIR} \ && make -j${MY_NUM_JOBS} \ && make install \ + && ln -sf ${MY_MINGW_DIR}/bin/asn1Parser.exe ${MY_MINGW_DIR}/bin/asn1Parser \ && cd ${MY_WORKDIR} \ && rm -r libtasn1-${MY_LIBTASN_VERSION} \ ; fi @@ -1023,7 +1066,8 @@ RUN if [ -f "/3rd_party/libtasn1-${MY_LIBTASN_VERSION}.tar.gz" ]; then \ ARG LIBICONV_VERSION ENV MY_LIBICONV_VERSION=${LIBICONV_VERSION} RUN if [ -f "/3rd_party/libiconv-${MY_LIBICONV_VERSION}.tar.gz" ]; then \ - tar xvzf /3rd_party/libiconv-${MY_LIBICONV_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./libiconv-${MY_LIBICONV_VERSION}.tar.gz.sha256 && cd - \ + && tar xvzf /3rd_party/libiconv-${MY_LIBICONV_VERSION}.tar.gz \ && cd libiconv-${MY_LIBICONV_VERSION} \ && ./configure \ --enable-static=yes \ @@ -1039,9 +1083,12 @@ RUN if [ -f "/3rd_party/libiconv-${MY_LIBICONV_VERSION}.tar.gz" ]; then \ ARG LIBDSM_VERSION ENV MY_LIBDSM_VERSION=${LIBDSM_VERSION} RUN if [ -f "/3rd_party/libdsm-${MY_LIBDSM_VERSION}.tar.gz" ]; then \ - tar xvxf /3rd_party/libdsm-${MY_LIBDSM_VERSION}.tar.gz \ + cd /3rd_party && sha256sum -c ./libdsm-${MY_LIBDSM_VERSION}.tar.gz.sha256 && cd - \ + && tar xvxf /3rd_party/libdsm-${MY_LIBDSM_VERSION}.tar.gz \ && cd libdsm-${MY_LIBDSM_VERSION} \ + && /3rd_party/libdsm_patch.sh /3rd_party . \ && meson setup \ + --bindir=${MY_MINGW_DIR}/bin \ --cross-file ${MY_TOOLCHAIN_FILE_MESON} \ --prefix=${MY_MINGW_DIR} \ -Dbinaries=false \ diff --git a/scripts/options.sh b/scripts/options.sh index 3a465d89..0f59b702 100755 --- a/scripts/options.sh +++ b/scripts/options.sh @@ -24,7 +24,7 @@ PROJECT_CLEANUP[CPP_HTTPLIB]="3rd_party/cpp-httplib-*" PROJECT_CLEANUP[CURL]="3rd_party/curl-*" PROJECT_CLEANUP[JSON]="3rd_party/json-*" PROJECT_CLEANUP[LIBBITCOIN_SYSTEM_ON]="3rd_party/boost_${PROJECT_VERSIONS[BOOST_MAJOR]}_${PROJECT_VERSIONS[BOOST_MINOR]}_*" -PROJECT_CLEANUP[LIBSODIUM]="3rd_party/libsodium*" +PROJECT_CLEANUP[LIBSODIUM]="3rd_party/libsodium-*:3rd_party/libsodium*" PROJECT_CLEANUP[OPENSSL]="3rd_party/openssl-*" PROJECT_CLEANUP[PUGIXML]="3rd_party/pugixml-*" PROJECT_CLEANUP[SPDLOG]="3rd_party/spdlog-*" diff --git a/scripts/versions.sh b/scripts/versions.sh index 22399e32..5bda68b6 100755 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -11,9 +11,11 @@ PROJECT_VERSIONS[BOOST_PATCH]="0" PROJECT_VERSIONS[CLI11]="2.4.2" PROJECT_VERSIONS[CPP_HTTPLIB]="0.16.3" PROJECT_VERSIONS[CURL]="8.9.1" +PROJECT_VERSIONS[CURL2]="8_9_1" PROJECT_VERSIONS[CXXOPTS]="3.2.0" PROJECT_VERSIONS[DTL]="2.01" PROJECT_VERSIONS[EXPAT]="2.6.2" +PROJECT_VERSIONS[EXPAT2]="2_6_2" PROJECT_VERSIONS[FLAC]="1.4.3" PROJECT_VERSIONS[FMT]="11.0.2" PROJECT_VERSIONS[FONTCONFIG]="2.15.0" @@ -34,7 +36,7 @@ PROJECT_VERSIONS[LIBTASN]="4.19.0" PROJECT_VERSIONS[MESA]="23.3.3" PROJECT_VERSIONS[MINGW]="11.0.1" PROJECT_VERSIONS[NANA]="1.7.4" -PROJECT_VERSIONS[NUSPELL]="5.1.4" +PROJECT_VERSIONS[NUSPELL]="5.1.6" PROJECT_VERSIONS[OGG]="1.3.5" PROJECT_VERSIONS[OPENAL]="1.23.1" PROJECT_VERSIONS[OPENSSL]="3.3.1" @@ -51,5 +53,48 @@ PROJECT_VERSIONS[VLC]="3.0" PROJECT_VERSIONS[VORBIS]="1.3.7" PROJECT_VERSIONS[WXWIDGETS]="3.2.5" PROJECT_VERSIONS[ZLIB]="1.3.1" - export PROJECT_VERSIONS + +declare -A PROJECT_DOWNLOADS +PROJECT_DOWNLOADS[BINUTILS]="https://ftp.gnu.org/gnu/binutils/binutils-${PROJECT_VERSIONS[BINUTILS]}.tar.xz;binutils-${PROJECT_VERSIONS[BINUTILS]}.tar.xz;3rd_party/mingw64" +PROJECT_DOWNLOADS[BOOST2]="https://archives.boost.io/release/${PROJECT_VERSIONS[BOOST2_MAJOR]}.${PROJECT_VERSIONS[BOOST2_MINOR]}.${PROJECT_VERSIONS[BOOST2_PATCH]}/source/boost_${PROJECT_VERSIONS[BOOST2_MAJOR]}_${PROJECT_VERSIONS[BOOST2_MINOR]}_${PROJECT_VERSIONS[BOOST2_PATCH]}.tar.gz;boost_${PROJECT_VERSIONS[BOOST2_MAJOR]}_${PROJECT_VERSIONS[BOOST2_MINOR]}_${PROJECT_VERSIONS[BOOST2_PATCH]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[BOOST]="https://archives.boost.io/release/${PROJECT_VERSIONS[BOOST_MAJOR]}.${PROJECT_VERSIONS[BOOST_MINOR]}.${PROJECT_VERSIONS[BOOST_PATCH]}/source/boost_${PROJECT_VERSIONS[BOOST_MAJOR]}_${PROJECT_VERSIONS[BOOST_MINOR]}_${PROJECT_VERSIONS[BOOST_PATCH]}.tar.gz;boost_${PROJECT_VERSIONS[BOOST_MAJOR]}_${PROJECT_VERSIONS[BOOST_MINOR]}_${PROJECT_VERSIONS[BOOST_PATCH]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[CLI11]="https://github.com/CLIUtils/CLI11/archive/refs/tags/v${PROJECT_VERSIONS[CLI11]}.tar.gz;CLI11-${PROJECT_VERSIONS[CLI11]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[CPP_HTTPLIB]="https://github.com/yhirose/cpp-httplib/archive/refs/tags/v${PROJECT_VERSIONS[CPP_HTTPLIB]}.tar.gz;cpp-httplib-${PROJECT_VERSIONS[CPP_HTTPLIB]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[CURL]="https://github.com/curl/curl/archive/refs/tags/curl-${PROJECT_VERSIONS[CURL2]}.tar.gz;curl-${PROJECT_VERSIONS[CURL]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[CXXOPTS]="https://github.com/jarro2783/cxxopts/archive/refs/tags/v${PROJECT_VERSIONS[CXXOPTS]}.tar.gz;cxxopts-v${PROJECT_VERSIONS[CXXOPTS]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[EXPAT]="https://github.com/libexpat/libexpat/archive/refs/tags/R_${PROJECT_VERSIONS[EXPAT2]}.tar.gz;expat-${PROJECT_VERSIONS[EXPAT]}.tar.gz;3rd_party/mingw64" +PROJECT_DOWNLOADS[FLAC]="https://github.com/xiph/flac/archive/refs/tags/${PROJECT_VERSIONS[FLAC]}.tar.gz;flac-${PROJECT_VERSIONS[FLAC]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[FMT]="https://github.com/fmtlib/fmt/archive/refs/tags/${PROJECT_VERSIONS[FMT]}.tar.gz;fmt-${PROJECT_VERSIONS[FMT]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[FONTCONFIG]="https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.gz;fontconfig-${PROJECT_VERSIONS[FONTCONFIG]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[FREETYPE2]="https://download.savannah.gnu.org/releases/freetype/freetype-${PROJECT_VERSIONS[FREETYPE2]}.tar.gz;freetype-${PROJECT_VERSIONS[FREETYPE2]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[GCC]="https://ftp.gnu.org/gnu/gcc/gcc-${PROJECT_VERSIONS[GCC]}/gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;3rd_party/mingw64" +PROJECT_DOWNLOADS[GTEST]="https://github.com/google/googletest/archive/refs/tags/v${PROJECT_VERSIONS[GTEST]}.tar.gz;googletest-${PROJECT_VERSIONS[GTEST]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[ICU]="https://github.com/unicode-org/icu/archive/refs/tags/release-${PROJECT_VERSIONS[ICU]}.tar.gz;icu-release-${PROJECT_VERSIONS[ICU]}.tar.gz;3rd_party/mingw64" +PROJECT_DOWNLOADS[JSON]="https://github.com/nlohmann/json/archive/refs/tags/v${PROJECT_VERSIONS[JSON]}.tar.gz;json-${PROJECT_VERSIONS[JSON]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBDSM]="https://github.com/videolabs/libdsm/archive/refs/tags/v${PROJECT_VERSIONS[LIBDSM]}.tar.gz;libdsm-${PROJECT_VERSIONS[LIBDSM]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBEVENT]="https://github.com/libevent/libevent/archive/refs/tags/release-${PROJECT_VERSIONS[LIBEVENT]}-stable.tar.gz;libevent-${PROJECT_VERSIONS[LIBEVENT]}-stable.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBICONV]="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PROJECT_VERSIONS[LIBICONV]}.tar.gz;libiconv-${PROJECT_VERSIONS[LIBICONV]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBJPEG_TURBO]="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${PROJECT_VERSIONS[LIBJPEG_TURBO]}.tar.gz;libjpeg_turbo-${PROJECT_VERSIONS[LIBJPEG_TURBO]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBPNG]="https://github.com/pnggroup/libpng/archive/refs/tags/v${PROJECT_VERSIONS[LIBPNG]}.tar.gz;libpng-v${PROJECT_VERSIONS[LIBPNG]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBSODIUM]="https://github.com/jedisct1/libsodium/archive/refs/tags/${PROJECT_VERSIONS[LIBSODIUM]}-RELEASE.tar.gz;libsodium-${PROJECT_VERSIONS[LIBSODIUM]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[LIBTASN]="https://ftp.gnu.org/gnu/libtasn1/libtasn1-${PROJECT_VERSIONS[LIBTASN]}.tar.gz;libtasn1-${PROJECT_VERSIONS[LIBTASN]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[MINGW]="https://phoenixnap.dl.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PROJECT_VERSIONS[MINGW]}.tar.bz2;mingw-w64-v${PROJECT_VERSIONS[MINGW]}.tar.bz2;3rd_party/mingw64" +PROJECT_DOWNLOADS[NANA]="https://github.com/cnjinhao/nana/archive/refs/tags/v${PROJECT_VERSIONS[NANA]}.4.tar.gz;nana-v${PROJECT_VERSIONS[NANA]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[NUSPELL]="https://github.com/nuspell/nuspell/archive/refs/tags/v${PROJECT_VERSIONS[NUSPELL]}.tar.gz;nuspell-v${PROJECT_VERSIONS[NUSPELL]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[OGG]="https://github.com/xiph/ogg/releases/download/v${PROJECT_VERSIONS[OGG]}/libogg-${PROJECT_VERSIONS[OGG]}.tar.gz;ogg-v${PROJECT_VERSIONS[OGG]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[OPENAL]="https://github.com/kcat/openal-soft/archive/refs/tags/${PROJECT_VERSIONS[OPENAL]}.tar.gz;openal-${PROJECT_VERSIONS[OPENAL]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[OPENSSL]="https://github.com/openssl/openssl/releases/download/openssl-${PROJECT_VERSIONS[OPENSSL]}/openssl-${PROJECT_VERSIONS[OPENSSL]}.tar.gz;openssl-${PROJECT_VERSIONS[OPENSSL]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[PKG_CONFIG]="https://pkgconfig.freedesktop.org/releases/pkg-config-${PROJECT_VERSIONS[PKG_CONFIG]}.tar.gz;pkg-config-${PROJECT_VERSIONS[PKG_CONFIG]}.tar.gz;3rd_party/mingw64" +PROJECT_DOWNLOADS[PUGIXML]="https://github.com/zeux/pugixml/releases/download/v${PROJECT_VERSIONS[PUGIXML]}/pugixml-${PROJECT_VERSIONS[PUGIXML]}.tar.gz;pugixml-${PROJECT_VERSIONS[PUGIXML]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[ROCKSDB]="https://github.com/facebook/rocksdb/archive/refs/tags/${PROJECT_VERSIONS[ROCKSDB]}.tar.gz;rocksdb-${PROJECT_VERSIONS[ROCKSDB]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[SDL]="https://github.com/libsdl-org/SDL/archive/refs/tags/release-${PROJECT_VERSIONS[SDL]}.tar.gz;sdl-${PROJECT_VERSIONS[SDL]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[SECP256K1]="https://github.com/libbitcoin/secp256k1/archive/refs/tags/v${PROJECT_VERSIONS[SECP256K1]}.tar.gz;secp256k1-${PROJECT_VERSIONS[SECP256K1]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[SFML]="https://github.com/SFML/SFML/archive/refs/tags/${PROJECT_VERSIONS[SFML]}.tar.gz;SFML-${PROJECT_VERSIONS[SFML]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[SPDLOG]="https://github.com/gabime/spdlog/archive/refs/tags/v${PROJECT_VERSIONS[SPDLOG]}.tar.gz;spdlog-${PROJECT_VERSIONS[SPDLOG]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[SQLITE]="https://www.sqlite.org/2024/sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;sqlite-amalgamation-${PROJECT_VERSIONS[SQLITE]}.zip;3rd_party" +PROJECT_DOWNLOADS[STDUUID]="https://github.com/mariusbancila/stduuid/archive/refs/tags/v${PROJECT_VERSIONS[STDUUID]}.tar.gz;stduuid-${PROJECT_VERSIONS[STDUUID]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[VORBIS]="https://github.com/xiph/vorbis/archive/refs/tags/v${PROJECT_VERSIONS[VORBIS]}.tar.gz;vorbis-v${PROJECT_VERSIONS[VORBIS]}.tar.gz;3rd_party" +PROJECT_DOWNLOADS[WXWIDGETS]="https://github.com/wxWidgets/wxWidgets/releases/download/v${PROJECT_VERSIONS[WXWIDGETS]}/wxWidgets-${PROJECT_VERSIONS[WXWIDGETS]}.tar.bz2;wxWidgets-${PROJECT_VERSIONS[WXWIDGETS]}.tar.bz2;3rd_party" +PROJECT_DOWNLOADS[ZLIB]="https://github.com/madler/zlib/archive/refs/tags/v${PROJECT_VERSIONS[ZLIB]}.tar.gz;zlib-${PROJECT_VERSIONS[ZLIB]}.tar.gz;3rd_party/mingw64" +export PROJECT_DOWNLOADS diff --git a/support/3rd_party/curl-8.9.1.tar.gz b/support/3rd_party/curl-8.9.1.tar.gz index 602cac7d..d357899e 100644 Binary files a/support/3rd_party/curl-8.9.1.tar.gz and b/support/3rd_party/curl-8.9.1.tar.gz differ diff --git a/support/3rd_party/curl-8.9.1.tar.gz.sha256 b/support/3rd_party/curl-8.9.1.tar.gz.sha256 index fc817fc9..81a3824b 100644 --- a/support/3rd_party/curl-8.9.1.tar.gz.sha256 +++ b/support/3rd_party/curl-8.9.1.tar.gz.sha256 @@ -1 +1 @@ -291124a007ee5111997825940b3876b3048f7d31e73e9caa681b80fe48b2dcd5 curl-8.9.1.tar.gz +d714818f6ac41ae9154850158fed44b7a87650a6d52f83d3bcb9aa527be354d7 curl-8.9.1.tar.gz diff --git a/support/3rd_party/json-3.11.3.tar.gz.sha256 b/support/3rd_party/json-3.11.3.tar.gz.sha256 index e7852dbf..bff77da4 100644 --- a/support/3rd_party/json-3.11.3.tar.gz.sha256 +++ b/support/3rd_party/json-3.11.3.tar.gz.sha256 @@ -1 +1 @@ -0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 *json-3.11.3.tar.gz +0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406 json-3.11.3.tar.gz diff --git a/support/3rd_party/libsodium-1.0.20.tar.gz b/support/3rd_party/libsodium-1.0.20.tar.gz index 2f6efbdb..ce186739 100644 Binary files a/support/3rd_party/libsodium-1.0.20.tar.gz and b/support/3rd_party/libsodium-1.0.20.tar.gz differ diff --git a/support/3rd_party/libsodium-1.0.20.tar.gz.sha256 b/support/3rd_party/libsodium-1.0.20.tar.gz.sha256 index 880c6610..5fddcda5 100644 --- a/support/3rd_party/libsodium-1.0.20.tar.gz.sha256 +++ b/support/3rd_party/libsodium-1.0.20.tar.gz.sha256 @@ -1 +1 @@ -ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19 *libsodium-1.0.20.tar.gz +8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1 libsodium-1.0.20.tar.gz diff --git a/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 b/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 index 16601147..09a6ce51 100644 --- a/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 +++ b/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 @@ -1 +1 @@ -ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450 *binutils-2.41.tar.xz +ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450 binutils-2.41.tar.xz diff --git a/support/3rd_party/mingw64/expat-2.6.2.tar.gz b/support/3rd_party/mingw64/expat-2.6.2.tar.gz index d9310666..4edd900c 100644 Binary files a/support/3rd_party/mingw64/expat-2.6.2.tar.gz and b/support/3rd_party/mingw64/expat-2.6.2.tar.gz differ diff --git a/support/3rd_party/mingw64/expat-2.6.2.tar.gz.sha256 b/support/3rd_party/mingw64/expat-2.6.2.tar.gz.sha256 index ad0aa246..14662b3e 100644 --- a/support/3rd_party/mingw64/expat-2.6.2.tar.gz.sha256 +++ b/support/3rd_party/mingw64/expat-2.6.2.tar.gz.sha256 @@ -1 +1 @@ -d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3 expat-2.6.2.tar.gz +fbd032683370d761ba68dba2566d3280a154f5290634172d60a79b24d366d9dc expat-2.6.2.tar.gz diff --git a/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz b/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz deleted file mode 100644 index 73aad9f1..00000000 Binary files a/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz and /dev/null differ diff --git a/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz.sha256 b/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz.sha256 deleted file mode 100644 index 8030a39a..00000000 --- a/support/3rd_party/mingw64/mingw-w64-11.0.1.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -9c82a58713786c95b0594443a1c6190cd986401ed2b03677a90acc470140af28 *mingw-w64-11.0.1.tar.gz diff --git a/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 b/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 new file mode 100644 index 00000000..403fddb4 Binary files /dev/null and b/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 differ diff --git a/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2.sha256 b/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2.sha256 new file mode 100644 index 00000000..15f920f1 --- /dev/null +++ b/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2.sha256 @@ -0,0 +1 @@ +3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10 mingw-w64-v11.0.1.tar.bz2 diff --git a/support/3rd_party/mingw64/pkg-config-0.29.2.tar.gz.sha256 b/support/3rd_party/mingw64/pkg-config-0.29.2.tar.gz.sha256 index b4d64c05..d23b500e 100644 --- a/support/3rd_party/mingw64/pkg-config-0.29.2.tar.gz.sha256 +++ b/support/3rd_party/mingw64/pkg-config-0.29.2.tar.gz.sha256 @@ -1 +1 @@ -6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 *pkg-config-0.29.2.tar.gz +6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 pkg-config-0.29.2.tar.gz diff --git a/support/3rd_party/mingw64/zlib-1.3.1.tar.gz b/support/3rd_party/mingw64/zlib-1.3.1.tar.gz index 53fa48bf..9c29e948 100644 Binary files a/support/3rd_party/mingw64/zlib-1.3.1.tar.gz and b/support/3rd_party/mingw64/zlib-1.3.1.tar.gz differ diff --git a/support/3rd_party/mingw64/zlib-1.3.1.tar.gz.sha256 b/support/3rd_party/mingw64/zlib-1.3.1.tar.gz.sha256 index e03ea2c2..9440c847 100644 --- a/support/3rd_party/mingw64/zlib-1.3.1.tar.gz.sha256 +++ b/support/3rd_party/mingw64/zlib-1.3.1.tar.gz.sha256 @@ -1 +1 @@ -9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 zlib-1.3.1.tar.gz +17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c zlib-1.3.1.tar.gz diff --git a/support/3rd_party/openssl-3.3.1.tar.gz.sha256 b/support/3rd_party/openssl-3.3.1.tar.gz.sha256 index f41b9b64..1fdc8443 100644 --- a/support/3rd_party/openssl-3.3.1.tar.gz.sha256 +++ b/support/3rd_party/openssl-3.3.1.tar.gz.sha256 @@ -1 +1 @@ -777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e *openssl-3.3.1.tar.gz +777cd596284c883375a2a7a11bf5d2786fc5413255efab20c50d6ffe6d020b7e openssl-3.3.1.tar.gz diff --git a/support/3rd_party/pugixml-1.14.tar.gz.sha256 b/support/3rd_party/pugixml-1.14.tar.gz.sha256 index e57e747c..bad0993f 100644 --- a/support/3rd_party/pugixml-1.14.tar.gz.sha256 +++ b/support/3rd_party/pugixml-1.14.tar.gz.sha256 @@ -1 +1 @@ -2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 ./pugixml-1.14.tar.gz +2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 pugixml-1.14.tar.gz diff --git a/support/3rd_party/spdlog-1.14.1.tar.gz.sha256 b/support/3rd_party/spdlog-1.14.1.tar.gz.sha256 index abd59d97..28c68fea 100644 --- a/support/3rd_party/spdlog-1.14.1.tar.gz.sha256 +++ b/support/3rd_party/spdlog-1.14.1.tar.gz.sha256 @@ -1 +1 @@ -1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b *spdlog-1.14.1.tar.gz +1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b spdlog-1.14.1.tar.gz diff --git a/support/3rd_party/stduuid-1.2.3.tar.gz.sha256 b/support/3rd_party/stduuid-1.2.3.tar.gz.sha256 index ec4b19c8..3d4a3e09 100644 --- a/support/3rd_party/stduuid-1.2.3.tar.gz.sha256 +++ b/support/3rd_party/stduuid-1.2.3.tar.gz.sha256 @@ -1 +1 @@ -b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3 *stduuid-1.2.3.tar.gz +b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3 stduuid-1.2.3.tar.gz