[vlc-commits] extras/tools: added meson

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Mon Aug 13 17:21:17 2018 +0200| [b93a482bc098010c49dcc8861ada33789b93fa34] | committer: Hugo Beauzée-Luyssen

extras/tools: added meson

(cherry picked from commit 401f215acd4c6d55bcee737e3796620df297a66c)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 extras/tools/SHA512SUMS   |  1 +
 extras/tools/bootstrap    |  1 +
 extras/tools/packages.mak |  3 +++
 extras/tools/tools.mak    | 19 +++++++++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 7f424fb31f..39bac78784 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -15,3 +15,4 @@ e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bf
 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412  bison-3.0.4.tar.xz
 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
+ba4921530049f002c362bc420bd87181074893109ce4b1fedb18545227d27ea96c09798eb02f1f8fabbf6ac5c185b0b7eca42df2a34ad0559f95a97d78811702  meson-0.48.1.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 787c6efb91..bc40e8b047 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -86,6 +86,7 @@ check xz
 check bison 3.0.0
 check flex
 check nasm 2.13.01
+check meson 0.48.1
 
 [ -n "$NEEDED" ] && mkdir -p build/ && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`"
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 2f9fd67e41..3ce2b51745 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -53,3 +53,6 @@ BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
 
 FLEX_VERSION=2.6.4
 FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz
+
+MESON_VERSION=0.48.1
+MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index d9b94aed79..15ec32b163 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -350,6 +350,25 @@ CLEAN_PKG += flex
 DISTCLEAN_PKG += flex-$(FLEX_VERSION).tar.gz
 CLEAN_FILE += .flex
 
+#
+# meson build
+#
+
+meson-$(MESON_VERSION).tar.gz:
+	$(call download_pkg,$(MESON_URL),meson)
+
+meson: meson-$(MESON_VERSION).tar.gz
+	$(UNPACK)
+	$(MOVE)
+
+.buildmeson: meson
+	printf "#!/bin/sh\n\npython3 $(abspath .)/meson/meson.py \"\$$@\"\n" >> $(PREFIX)/bin/meson
+	chmod +x $(PREFIX)/bin/meson
+	touch $@
+
+CLEAN_PKG += meson
+DISTCLEAN_PKG += meson-$(MESON_VERSION).tar.gz
+CLEAN_FILE += .buildmeson
 
 #
 #