From b943caa17f0a8d50b33216679806f0a3e84950ab Mon Sep 17 00:00:00 2001
From: Arun Raghavan <arun@arunraghavan.net>
Date: Wed, 17 Apr 2019 15:58:45 +0530
Subject: [PATCH] build-sys: Update meson dependency to 0.50.0

This is needed for currently used features (disabler and install in
configure_file).
---
 meson.build        | 4 ++--
 scripts/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 15f3db17e..ab233b3ab 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('pulseaudio', 'c', 'cpp',
         version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(),
-        meson_version : '>= 0.47.0',
+        meson_version : '>= 0.50.0',
         default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
         )
 
@@ -250,7 +250,7 @@ if get_option('database') == 'tdb'
 elif get_option('database') == 'gdbm'
   database_dep = cc.find_library('gdbm', required : true)
 else
-  database_dep = dependency('', required:false)
+  database_dep = dependency('', required: false)
 endif
 
 if get_option('ipv6')
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index ea2f4ea89..e75dbbdcb 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -43,10 +43,11 @@ RUN apt-get update && apt-get install -y \
     libxtst-dev \
     make \
     ninja-build \
+    python3-setuptools \
     systemd
 
 # Install meson from upstream tarball
-ARG MESON_VERSION=0.47.0
+ARG MESON_VERSION=0.50.0
 RUN apt-get install -y wget && \
     wget -q https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz && \
     tar -xf meson-${MESON_VERSION}.tar.gz && \