[vlc-commits] extras/tools: Bump built cmake version to 3.13.x

Sun Dec 16 20:32:13 CET 2018

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Dec 12 14:25:26 2018 +0100| [0ebc35d36858bd8277582c33a6de997ec7e7be0e] | committer: Jean-Baptiste Kempf

extras/tools: Bump built cmake version to 3.13.x

This version now contains the patch required for windows store build
using llvm.

(cherry picked from commit 8eb7a0d0be06f856ab6a5a015ced8ea5d4fadf96)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0ebc35d36858bd8277582c33a6de997ec7e7be0e
---

 extras/tools/SHA512SUMS           |  2 +-
 extras/tools/cmake-winstore.patch | 89 ---------------------------------------
 extras/tools/packages.mak         |  4 +-
 extras/tools/tools.mak            |  1 -
 4 files changed, 3 insertions(+), 93 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index a07d9acaf8..7f424fb31f 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
 6f201f96431f5e3d3081c4d71c884ae1f4f45b9c5c7a1306c9f3f3d4bd5ee5f6fae47b55d35241b3cae84be555cc0ab84c034acdcd5d9a071f6f0ecdee2dec73  automake-1.15.tar.gz
-49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f  cmake-3.8.2.tar.gz
+693520e53fa21e81f5f15e6f8979e5264e3bf7e194e4c19b884a44767b3b6d6535dee674f355440e7dcac480372882152c0523ac3c2f1c12d51b43540bcffa59  cmake-3.13.1.tar.gz
 9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0  gas-preprocessor-72887b9.tar.gz
 0e54af7bbec376f943f2b8e4f13631fe5627b099a37a5f0252e12bade76473b0a36a673529d594778064cd8632abdc43d8a20883d66d6b27738861afbb7e211d  libtool-2.4.2.tar.gz
 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz
diff --git a/extras/tools/cmake-winstore.patch b/extras/tools/cmake-winstore.patch
deleted file mode 100644
index 1f363f4216..0000000000
--- a/extras/tools/cmake-winstore.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From de5a4653d73aa601af9d08c91d4de2e09c430c1e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Sun, 1 Jul 2018 23:16:00 +0300
-Subject: [PATCH] Add WindowsPhone and WindowsStore platform modules for
- Clang/GNU C/CXX
-
-Just like the existing WindowsPhone and WindowsStore platform modules
-for MSVC, just include the corresponding Windows platform modules.
-
-MinGW tools (both with GCC and Clang) can be used for building for
-Windows Store, even though it isn't a very common or simple setup.
----
- Modules/Platform/WindowsPhone-Clang-C.cmake   | 1 +
- Modules/Platform/WindowsPhone-Clang-CXX.cmake | 1 +
- Modules/Platform/WindowsPhone-GNU-C.cmake     | 1 +
- Modules/Platform/WindowsPhone-GNU-CXX.cmake   | 1 +
- Modules/Platform/WindowsStore-Clang-C.cmake   | 1 +
- Modules/Platform/WindowsStore-Clang-CXX.cmake | 1 +
- Modules/Platform/WindowsStore-GNU-C.cmake     | 1 +
- Modules/Platform/WindowsStore-GNU-CXX.cmake   | 1 +
- 8 files changed, 8 insertions(+)
- create mode 100644 Modules/Platform/WindowsPhone-Clang-C.cmake
- create mode 100644 Modules/Platform/WindowsPhone-Clang-CXX.cmake
- create mode 100644 Modules/Platform/WindowsPhone-GNU-C.cmake
- create mode 100644 Modules/Platform/WindowsPhone-GNU-CXX.cmake
- create mode 100644 Modules/Platform/WindowsStore-Clang-C.cmake
- create mode 100644 Modules/Platform/WindowsStore-Clang-CXX.cmake
- create mode 100644 Modules/Platform/WindowsStore-GNU-C.cmake
- create mode 100644 Modules/Platform/WindowsStore-GNU-CXX.cmake
-
-diff --git a/Modules/Platform/WindowsPhone-Clang-C.cmake b/Modules/Platform/WindowsPhone-Clang-C.cmake
-new file mode 100644
-index 000000000..6e38572cd
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-Clang-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-C)
-diff --git a/Modules/Platform/WindowsPhone-Clang-CXX.cmake b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
-new file mode 100644
-index 000000000..bf47978c4
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-Clang-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-CXX)
-diff --git a/Modules/Platform/WindowsPhone-GNU-C.cmake b/Modules/Platform/WindowsPhone-GNU-C.cmake
-new file mode 100644
-index 000000000..ff6acd56d
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-GNU-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-C)
-diff --git a/Modules/Platform/WindowsPhone-GNU-CXX.cmake b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
-new file mode 100644
-index 000000000..6adab6af3
---- /dev/null
-+++ b/Modules/Platform/WindowsPhone-GNU-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-CXX)
-diff --git a/Modules/Platform/WindowsStore-Clang-C.cmake b/Modules/Platform/WindowsStore-Clang-C.cmake
-new file mode 100644
-index 000000000..6e38572cd
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-Clang-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-C)
-diff --git a/Modules/Platform/WindowsStore-Clang-CXX.cmake b/Modules/Platform/WindowsStore-Clang-CXX.cmake
-new file mode 100644
-index 000000000..bf47978c4
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-Clang-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-Clang-CXX)
-diff --git a/Modules/Platform/WindowsStore-GNU-C.cmake b/Modules/Platform/WindowsStore-GNU-C.cmake
-new file mode 100644
-index 000000000..ff6acd56d
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-GNU-C.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-C)
-diff --git a/Modules/Platform/WindowsStore-GNU-CXX.cmake b/Modules/Platform/WindowsStore-GNU-CXX.cmake
-new file mode 100644
-index 000000000..6adab6af3
---- /dev/null
-+++ b/Modules/Platform/WindowsStore-GNU-CXX.cmake
-@@ -0,0 +1 @@
-+include(Platform/Windows-GNU-CXX)
--- 
-2.15.2 (Apple Git-101.1)
-
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 60f2019b1c..2f9fd67e41 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.8.2
-CMAKE_URL=http://www.cmake.org/files/v3.8/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=3.13.1
+CMAKE_URL=http://www.cmake.org/files/v3.13/cmake-$(CMAKE_VERSION).tar.gz
 
 LIBTOOL_VERSION=2.4.2
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 1496a84bcd..d9b94aed79 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -84,7 +84,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
 
 cmake: cmake-$(CMAKE_VERSION).tar.gz
 	$(UNPACK)
-	$(APPLY) cmake-winstore.patch
 	$(MOVE)
 
 .cmake: cmake

