[vlc-commits] [Git][videolan/vlc][3.0.x] 18 commits: tools: fix tar xv test on msys
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Jan 26 12:41:48 UTC 2026
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
064109f8 by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: fix tar xv test on msys
tar /dev/null doesn't work if not specified as a file
On systems where it was detected nothing will change. On systems where J is not working
it will fail anyway.
We already use "tar f" in the code
(cherry picked from commit 64778705fb1a505c62a67f139dd85b837c7947f2) (rebased)
rebased:
- the code around is slightly different (NEEDED format)
- - - - -
d6eb202d by Steve Lhomme at 2026-01-26T12:03:38+00:00
bootstrap: use MSYS2 the same way as MINGW targets
Although noone will actually built VLC to be run on msys2
(cherry picked from commit d45268d28f57d1b80636fe94add4f929ea50c906)
- - - - -
b9cf80e0 by Steve Lhomme at 2026-01-26T12:03:38+00:00
extras: tools: update CMake to 3.24.2
It's not a requirement, but when it's built it will use a newer version than
this 2 years old version.
(cherry picked from commit 9927c1127afe67cdde52ad7e6e740452f0023da0) (edited)
edited:
- VLC 3.0 already switched to https
- - - - -
1edfd2c8 by Martin Storsjö at 2026-01-26T12:03:38+00:00
extras: tools: Fix actually building CMake 3.24.2 if not found
This fixes breakage from 9927c1127afe67cdde52ad7e6e740452f0023da0.
(cherry picked from commit b8eb8c6d4ea7dc8f8707550fa6c05b3e3ccb62fc) (rebased)
rebased:
- the order of items in SHA512SUMS is different
- - - - -
b1d899cb by Martin Storsjö at 2026-01-26T12:03:38+00:00
extras: tools: Tidy up cmake-enable-ALPN-support-on-macOS-10.14.patch
In b8eb8c6d4ea7dc8f8707550fa6c05b3e3ccb62fc, this patch was manually
touched up to make it apply on a newer version of CMake - the line
counts mismatched slightly, but GNU patch 2.7.6 still happily
managed to apply it. However patch 2.5.8 in macOS failed to apply
the patch due to the mismatched numbers of lines.
This makes the patch apply correctly with the version of patch
on macOS too.
This should fix issue #27381.
(cherry picked from commit dde50606ee55d36bcc9a2115fa0a360f59fc8684)
- - - - -
85632e9d by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: always use a ninja version supporting jobserver
This will build contribs in a nicer way
(cherry picked from commit 106f0ea1320e3088c16ee717cee4af08f28cb016) (rebased)
rebased:
- the code around is slightly different
- - - - -
47a8eb9a by Steve Lhomme at 2026-01-26T12:03:38+00:00
extras/tools: bump cmake to 3.29.5
(cherry picked from commit c6566cf265d13fced726ca61644a301b543df559) (edited)
edited:
- VLC 3.0 already switched to https
- the order of items in SHA512SUMS is different
- - - - -
25511161 by Steve Lhomme at 2026-01-26T12:03:38+00:00
extras/tools: bump cmake to 3.31.8
CMake 3.29.5 doesn't build with XCode 16.4.
(cherry picked from commit ef211e7a79eef87c3c8be39f430bf008b7aaee87) (rebased)
rebased:
- the order of items in SHA512SUMS is different
- - - - -
397a699d by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: fix c++ implicit library not detected for iOS, tvOS, watchOS, visionOS
Patch submitted upstream: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11327
(cherry picked from commit cc563a7cab27b8358da819306af6a089db3c5a64)
- - - - -
a62c8da3 by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: bootstrap: regroup the minimum versions to the top
(cherry picked from commit 9f72482fbaba8087d97f9720a07db1b9501fee1d) (edited)
edited:
- the minimum version for CMake is 3.17
- the minimum version for meson is 0.60.0
- protoc is still built in tools in VLC 3.0
- - - - -
84640072 by Khalid Masum at 2026-01-26T12:03:38+00:00
extras: tools: bootstrap: Do not add xz when tar is needed
We already do that in tools.mak.
Moreover, it causes two xz targets to be created in the Makefile.
(cherry picked from commit afd640e96ff2d0b8d8472d351d8adc7852828f0b)
- - - - -
44a68a2b by Khalid Masum at 2026-01-26T12:03:38+00:00
extras: tools: bootstrap: rework makefile generation
Make sure all the targets are touched to stop unnecessary rebuilding.
(cherry picked from commit 85655ed9d621ff8c82e85a6223e53206d13704a1)
- - - - -
d965dd3c by Khalid Masum at 2026-01-26T12:03:38+00:00
extras: tools: remove unnecessary xz dependency
tar depends on xz anyway.
(cherry picked from commit 50466f4adf2aff4599deec9a520f7346807b7a9c)
- - - - -
549599b8 by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: allow newer major versions
When the user has CMake 4.x we should not build CMake 3.x
because we require at least 3.21.0.
This matching major version was introduced for protoc in ee5fad6a354d4fde1bb98f715e0455c603599554. But
it has moved to contribs and other tools (not matching a library)
should be backward compatible.
If there is another tool that needs to match the major version exactly,
we should at a special check for that.
(cherry picked from commit 6b95cfb4a6aef7176ca0e8312b45998e17c040d0)
- - - - -
744cd296 by Steve Lhomme at 2026-01-26T12:03:38+00:00
contrib: allow building with CMake 4.x
Support for versions older than 3.5 has been dropped.
The minimum version can be forced in most cases via a configuration flag.
We require 3.28 for proper tvOS support anyway.
This will be needed until these contribs are updated. Although some are not
maintained anymore.
(cherry picked from commit cb76be2e2f85b5910448ad89671e8a30de59246c) (edited)
edited:
- protobuf and taglib use older versions in VLC 3 so they need to have the flag as well
- libebur128 doesn't exist in VLC 3
- - - - -
0ce683bc by Steve Lhomme at 2026-01-26T12:03:38+00:00
contrib: projectM: really support CMake 4
We need to patch the CMakeLists.txt to disable CMP0005
(cherry picked from commit 0839dfdccb32b8eb523e993c7f37b82fbf01933c)
- - - - -
8f4a5bc1 by Steve Lhomme at 2026-01-26T12:03:38+00:00
contrib: force Werror=partial-availability in CMake required flags
This will pass the flag in CMake check_symbol_exists(), check_source_compiles(), etc.
Otherwise we don't detect API availability properly during configuration.
(cherry picked from commit 5987928ee1b45733f00bc1cf110306d874d86a5d) (rebased)
rebased:
- the code around is slightly different
- - - - -
620fb6ff by Steve Lhomme at 2026-01-26T12:03:38+00:00
tools: update CMake to 4.1.2
This fixes iOS derivative targets missing the c++ implicit library [^1].
[^1]: https://gitlab.kitware.com/cmake/cmake/-/commit/79a83ddb085c46ce69a09a048ecc06a1ca04a380
(cherry picked from commit 220a8271fdc0e222bbcdce675ed3c1721648ed77) (rebased)
rebased:
- the order of items in SHA512SUMS is different
- the libtool code around is slightly different
- - - - -
18 changed files:
- Makefile.am
- contrib/src/ebml/rules.mak
- contrib/src/glew/rules.mak
- contrib/src/main.mak
- contrib/src/matroska/rules.mak
- contrib/src/mpcdec/rules.mak
- contrib/src/mysofa/rules.mak
- contrib/src/projectM/rules.mak
- contrib/src/protobuf/rules.mak
- contrib/src/spatialaudio/rules.mak
- contrib/src/srt/rules.mak
- contrib/src/taglib/rules.mak
- contrib/src/vorbis/rules.mak
- extras/tools/SHA512SUMS
- extras/tools/bootstrap
- − extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch
- extras/tools/packages.mak
- extras/tools/tools.mak
Changes:
=====================================
Makefile.am
=====================================
@@ -60,7 +60,6 @@ EXTRA_DIST += \
extras/tools/tools.mak \
extras/tools/SHA512SUMS \
extras/tools/automake-clang.patch \
- extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \
extras/tools/libtool-2.4.7-bitcode.patch \
extras/tools/libtool-2.4.7-clang-libs.patch \
extras/tools/libtool-2.4.7-response-files.patch
=====================================
contrib/src/ebml/rules.mak
=====================================
@@ -21,7 +21,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
.ebml: ebml toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE)
+ $(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
contrib/src/glew/rules.mak
=====================================
@@ -18,7 +18,7 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
.glew: glew toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake
+ $(HOSTVARS_CMAKE) $(CMAKE) -S $</build/cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
contrib/src/main.mak
=====================================
@@ -455,6 +455,9 @@ endif
ifdef HAVE_WIN32
CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
endif
+ifdef HAVE_DARWIN_OS
+CMAKE += -DCMAKE_REQUIRED_FLAGS="-Werror=partial-availability"
+endif
ifdef HAVE_ANDROID
CMAKE += -DANDROID:BOOL=ON
endif
=====================================
contrib/src/matroska/rules.mak
=====================================
@@ -23,7 +23,7 @@ matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
.matroska: matroska toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE)
+ $(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
contrib/src/mpcdec/rules.mak
=====================================
@@ -30,7 +30,7 @@ musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
.mpcdec: musepack toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE)
+ $(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
contrib/src/mysofa/rules.mak
=====================================
@@ -23,7 +23,8 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
$(UNPACK)
$(MOVE)
-MYSOFA_CONF := -DBUILD_TESTS=OFF
+MYSOFA_CONF := -DBUILD_TESTS=OFF \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
.mysofa: mysofa toolchain.cmake
$(CMAKECLEAN)
=====================================
contrib/src/projectM/rules.mak
=====================================
@@ -32,13 +32,16 @@ endif
$(APPLY) $(SRC)/projectM/clang6.patch
$(APPLY) $(SRC)/projectM/missing-includes.patch
$(APPLY) $(SRC)/projectM/projectm-cmake-install.patch
+ # remove enforced CMP0005 incompatible with recent CMake
+ sed -i.orig 's,cmake_policy(,# cmake_policy(,' "$(UNPACK_DIR)/CMakeLists.txt"
$(MOVE)
PROJECTM_CONF := \
-DCMAKE_CXX_STANDARD=98 \
-DDISABLE_NATIVE_PRESETS:BOOL=ON \
-DUSE_FTGL:BOOL=OFF \
- -DBUILD_PROJECTM_STATIC:BOOL=ON
+ -DBUILD_PROJECTM_STATIC:BOOL=ON \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
.projectM: projectM toolchain.cmake
$(CMAKECLEAN)
=====================================
contrib/src/protobuf/rules.mak
=====================================
@@ -14,7 +14,7 @@ $(TARBALLS)/protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz:
DEPS_protobuf = zlib $(DEPS_zlib)
-PROTOBUF_COMMON_CONF := -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_DEBUG_POSTFIX:STRING=
+PROTOBUF_COMMON_CONF := -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_DEBUG_POSTFIX:STRING= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
PROTOBUF_CONF := $(PROTOBUF_COMMON_CONF)
protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
=====================================
contrib/src/spatialaudio/rules.mak
=====================================
@@ -20,7 +20,8 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
$(UNPACK)
$(MOVE)
-SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
+SPATIALAUDIO_CONF := -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
.spatialaudio: spatialaudio toolchain.cmake
$(CMAKECLEAN)
=====================================
contrib/src/srt/rules.mak
=====================================
@@ -38,7 +38,8 @@ srt: srt-$(SRT_VERSION).tar.gz .sum-srt
$(call pkg_static,"scripts/srt.pc.in")
$(MOVE)
-SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF -DENABLE_APPS=OFF
+SRT_CONF := -DENABLE_SHARED=OFF -DUSE_ENCLIB=gnutls -DENABLE_CXX11=OFF -DENABLE_APPS=OFF \
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5
.srt: srt toolchain.cmake
$(CMAKECLEAN)
=====================================
contrib/src/taglib/rules.mak
=====================================
@@ -18,7 +18,7 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz .sum-taglib
$(APPLY) $(SRC)/taglib/0001-Implement-ID3v2-readStyle-avoid-worst-case.patch
$(MOVE)
-TAGLIB_CONF := -DBUILD_BINDINGS=OFF
+TAGLIB_CONF := -DBUILD_BINDINGS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5
ifdef HAVE_WINSTORE
TAGLIB_CONF += -DPLATFORM_WINRT=ON
endif
=====================================
contrib/src/vorbis/rules.mak
=====================================
@@ -37,7 +37,7 @@ DEPS_vorbis = ogg $(DEPS_ogg)
.vorbis: libvorbis toolchain.cmake
$(CMAKECLEAN)
- $(HOSTVARS_CMAKE) $(CMAKE)
+ $(HOSTVARS_CMAKE) $(CMAKE) -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -1,6 +1,6 @@
3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2 apache-ant-1.9.7.tar.bz2
248cdcc9b3ee315f1508518a8edb02e891646d990ef4fc4e5444950c397f5c91e87ca3947269dc5e0de36b051914e118c66d293f2f3f0de24403d9f2ede0ece4 automake-1.16.5.tar.gz
-f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a cmake-3.17.0.tar.gz
+169b8ebfbd2c880a1f3ed8c3da8d4b8e9252a5a1ff9f0011e39bb3bb84d183f0379eea880b80e2e052c333db91e49b80e5a65131f71fc8582709b604e94bf280 cmake-4.1.2.tar.gz
9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0 gas-preprocessor-72887b9.tar.gz
2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8 autoconf-2.71.tar.gz
f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2 m4-1.4.19.tar.gz
=====================================
extras/tools/bootstrap
=====================================
@@ -15,6 +15,16 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+MIN_AUTOCONF=2.69
+MIN_AUTOMAKE=1.15
+MIN_BISON=3.0.0
+MIN_CMAKE=3.17.0
+MIN_LIBTOOL=2.4
+MIN_M4=1.4.16
+MIN_MESON=0.60.0
+MIN_NASM=2.14
+MIN_PROTOC=3.4.0
+
export LC_ALL=
FOUND=
@@ -28,7 +38,7 @@ check_version() {
needminor=`echo $3|cut -d. -f2`
needmicro=`echo $3|cut -d. -f3`
[ -z "$needmicro" ] && needmicro=0
- if [ "$needmajor" -ne "$gotmajor" ] ||
+ if [ "$needmajor" -gt "$gotmajor" ] ||
[ "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" ] ||
[ "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ];
then
@@ -58,12 +68,12 @@ check_version_majmin() {
}
check_tar() {
-if ! tar PcJ /dev/null >/dev/null 2>&1
+if ! tar PcJ /dev/null >/dev/null 2>&1 && ! tar PcJf /dev/null /dev/null 2>&1
then
echo "tar doesn't support xz (J option)"
- NEEDED="$NEEDED tar xz"
+ NEEDED="$NEEDED tar"
else
- FOUND="$FOUND tar xz"
+ FOUND="$FOUND tar"
fi
}
@@ -96,6 +106,28 @@ else
fi
}
+check_ninja() {
+if ! ninja --version >/dev/null 2>&1
+then
+ echo "ninja not found"
+ NEEDED="$NEEDED ninja"
+else
+ jobserver=`ninja --version | head -1 | grep .jobserver`
+ if [ -z "$jobserver" ]; then
+ echo "ninja missing jobserver support"
+ NEEDED="$NEEDED ninja"
+ else
+ # found, need to check version ?
+ if [ -z "$1" ];then
+ FOUND="$FOUND ninja"
+ else
+ gotver=`ninja --version | head -1 | sed s/'.* '//`
+ check_version ninja $gotver $1
+ fi
+ fi
+fi
+}
+
check() {
if ! $1 --version >/dev/null 2>&1 && ! $1 -version >/dev/null 2>&1
then
@@ -128,31 +160,31 @@ else
fi
}
-check autoconf 2.69
-check automake 1.15
-check m4 1.4.16
-check libtool 2.4
+check autoconf $MIN_AUTOCONF
+check automake $MIN_AUTOMAKE
+check m4 $MIN_M4
+check libtool $MIN_LIBTOOL
check pkg-config
-check cmake 3.17.0
+check cmake $MIN_CMAKE
check yasm
check_tar
check_sed
-check_majmin protoc 3.4.0
+check_majmin protoc $MIN_PROTOC
check ant
check xz
-check bison 3.0.0
+check bison $MIN_BISON
check flex
-check_nasm 2.14
+check_nasm $MIN_NASM
check help2man
-check meson 0.60.0
-check ninja
+check meson $MIN_MESON
+check_ninja
check gettext
DEPS_ONLY="help2man"
CPUS=
case `uname` in
- Linux|MINGW32*|MINGW64*)
+ Linux|MINGW32*|MINGW64*|*MSYS*)
CPUS=`getconf _NPROCESSORS_ONLN 2>&1`
;;
Darwin|FreeBSD|NetBSD)
@@ -171,20 +203,12 @@ esac
BOOTSTRAP_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
-cat > Makefile << EOF
-TOOLS = $BOOTSTRAP_PATH
-MAKEFLAGS += -j$CPUS
-CMAKEFLAGS += --parallel=$CPUS
-PREFIX=\$(abspath ./build)
-PATH=\${PREFIX}/bin:$PATH
-EOF
-
for t in $FOUND; do
- echo ".$t:" >> Makefile
+ TARGET_FOUND=".$t $TARGET_FOUND"
done
for t in $NEEDED; do
- echo .$t: .build$t >> Makefile
+ TARGET_NEEDED=".$t $TARGET_NEEDED"
case "$t" in
*$DEPS_ONLY*)
;; # Dependency only, not build by default
@@ -197,7 +221,21 @@ done
[ -n "$PACKAGES" ] && mkdir -p build/bin && echo "To-be-built packages: $PACKAGES"
-cat >> Makefile << EOF
+cat > Makefile << EOF
+TOOLS = $BOOTSTRAP_PATH
+MAKEFLAGS += -j$CPUS
+CMAKEFLAGS += --parallel=$CPUS
+PREFIX=\$(abspath ./build)
+PATH=\${PREFIX}/bin:$PATH
+
+$TARGET_FOUND:
+ @echo "Available in the system"
+ touch \$@
+
+.SECONDEXPANSION:
+$TARGET_NEEDED: \$\$(subst .,.build,\$\$@)
+ touch \$@
+
all: $TARGETS
@echo "You are ready to build VLC and its contribs"
=====================================
extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch deleted
=====================================
@@ -1,51 +0,0 @@
-From ca650572a6d9198563c91c4c8f418a3e9f7eebe2 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 11 Jun 2020 15:09:53 +0200
-Subject: [PATCH] enable ALPN support on macOS 10.14
-
-It fails to link properly with a macOS 10.13 SDK:
-
-[ 44%] Linking C executable curltest
-Undefined symbols for architecture x86_64:
- "_SSLCopyALPNProtocols", referenced from:
- _sectransp_connect_step2 in libcmcurl.a(sectransp.c.o)
- "_SSLSetALPNProtocols", referenced from:
- _sectransp_connect_common in libcmcurl.a(sectransp.c.o)
-ld: symbol(s) not found for architecture x86_64
----
- Utilities/cmcurl/lib/vtls/sectransp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Utilities/cmcurl/lib/vtls/sectransp.c b/Utilities/cmcurl/lib/vtls/sectransp.c
-index 2fdf662a1d..22aebf3c5b 100644
---- a/Utilities/cmcurl/lib/vtls/sectransp.c
-+++ b/Utilities/cmcurl/lib/vtls/sectransp.c
-@@ -76,6 +76,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
- /* 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
-@@ -1576,7 +1577,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn,
- }
- #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(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
- CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
-@@ -2626,7 +2627,7 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex)
- 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(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
- CFArrayRef alpnArr = NULL;
---
-2.26.0.windows.1
-
=====================================
extras/tools/packages.mak
=====================================
@@ -9,8 +9,9 @@ YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.
NASM_VERSION=2.14
NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
-CMAKE_VERSION=3.17.0
-CMAKE_URL=https://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION_MAJ=4.1
+CMAKE_VERSION=$(CMAKE_VERSION_MAJ).2
+CMAKE_URL=https://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
=====================================
extras/tools/tools.mak
=====================================
@@ -98,7 +98,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
cmake: cmake-$(CMAKE_VERSION).tar.gz
$(UNPACK)
- $(APPLY) $(TOOLS)/cmake-enable-ALPN-support-on-macOS-10.14.patch
$(MOVE)
.buildcmake: cmake
@@ -115,7 +114,7 @@ DISTCLEAN_PKG += cmake-$(CMAKE_VERSION).tar.gz
help2man-$(HELP2MAN_VERSION).tar.xz:
$(call download_pkg,$(HELP2MAN_URL),help2man)
-help2man: help2man-$(HELP2MAN_VERSION).tar.xz .xz .tar
+help2man: help2man-$(HELP2MAN_VERSION).tar.xz .tar
$(UNPACK)
$(MOVE)
@@ -358,7 +357,7 @@ CLEAN_FILE += .buildprotoc
bison-$(BISON_VERSION).tar.xz:
$(call download_pkg,$(BISON_URL),bison)
-bison: bison-$(BISON_VERSION).tar.xz .xz .tar
+bison: bison-$(BISON_VERSION).tar.xz .tar
$(UNPACK)
$(MOVE)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/83d166ca1b4b3862211bc886b42d70954848848f...620fb6ff104aac43d223051a1380aa4ce4dae306
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/83d166ca1b4b3862211bc886b42d70954848848f...620fb6ff104aac43d223051a1380aa4ce4dae306
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list