Merge branch '3.4' into 3.5

3 files changed, 51 insertions, 15 deletions

diff --git a/meson/.footprint b/meson/.footprint
index c8032c885..6da3df1cc 100644
--- a/meson/.footprint
+++ b/meson/.footprint
@@ -4,23 +4,23 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.7/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.49.2-py3.7.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/meson-0.50.0-py3.7.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/__init__.cpython-37.pyc
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/astinterpreter.cpython-37.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/astinterpreter.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/build.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/build.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/coredata.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/coredata.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/envconfig.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/envconfig.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/environment.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/environment.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/interpreter.cpython-37.opt-1.pyc
@@ -51,11 +51,32 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/msubprojects.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/mtest.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/mtest.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/munstable_coredata.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/optinterpreter.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/rewriter.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/__pycache__/rewriter.cpython-37.pyc
--rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/astinterpreter.py
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/__init__.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/interpreter.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/interpreter.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/introspection.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/introspection.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/postprocess.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/postprocess.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/printer.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/printer.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/visitor.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/__pycache__/visitor.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/interpreter.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/introspection.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/postprocess.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/printer.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/ast/visitor.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/backend/__pycache__/
@@ -95,6 +116,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pyca
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cpp.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cs.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cs.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cuda.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/cuda.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/d.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/d.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pycache__/fortran.cpython-37.opt-1.pyc
@@ -116,6 +139,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/__pyca
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/compilers.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cpp.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cs.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/cuda.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/d.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/fortran.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/compilers/java.py
@@ -146,10 +170,12 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/__p
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/boost.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/CMakeLists.txt
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/data/CMakePathInfo.txt
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/dev.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/misc.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/platform.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/dependencies/ui.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/envconfig.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/environment.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/interpreter.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/interpreterbase.py
@@ -166,6 +192,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/cmake.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/dlang.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/dlang.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/gnome.cpython-37.opt-1.pyc
@@ -190,12 +218,15 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/qt5.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/rpm.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/rpm.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_cuda.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_cuda.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_icestorm.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_icestorm.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_simd.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/unstable_simd.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/windows.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycache__/windows.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/cmake.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/dlang.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/gnome.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/hotdoc.py
@@ -208,6 +239,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/qt4.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/qt5.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/rpm.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_cuda.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_icestorm.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/unstable_simd.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/windows.py
@@ -215,6 +247,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/modules/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/msetup.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/msubprojects.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/mtest.py
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/munstable_coredata.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/optinterpreter.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/rewriter.py
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/
@@ -222,6 +255,8 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/
 drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/__init__.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/__init__.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/clangformat.cpython-37.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/clangformat.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/cleantrees.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/cleantrees.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/commandrunner.cpython-37.opt-1.pyc
@@ -258,6 +293,7 @@ drwxr-xr-x	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycach
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/vcstagger.cpython-37.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/yelphelper.cpython-37.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/__pycache__/yelphelper.cpython-37.pyc
+-rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/clangformat.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/cleantrees.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/commandrunner.py
 -rw-r--r--	root/root	usr/lib/python3.7/site-packages/mesonbuild/scripts/coverage.py
diff --git a/meson/.signature b/meson/.signature
index aeada8d49..a06ad4d3b 100644
--- a/meson/.signature
+++ b/meson/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/XGB4M9n3TEMz4rnU4RwQkDYyo7UkQNpwiDeeAkOTsqfSzZATQLRtxLDrfNDInMOtNSvQkcTjy64LUj7PmMXsA8=
-SHA256 (Pkgfile) = 19b3e7b81a784dc3ae386669bf650d39a8e7f0c971a88cc6e370adb9ea19adfd
-SHA256 (.footprint) = 4851786739460caafebeb5eaf291dd9ac6a9a429850ff80dd7c08dd70eef50bc
-SHA256 (meson-0.49.2.tar.gz) = ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd
+RWSE3ohX2g5d/QKK+5Xmaa6paoXdPLU0WCBynkZHrTJ3+uuVI6odfwOm51FnpBm1x8+v99uiPvHO0lJdLoP+U3jujjGy6a/IgAE=
+SHA256 (Pkgfile) = b0e2f233a7370935bedcd1fc2e551706fafb31177a6023fef60193b59cedf4ab
+SHA256 (.footprint) = 3f5230e4d8899de3d2f06a8eb49abbd58c1ebeca2e336204390a7ae85d779d9f
+SHA256 (meson-0.50.0.tar.gz) = 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f
diff --git a/meson/Pkgfile b/meson/Pkgfile
index 868843042..7c83ed1e0 100644
--- a/meson/Pkgfile
+++ b/meson/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on: python3-setuptools
 
 name=meson
-version=0.49.2
-release=2
+version=0.50.0
+release=1
 source=(https://github.com/mesonbuild/meson/releases/download/$version/$name-$version.tar.gz)
 
 build() {