[vlc-commits] extras/tools: added meson

Konstantin Pavlov git at videolan.org
Thu Nov 8 15:13:51 CET 2018


vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Mon Aug 13 17:21:17 2018 +0200| [401f215acd4c6d55bcee737e3796620df297a66c] | committer: Konstantin Pavlov

extras/tools: added meson

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

 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 b08683c003..09e01036d1 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -18,3 +18,4 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1  gettext-0.19.8.1.tar.gz
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
+ba4921530049f002c362bc420bd87181074893109ce4b1fedb18545227d27ea96c09798eb02f1f8fabbf6ac5c185b0b7eca42df2a34ad0559f95a97d78811702  meson-0.48.1.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 5160fa8fb5..6746af33fb 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -153,6 +153,7 @@ check flex
 check_nasm 2.13.01
 check gettext
 check help2man
+check meson 0.48.1
 
 DEPS_ONLY="help2man"
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 74fb34b3f3..cf794e34d6 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -59,3 +59,6 @@ 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.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 9264a6150f..c8b737c622 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -397,6 +397,25 @@ CLEAN_PKG += gettext
 DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz
 CLEAN_FILE += .buildgettext
 
+#
+# 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
 
 #
 #



More information about the vlc-commits mailing list