[vlc-devel] [PATCH 3.0 17/17] tools: update CMake to 3.17.0

Steve Lhomme robux4 at ycbcr.xyz
Fri Mar 27 16:57:19 CET 2020


It includes the patch from Hugo to fix the PKG_CONFIG_PATH usage.

(cherry picked from commit 9f33c286ccfec41ccc494c862311c19b9a905c2f)
---
 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/bootstrap    | 2 +-
 extras/tools/packages.mak | 4 ++--
 extras/tools/tools.mak    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 3de813403a..8c91241f9e 100644
--- a/extras/tools/SHA512SUMS
+++ b/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
-693520e53fa21e81f5f15e6f8979e5264e3bf7e194e4c19b884a44767b3b6d6535dee674f355440e7dcac480372882152c0523ac3c2f1c12d51b43540bcffa59  cmake-3.13.1.tar.gz
+f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a  cmake-3.17.0.tar.gz
 9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0  gas-preprocessor-72887b9.tar.gz
 3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18  libtool-2.4.6.tar.gz
 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 5a4082e557..5ead0e8c42 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -93,7 +93,7 @@ check automake 1.15
 check m4 1.4.16
 check libtool 2.4
 check pkg-config
-check cmake 3.8.2
+check cmake 3.17.0
 check yasm
 check_tar
 check ragel
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 91b037a6ab..5530553943 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -9,8 +9,8 @@ YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.
 NASM_VERSION=2.14
 NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
 
-CMAKE_VERSION=3.13.1
-CMAKE_URL=http://www.cmake.org/files/v3.13/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=3.17.0
+CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.4.6
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index dd11038fac..22bae7859b 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -87,7 +87,7 @@ cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(MOVE)
 
 .cmake: cmake
-	(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) && $(MAKE) && $(MAKE) install)
+	(cd $<; ./configure --prefix=$(PREFIX) $(CMAKEFLAGS) --no-qt-gui -- -DCMAKE_USE_OPENSSL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF && $(MAKE) && $(MAKE) install)
 	touch $@
 
 CLEAN_FILE += .cmake
-- 
2.17.1



More information about the vlc-devel mailing list