meson: Don't use get_option('buildtype')

We should directly check the values of the `debug` and `optimization`
options instead.

`get_option('buildtype')` will return `'custom'` for most combinations
of `-Doptimization` and `-Ddebug`, but those two will always be set
correctly if only `-Dbuildtype` is set. So we should look at those
options directly.

For the two-way mapping between `buildtype` and `optimization`
+ `debug`, see this table:
https://mesonbuild.com/Builtin-options.html#build-type-options

diff --git a/ext/vulkan/shaders/meson.build b/ext/vulkan/shaders/meson.build
index f822dd0eb54c3abf5a48147fb318fe16fa19de41..6048f631e7802ccd7fdd36e4fcf3b913332cde8c 100644 (file)
--- a/ext/vulkan/shaders/meson.build
+++ b/ext/vulkan/shaders/meson.build
@@ -18,17 +18,16 @@ bin2array = find_program('bin2array.py')
 # FIXME: meson compiler class instead?
 glslc_build_options = []
 optimization = get_option('optimization')
-buildtype = get_option('buildtype')
-if get_option('debug') or optimization == 'g' or ['debug', 'debugoptimized'].contains(buildtype)
+if get_option('debug')
   glslc_build_options += ['-g']
 endif
 if get_option('werror')
   glslc_build_options += ['-Werror']
 endif
-if buildtype == 'minsize' or optimization == 's'
+if optimization == 's'
   glslc_build_options += ['-Os']
 endif
-if ['release', 'debugoptimized'].contains(buildtype) or ['1', '2', '3'].contains(optimization)
+if optimization in ['1', '2', '3']
   glslc_build_options += ['-O']
 endif
 

diff --git a/meson.build b/meson.build
index 92b271025e17e00722cb0112383f2dd1a2d5e0a5..5f992891b088f7413b6b6595ad4200ea4e93e551 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gst-plugins-bad', 'c', 'cpp',
   version : '1.17.0.1',
-  meson_version : '>= 0.48',
+  meson_version : '>= 0.49',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 

diff --git a/sys/d3d11/meson.build b/sys/d3d11/meson.build
index 53f1b71a4c768d2bd285320dc502d8e22a72528c..dad075c94d567e921cef24dae6936a10b64171bb 100644 (file)
--- a/sys/d3d11/meson.build
+++ b/sys/d3d11/meson.build
@@ -86,7 +86,7 @@ if not have_d3d11
 endif
 
 # for enabling debug layer
-if get_option('buildtype').startswith('debug')
+if get_option('debug')
   d3d11_debug_libs = [
     ['d3d11sdklayers.h', 'ID3D11Debug', 'ID3D11InfoQueue', 'have_d3d11sdk_h'],
     ['dxgidebug.h', 'IDXGIDebug', 'IDXGIInfoQueue', 'have_dxgidebug_h'],