meson: upgrade 0.49.0 -> 0.49.2

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index c39b1a3d5e257c3988f94ad90c73feadc6963f18..d5d71c67b6107a285c3e07ae8de0a75fc35ab912 100644 (file)
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,8 +15,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-modules-windows-split-WINDRES-env-variable.patch \
            file://0002-environment.py-detect-windows-also-if-the-system-str.patch \
            "
-SRC_URI[sha256sum] = "fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551"
-SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6"
+SRC_URI[sha256sum] = "ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd"
+SRC_URI[md5sum] = "0267b0871266056184c484792572c682"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \

diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index 785c0f027bf49f4fcb07ae9fa280f2d734f3c8d4..fbc3f5ad8279371306310c54269eaee9728e7f9c 100644 (file)
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,7 +1,7 @@
-From d058d0f1d8833d99e8a3d3b9bcc383db23b52671 Mon Sep 17 00:00:00 2001
+From 2db829d865bb6464ac15dbb4a58c9a675e296866 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
-Subject: [PATCH 1/2] Make CPU family warnings fatal
+Subject: [PATCH] Make CPU family warnings fatal
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Ross Burton <ross.burton@intel.com>
@@ -34,6 +34,3 @@ index 2ccd31e..5fcf9df 100644
  
          endian = literal['endian']
          if endian not in ('little', 'big'):
--- 
-2.17.1
-

diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index e7ba40701f6b18db8ce2c0b21584d3fed2f487a5..81548cdfb8578bd5ae862562da2d47a1ca5b018c 100644 (file)
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,7 +1,7 @@
-From ffab5c5046da29fc20b074d21f6de46520cee58c Mon Sep 17 00:00:00 2001
+From f8419d5f279f1fb9b5e7eead4f1579bce7cb0e4e Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <pkj@axis.com>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
-Subject: [PATCH 2/2] Support building allarch recipes again
+Subject: [PATCH] Support building allarch recipes again
 
 This registers "allarch" as a known CPU family.
 
@@ -24,6 +24,3 @@ index 5fcf9df..b4fc0dc 100644
      'aarch64',
      'arc',
      'arm',
--- 
-2.17.1
-

diff --git a/meta/recipes-devtools/meson/meson_0.49.0.bb b/meta/recipes-devtools/meson/meson_0.49.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.49.0.bb
rename to meta/recipes-devtools/meson/meson_0.49.2.bb

diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.49.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.49.2.bb