[vlc-devel] [PATCH] Update to meson 0.54.2

[Steve Lhomme]

LGTM.

You may bump the requirement in case the CI had 0.54.0 (or 0.54.1) and 
won't update to this version. In the end that's a light tool to download 
update for each CI run. They likely have an outdated version anyway. All 
the desktop builds seem to install a local meson already on each run.

On 2020-06-30 18:26, Alexandre Janniaux wrote:
> 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.
> ---
>   extras/tools/SHA512SUMS   | 2 +-
>   extras/tools/packages.mak | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
> index f41238c45e..e3e02d8d3d 100644
> --- a/extras/tools/SHA512SUMS
> +++ b/extras/tools/SHA512SUMS
> @@ -18,5 +18,5 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
>   073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1  gettext-0.19.8.1.tar.gz
>   d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
>   8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
> -e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7  meson-0.54.0.tar.gz
>   1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
> +ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed  meson-0.54.2.tar.gz
> diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
> index b151f7846f..daad1ad2b2 100644
> --- a/extras/tools/packages.mak
> +++ b/extras/tools/packages.mak
> @@ -60,7 +60,7 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
>   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
> -- 
> 2.27.0
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>