[vlc-commits] [Git][videolan/vlc][master] extras/tools: bump cmake to 3.31.8

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
ef211e7a by Steve Lhomme at 2025-07-12T19:33:08+00:00
extras/tools: bump cmake to 3.31.8

CMake 3.29.5 doesn't build with XCode 16.4.

- - - - -


3 changed files:

- extras/tools/SHA512SUMS
- extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch
- extras/tools/packages.mak


Changes:

=====================================
extras/tools/SHA512SUMS
=====================================
@@ -1,7 +1,7 @@
 3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2  apache-ant-1.9.7.tar.bz2
 3f71d459e2127ef2c98b37f11f5284f0c92318ad8d31c5b6034bed370adfe9f3d0f7a12f87e2efced06c11e2a159de4d4a292b751104e83daf11342f25ba9721  autoconf-2.72.tar.gz
 b558cf2635e40efde888d16b287a107049f8be091b3977aa138bcb3066b6f31901c77b75a25c4a87258047919c958adabe74d12458aab94acf1867ea82e2ff82  automake-1.18.tar.gz
-cf0096065b273f42bcae2bb628d4a475891e9e9a8cc9a01dabaa64d3b36dd78b4217a61c5ae86f7d8a81a12b5a4b37c09ae5ae31049d722601590aa65a395d5a  cmake-3.29.5.tar.gz
+07dbb5af1d449760ef92a921e43c0a0a091989ac51ce3f8b7607bf617b8b56e47c675486d3c620c04f1105b7dfa3852b926915e0888ff46ea473cd01e572f461  cmake-3.31.8.tar.gz
 f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2  m4-1.4.19.tar.gz
 56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a  pkg-config-0.28-1.tar.gz
 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573  sed-4.2.2.tar.bz2


=====================================
extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch
=====================================
@@ -20,32 +20,32 @@ diff --git a/Utilities/cmcurl/lib/vtls/sectransp.c b/Utilities/cmcurl/lib/vtls/s
 index 1f37305ce8..c380c134a4 100644
 --- a/Utilities/cmcurl/lib/vtls/sectransp.c
 +++ b/Utilities/cmcurl/lib/vtls/sectransp.c
-@@ -89,6 +89,7 @@
+@@ -88,6 +88,7 @@
  #define CURL_BUILD_MAC_10_9 MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
  #define CURL_BUILD_MAC_10_11 MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
  #define CURL_BUILD_MAC_10_13 MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
-+#define CURL_BUILD_MAC_10_14 MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
++#define CURL_BUILD_MAC_10_13_4 MAC_OS_X_VERSION_MAX_ALLOWED >= 101304
  #define CURL_BUILD_MAC_10_15 MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
  /* These macros mean "the following code is present to allow runtime backward
     compatibility with at least this cat or earlier":
-@@ -1805,7 +1806,7 @@ static CURLcode sectransp_connect_step1(struct Curl_cfilter *cf,
-   }
- #endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */
- 
--#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
-+#if (CURL_BUILD_MAC_10_14 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
+@@ -1091,7 +1092,7 @@ static CURLcode sectransp_connect_step1(struct Curl_cf
+   if(result != CURLE_OK)
+     return result;
+
+-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \
++#if (CURL_BUILD_MAC_10_13_4 || CURL_BUILD_IOS_11) && \
+     defined(HAVE_BUILTIN_AVAILABLE)
    if(connssl->alpn) {
      if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
-       struct alpn_proto_buf proto;
-@@ -2800,7 +2801,7 @@ check_handshake:
+@@ -2083,7 +2084,7 @@ check_handshake:
          break;
      }
- 
--#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
-+#if(CURL_BUILD_MAC_10_14 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
+
+-#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \
++#if (CURL_BUILD_MAC_10_13_4 || CURL_BUILD_IOS_11) && \
+     defined(HAVE_BUILTIN_AVAILABLE)
      if(connssl->alpn) {
        if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
-         CFArrayRef alpnArr = NULL;
--- 
+--
 2.45.0.windows.1
 


=====================================
extras/tools/packages.mak
=====================================
@@ -6,8 +6,8 @@ VIDEOLAN=https://downloads.videolan.org/pub/contrib
 NASM_VERSION=2.14
 NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
 
-CMAKE_VERSION_MAJ=3.29
-CMAKE_VERSION=$(CMAKE_VERSION_MAJ).5
+CMAKE_VERSION_MAJ=3.31
+CMAKE_VERSION=$(CMAKE_VERSION_MAJ).8
 CMAKE_URL=https://www.cmake.org/files/v$(CMAKE_VERSION_MAJ)/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.5.4



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ef211e7a79eef87c3c8be39f430bf008b7aaee87

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ef211e7a79eef87c3c8be39f430bf008b7aaee87
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance