[vlc-commits] Update to meson 0.54.2

[Alexandre Janniaux]

vlc/vlc-3.0 | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Tue Jun 30 18:26:02 2020 +0200| [f5ec9e0acaa5e5bc7c5e7cf09019185b0da3bd37] | committer: Felix Paul Kühne

Update to meson 0.54.2

Meson before 0.54.2 misdetect the cross-compilation to iPhone Simulator
with architecture x86_64 and tries to execute tests, leading to
compilation failures in contrib.

Signed-off-by: Felix Paul Kühne <felix at feepk.net>
(cherry picked from commit 9df4bd98c1ae43699c1e0da9cfe76cf375903709)

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

 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/bootstrap    | 2 +-
 extras/tools/packages.mak | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 466a4d492c..be51aa877d 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -16,5 +16,5 @@ bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be98
 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
-e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7  meson-0.54.0.tar.gz
+ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed  meson-0.54.2.tar.gz
 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index c70005b34d..0f9398a222 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -145,7 +145,7 @@ check bison 3.0.0
 check flex
 check_nasm 2.14
 check help2man
-check meson 0.54.0
+check meson 0.54.2
 check ninja
 
 DEPS_ONLY="help2man"
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 6ffcbf9f99..416b05debe 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -57,7 +57,7 @@ FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-
 HELP2MAN_VERSION=1.47.6
 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
 
-MESON_VERSION=0.54.0
+MESON_VERSION=0.54.2
 MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
 NINJA_VERSION=1.8.2