We have already required 0.44 for building clover and swr, so it was already partially required. This just makes it required across the board instead of just for clover and swr.
There is a bug in 0.44 which makes it impossible to build mesa in some configurations, so require 0.44.1 which fixes this. Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> --- docs/meson.html | 5 +---- meson.build | 2 +- src/gallium/meson.build | 6 ------ 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/meson.html b/docs/meson.html index b8877585112..d05b5fe347b 100644 --- a/docs/meson.html +++ b/docs/meson.html @@ -24,10 +24,7 @@ for production</strong></p> <p>The meson build is tested on on Linux, macOS, Cygwin and Haiku, it should work on FreeBSD, DragonflyBSD, NetBSD, and OpenBSD.</p> -<p><strong>Mesa requires Meson >= 0.42.0 to build in general.</strong> - -Additionaly, to build the Clover OpenCL state tracker or the OpenSWR driver -meson 0.44.0 or greater is required. +<p><strong>Mesa requires Meson >= 0.44.1 to build.</strong> Some older versions of meson do not check that they are too old and will error out in odd ways. diff --git a/meson.build b/meson.build index a4dfa62255c..fc3d611445e 100644 --- a/meson.build +++ b/meson.build @@ -25,7 +25,7 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', - meson_version : '>= 0.42', + meson_version : '>= 0.44.1', default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] ) diff --git a/src/gallium/meson.build b/src/gallium/meson.build index c4dd8e1c26d..91ff729dfde 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -40,9 +40,6 @@ if with_platform_haiku subdir('winsys/sw/hgl') endif if with_gallium_swr - if meson.version().version_compare('< 0.44.0') - error('SWR requires meson 0.44.0 or greater.') - endif subdir('drivers/swr') else driver_swr = declare_dependency() @@ -144,9 +141,6 @@ if with_gallium_opencl # consumer subdir('targets/pipe-loader') - if meson.version().version_compare('< 0.44.0') - error('OpenCL requires meson 0.44.0 or greater.') - endif subdir('state_trackers/clover') subdir('targets/opencl') endif -- 2.17.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev