Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
c6566cf2 by Steve Lhomme at 2024-06-16T08:46:08+00:00
extras/tools: bump cmake to 3.29.5
- - - - -
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
248cdcc9b3ee315f1508518a8edb02e891646d990ef4fc4e5444950c397f5c91e87ca3947269dc5e0de36b051914e118c66d293f2f3f0de24403d9f2ede0ece4
automake-1.16.5.tar.gz
-6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674
cmake-3.24.2.tar.gz
+cf0096065b273f42bcae2bb628d4a475891e9e9a8cc9a01dabaa64d3b36dd78b4217a61c5ae86f7d8a81a12b5a4b37c09ae5ae31049d722601590aa65a395d5a
cmake-3.29.5.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
=====================================
@@ -1,4 +1,4 @@
-From f0d87cb7c54464a1b2677346a6f53771527ad50a Mon Sep 17 00:00:00 2001
+From 9ab37d83eb74676e09e107d109be6a7dc71c25a6 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <rob...@ycbcr.xyz>
Date: Thu, 11 Jun 2020 15:09:53 +0200
Subject: [PATCH] enable ALPN support on macOS 10.14
@@ -17,10 +17,10 @@ ld: symbol(s) not found for architecture x86_64
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Utilities/cmcurl/lib/vtls/sectransp.c
b/Utilities/cmcurl/lib/vtls/sectransp.c
-index 2e57d83785..87fefba263 100644
+index 1f37305ce8..c380c134a4 100644
--- a/Utilities/cmcurl/lib/vtls/sectransp.c
+++ b/Utilities/cmcurl/lib/vtls/sectransp.c
-@@ -80,6 +80,7 @@
+@@ -89,6 +89,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
@@ -28,24 +28,24 @@ index 2e57d83785..87fefba263 100644
#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":
-@@ -1838,7 +1839,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy
*data,
+@@ -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
- if(conn->bits.tls_enable_alpn) {
+ if(connssl->alpn) {
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
- CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
-@@ -2832,7 +2833,7 @@ sectransp_connect_step2(struct Curl_easy *data, struct
connectdata *conn,
+ struct alpn_proto_buf proto;
+@@ -2800,7 +2801,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(conn->bits.tls_enable_alpn) {
+ if(connssl->alpn) {
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
CFArrayRef alpnArr = NULL;
--
-2.37.0 (Apple Git-136)
+2.45.0.windows.1
=====================================
extras/tools/packages.mak
=====================================
@@ -6,8 +6,9 @@ VIDEOLAN=http://downloads.videolan.org/pub/contrib
NASM_VERSION=2.14
NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
-CMAKE_VERSION=3.24.2
-CMAKE_URL=http://www.cmake.org/files/v3.24/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION_MAJ=3.29
+CMAKE_VERSION=$(CMAKE_VERSION_MAJ).5
+CMAKE_URL=http://www.cmake.org/files/v$(CMAKE_VERSION_MAJ)/cmake-$(CMAKE_VERSION).tar.gz
LIBTOOL_VERSION=2.4.7
LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c6566cf265d13fced726ca61644a301b543df559
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c6566cf265d13fced726ca61644a301b543df559
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
