diff --git a/cmake/hashes.cmake b/cmake/hashes.cmake index 096bfdd8..9fbd0b43 100644 --- a/cmake/hashes.cmake +++ b/cmake/hashes.cmake @@ -1,15 +1,15 @@ -set(BINUTILS_HASH ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450) -set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d) +set(BINUTILS_HASH b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365) set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca) +set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d) set(CPP_HTTPLIB_HASH 405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00) set(CURL_HASH 5a231145114589491fc52da118f9c7ef8abee885d1cb1ced99c7290e9a352f07) set(EXPAT_HASH 372b18f6527d162fa9658f1c74d22a37429b82d822f5a1e1fc7e00f6045a06a2) set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293) set(GTEST_HASH 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926) -set(ICU_HASH 925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e) +set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2) set(JSON_HASH 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406) set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1) -set(MINGW_HASH 3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10) +set(MINGW_HASH 30e5aad2c48dd318150f79cff47661232c4175876d6b4d6b270961cf2b49a48b) set(OPENSSL_HASH e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf) set(PKG_CONFIG_HASH 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591) set(PUGIXML_HASH 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 4584b91f..2a121d97 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,4 +1,4 @@ -set(BINUTILS_VERSION 2.41) +set(BINUTILS_VERSION 2.43) set(BOOST2_MAJOR_VERSION 1) set(BOOST2_MINOR_VERSION 76) set(BOOST2_PATCH_VERSION 0) @@ -12,11 +12,11 @@ set(EXPAT2_VERSION 2_6_4) set(EXPAT_VERSION 2.6.4) set(GCC_VERSION 14.2.0) set(GTEST_VERSION 1.15.2) -set(ICU_VERSION 75-1) +set(ICU_VERSION 76-1) set(JSON_VERSION 3.11.3) set(LIBSODIUM_VERSION 1.0.20) set(MESA_VERSION 23.3.3) -set(MINGW_VERSION 11.0.1) +set(MINGW_VERSION 12.0.0) set(OPENSSL_VERSION 3.4.0) set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.14) diff --git a/docker/aarch64/alpine b/docker/aarch64/alpine index 3cd2c4b7..eac8260c 100644 --- a/docker/aarch64/alpine +++ b/docker/aarch64/alpine @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.20.3 +FROM arm64v8/alpine:3.21.0 MAINTAINER Scott E. Graves CMD bash @@ -30,7 +30,6 @@ RUN apk add \ gflags \ gflags-dev \ git \ - gtkmm3-dev \ icu-dev \ icu-libs \ icu-static \ @@ -69,7 +68,6 @@ RUN apk add \ tcl \ tcl-dev \ texinfo \ - vlc-dev \ wget \ xz \ xz-dev \ @@ -82,3 +80,6 @@ RUN apk add \ zstd-libs \ zstd-static \ xz-static + +RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16 +RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16 diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index ac79f66b..8b3687b7 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -1,4 +1,4 @@ -FROM alpine:3.20.3 +FROM alpine:3.21.0 MAINTAINER Scott E. Graves CMD bash @@ -80,3 +80,6 @@ RUN apk add \ zstd-libs \ zstd-static \ xz-static + +RUN ln -sf /usr/bin/aclocal-1.17 /usr/bin/aclocal-1.16 +RUN ln -sf /usr/bin/automake-1.17 /usr/bin/automake-1.16 diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 3592d59e..0077c720 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1,5 +1,5 @@ #comment -FROM alpine:3.20.3 +FROM alpine:3.21.0 RUN apk update RUN apk upgrade diff --git a/scripts/versions.sh b/scripts/versions.sh index c323096a..00142118 100755 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -1,7 +1,7 @@ #!/bin/bash declare -A PROJECT_VERSIONS -PROJECT_VERSIONS[BINUTILS]="2.41" +PROJECT_VERSIONS[BINUTILS]="2.43" PROJECT_VERSIONS[BOOST2_MAJOR]="1" PROJECT_VERSIONS[BOOST2_MINOR]="76" PROJECT_VERSIONS[BOOST2_PATCH]="0" @@ -15,11 +15,11 @@ PROJECT_VERSIONS[EXPAT]="2.6.4" PROJECT_VERSIONS[EXPAT2]="2_6_4" PROJECT_VERSIONS[GCC]="14.2.0" PROJECT_VERSIONS[GTEST]="1.15.2" -PROJECT_VERSIONS[ICU]="75-1" +PROJECT_VERSIONS[ICU]="76-1" PROJECT_VERSIONS[JSON]="3.11.3" PROJECT_VERSIONS[LIBSODIUM]="1.0.20" PROJECT_VERSIONS[MESA]="23.3.3" -PROJECT_VERSIONS[MINGW]="11.0.1" +PROJECT_VERSIONS[MINGW]="12.0.0" PROJECT_VERSIONS[OPENSSL]="3.4.0" PROJECT_VERSIONS[PKG_CONFIG]="0.29.2" PROJECT_VERSIONS[PUGIXML]="1.14" @@ -43,7 +43,7 @@ PROJECT_DOWNLOADS[GTEST]="https://github.com/google/googletest/archive/refs/tags 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[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[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[MINGW]="https://sourceforge.net/projects/mingw-w64/files/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[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" diff --git a/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 b/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 deleted file mode 100644 index 09a6ce51..00000000 --- a/support/3rd_party/mingw64/binutils-2.41.tar.xz.sha256 +++ /dev/null @@ -1 +0,0 @@ -ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450 binutils-2.41.tar.xz diff --git a/support/3rd_party/mingw64/binutils-2.41.tar.xz b/support/3rd_party/mingw64/binutils-2.43.tar.xz similarity index 70% rename from support/3rd_party/mingw64/binutils-2.41.tar.xz rename to support/3rd_party/mingw64/binutils-2.43.tar.xz index 17cfb0ce..42f8fd3f 100644 Binary files a/support/3rd_party/mingw64/binutils-2.41.tar.xz and b/support/3rd_party/mingw64/binutils-2.43.tar.xz differ diff --git a/support/3rd_party/mingw64/binutils-2.43.tar.xz.sha256 b/support/3rd_party/mingw64/binutils-2.43.tar.xz.sha256 new file mode 100644 index 00000000..b432576e --- /dev/null +++ b/support/3rd_party/mingw64/binutils-2.43.tar.xz.sha256 @@ -0,0 +1 @@ +b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365 binutils-2.43.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 deleted file mode 100644 index 4edd900c..00000000 Binary files a/support/3rd_party/mingw64/expat-2.6.2.tar.gz and /dev/null 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 deleted file mode 100644 index 14662b3e..00000000 --- a/support/3rd_party/mingw64/expat-2.6.2.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -fbd032683370d761ba68dba2566d3280a154f5290634172d60a79b24d366d9dc expat-2.6.2.tar.gz diff --git a/support/3rd_party/mingw64/icu-release-75-1.tar.gz.sha256 b/support/3rd_party/mingw64/icu-release-75-1.tar.gz.sha256 deleted file mode 100644 index 7928b77b..00000000 --- a/support/3rd_party/mingw64/icu-release-75-1.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -925e6b4b8cf8856e0ac214f6f34e30dee63b7bb7a50460ab4603950eff48f89e icu-release-75-1.tar.gz diff --git a/support/3rd_party/mingw64/icu-release-75-1.tar.gz b/support/3rd_party/mingw64/icu-release-76-1.tar.gz similarity index 81% rename from support/3rd_party/mingw64/icu-release-75-1.tar.gz rename to support/3rd_party/mingw64/icu-release-76-1.tar.gz index 4046e5e9..b22aff5b 100644 Binary files a/support/3rd_party/mingw64/icu-release-75-1.tar.gz and b/support/3rd_party/mingw64/icu-release-76-1.tar.gz differ diff --git a/support/3rd_party/mingw64/icu-release-76-1.tar.gz.sha256 b/support/3rd_party/mingw64/icu-release-76-1.tar.gz.sha256 new file mode 100644 index 00000000..0dc16503 --- /dev/null +++ b/support/3rd_party/mingw64/icu-release-76-1.tar.gz.sha256 @@ -0,0 +1 @@ +a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2 icu-release-76-1.tar.gz 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 deleted file mode 100644 index 15f920f1..00000000 --- a/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10 mingw-w64-v11.0.1.tar.bz2 diff --git a/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 b/support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2 similarity index 54% rename from support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 rename to support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2 index 403fddb4..814bb6f2 100644 Binary files a/support/3rd_party/mingw64/mingw-w64-v11.0.1.tar.bz2 and b/support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2 differ diff --git a/support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2.sha256 b/support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2.sha256 new file mode 100644 index 00000000..75dfa687 --- /dev/null +++ b/support/3rd_party/mingw64/mingw-w64-v12.0.0.tar.bz2.sha256 @@ -0,0 +1 @@ +cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f mingw-w64-v12.0.0.tar.bz2