[vlc-devel] [PATCH] tools: update cmake to 3.16

Steve Lhomme robux4 at ycbcr.xyz
Mon Jan 20 14:21:18 CET 2020


This version contains Hugo's patch to properly cross compile under Linux:
FindPkgConfig: Fix path manipulations when cross compiling

When cross compiling from a unix machine, if(UNIX) is false,
which causes the path not to be fixed for unix, leading to false
negative if PKG_CONFIG_PATH needs to be probed

Updating my Debian went from 3.13.4 to 3.15.4 which breaks PKG_CONFIG_PATH
usage.
---
 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/bootstrap    | 2 +-
 extras/tools/packages.mak | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 13735a762cf..9e5e2b1972b 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
-5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93  cmake-3.13.4.tar.gz
+b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76  cmake-3.16.2.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 007c5b381bf..99d8b6012e5 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -133,7 +133,7 @@ check automake 1.15
 check m4 1.4.16
 check libtool 2.4
 check pkg-config
-check cmake 3.13.4
+check cmake 3.16.0
 check yasm
 check_tar
 check ragel
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index d74f53590d3..0dbf9d7a93a 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.4
-CMAKE_URL=http://www.cmake.org/files/v3.13/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=3.16.2
+CMAKE_URL=http://www.cmake.org/files/v3.16/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.4.6
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
-- 
2.17.1



More information about the vlc-devel mailing list