From 9a45d755281bc67559e8e284f83f691ced4b7ce4 Mon Sep 17 00:00:00 2001
From: Pedro Gomes <pcarruscag@gmail.com>
Date: Fri, 21 Jan 2022 18:51:34 +0000
Subject: [PATCH 1/2] format fixes

---
 externals/cgns/hdf5/meson.build | 2 +-
 externals/cgns/meson.build      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/externals/cgns/hdf5/meson.build b/externals/cgns/hdf5/meson.build
index ce8da32c5b0..da11294d1ab 100644
--- a/externals/cgns/hdf5/meson.build
+++ b/externals/cgns/hdf5/meson.build
@@ -6,7 +6,7 @@ else
                            '-Wno-unused-variable',
                            '-Wno-unused-but-set-variable',
                            '-Wno-sign-compare',
-			   '-Wno-stringop-overflow',
+                           '-Wno-stringop-overflow',
                            '-Wno-discarded-qualifiers',
                            '-Wno-error=maybe-uninitialized',
                            '-Wno-error=unused-function',
diff --git a/externals/cgns/meson.build b/externals/cgns/meson.build
index f12c054e9e2..a7157b1eef8 100644
--- a/externals/cgns/meson.build
+++ b/externals/cgns/meson.build
@@ -55,7 +55,7 @@ cgns_include = include_directories('adf', 'adfh', './')
 lib_cgns = static_library('cgns',
                           cgns_sources,
                           install : false,
-			  dependencies : hdf5_dep,
+                          dependencies : hdf5_dep,
                           c_args: cgns_default_warnings)
 
 cgns_dep = declare_dependency(link_with: lib_cgns,

From bd03b429d3ab07186084165d35a252c699bbc10e Mon Sep 17 00:00:00 2001
From: Pedro Gomes <pcarruscag@gmail.com>
Date: Fri, 21 Jan 2022 18:53:37 +0000
Subject: [PATCH 2/2] upgrade to meson 0.61.1

---
 externals/meson       | 2 +-
 meson_scripts/init.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/externals/meson b/externals/meson
index 29ef4478df6..41c650a040d 160000
--- a/externals/meson
+++ b/externals/meson
@@ -1 +1 @@
-Subproject commit 29ef4478df6d3aaca40c7993f125b29409be1de2
+Subproject commit 41c650a040d50e0912d268af7a903a9ce1456dfa
diff --git a/meson_scripts/init.py b/meson_scripts/init.py
index 81a1f6de6a5..155e1b11de6 100755
--- a/meson_scripts/init.py
+++ b/meson_scripts/init.py
@@ -50,7 +50,7 @@ def init_submodules(method = 'auto'):
   github_repo_medi = 'https://github.com/SciCompKL/MeDiPack'
   sha_version_opdi = '6fb2691b8e4a8f00f47d2a27740fa890df0b5405'
   github_repo_opdi = 'https://github.com/SciCompKL/OpDiLib'
-  sha_version_meson = '29ef4478df6d3aaca40c7993f125b29409be1de2'
+  sha_version_meson = '41c650a040d50e0912d268af7a903a9ce1456dfa'
   github_repo_meson = 'https://github.com/mesonbuild/meson'
   sha_version_ninja = '52649de2c56b63f42bc59513d51286531c595b44'
   github_repo_ninja = 'https://github.com/ninja-build/ninja'