[vlc-commits] [Git][videolan/vlc][master] extras: tools: Fix actually building CMake 3.24.2 if not found

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b8eb8c6d by Martin Storsjö at 2022-09-23T13:00:55+00:00
extras: tools: Fix actually building CMake 3.24.2 if not found

This fixes breakage from 9927c1127afe67cdde52ad7e6e740452f0023da0.

- - - - -


2 changed files:

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


Changes:

=====================================
extras/tools/SHA512SUMS
=====================================
@@ -1,7 +1,7 @@
 3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2  apache-ant-1.9.7.tar.bz2
 e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee  autoconf-2.69.tar.gz
 47b0120a59e3e020529a6ce750297d7de1156fd2be38db5d101e50120f11b40c28741ecd5eacf2790a9e25386713dcf7717339cfa5d7943d0dbf47c417383448  automake-1.16.1.tar.gz
-f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a  cmake-3.17.0.tar.gz
+6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674  cmake-3.24.2.tar.gz
 9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0  gas-preprocessor-72887b9.tar.gz
 3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18  libtool-2.4.6.tar.gz
 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz


=====================================
extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch
=====================================
@@ -25,6 +25,7 @@ index 2fdf662a1d..22aebf3c5b 100644
  #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_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":
     (You set this at build-time using the compiler command line option



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

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


VideoLAN code repository instance