From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 10/13] meson: upgrade 0.53.0 -> 0.53.1
Date: Wed, 19 Feb 2020 20:47:49 +0100 [thread overview]
Message-ID: <20200219194752.7967-10-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200219194752.7967-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 4 ++--
.../meson/0001-Make-CPU-family-warnings-fatal.patch | 2 +-
...0002-Support-building-allarch-recipes-again.patch | 2 +-
.../meson/meson/0003-native_bindir.patch | 12 ++++++------
.../meson/{meson_0.53.0.bb => meson_0.53.1.bb} | 0
...sdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} | 0
6 files changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-devtools/meson/{meson_0.53.0.bb => meson_0.53.1.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.0.bb => nativesdk-meson_0.53.1.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index c0ce7d338b..d391c9cf29 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
"
-SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
-SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
+SRC_URI[sha256sum] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04"
+SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2"
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 74d5b4ca66..9ce31e5489 100644
--- 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,4 +1,4 @@
-From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
+From ee638fd4a299bfc53a2238e9f71ae310c8d97460 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] Make CPU family warnings fatal
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 1529ebe9fe..ce18660756 100644
--- 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,4 +1,4 @@
-From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
+From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 76c1aa9ac1..dc822fb1fc 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
-From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
+From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index f17b9f2..b5c9c92 100644
+index 40e304c..4b687df 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -184,7 +184,7 @@ class Dependency:
@@ -73,7 +73,7 @@ index f17b9f2..b5c9c92 100644
+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
return cache[(self.pkgbin, targs, fenv)]
- def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+ def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
@@ -93,7 +93,7 @@ index f17b9f2..b5c9c92 100644
if ret != 0:
if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index bdcc4a7..e2de847 100644
+index da411ef..856506a 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
@@ -105,7 +105,7 @@ index bdcc4a7..e2de847 100644
if prefix:
self.bindir = os.path.join(prefix, 'bin')
-@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
@@ -114,7 +114,7 @@ index bdcc4a7..e2de847 100644
except MesonException:
pass
-@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency):
+@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency):
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
def get_pkgconfig_host_bins(self, core):
diff --git a/meta/recipes-devtools/meson/meson_0.53.0.bb b/meta/recipes-devtools/meson/meson_0.53.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.53.0.bb
rename to meta/recipes-devtools/meson/meson_0.53.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb
--
2.25.0
next prev parent reply other threads:[~2020-02-19 19:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 19:47 [PATCH 01/13] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-19 19:47 ` [PATCH 02/13] webkitgtk: x11 and wayland are not mutually exclusive Alexander Kanavin
2020-02-23 13:02 ` Adrian Bunk
2020-02-23 13:05 ` Alexander Kanavin
2020-02-23 14:38 ` Adrian Bunk
2020-02-19 19:47 ` [PATCH 03/13] webkitgtk: unbreak wayland build Alexander Kanavin
2020-02-19 23:52 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 04/13] wayland: convert to meson build Alexander Kanavin
2020-02-20 16:21 ` Joshua Watt
2020-02-20 16:38 ` Alexander Kanavin
2020-02-19 19:47 ` [PATCH 05/13] weston-init: use the drm/kms backend rather than fbdev one for qemux86 machines Alexander Kanavin
2020-03-12 20:54 ` Khem Raj
2020-02-19 19:47 ` [PATCH 06/13] qemumips: use std vga instead of cirrus vga Alexander Kanavin
2020-02-19 19:47 ` [PATCH 07/13] createrepo-c: upgrade 0.15.5 -> 0.15.7 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 08/13] epiphany: upgrade 3.34.3.1 -> 3.34.4 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 09/13] libsecret: upgrade 0.20.0 -> 0.20.1 Alexander Kanavin
2020-02-19 19:47 ` Alexander Kanavin [this message]
2020-02-19 19:47 ` [PATCH 11/13] p11-kit: upgrade 0.23.18.1 -> 0.23.20 Alexander Kanavin
2020-02-20 10:26 ` Richard Purdie
2020-02-19 19:47 ` [PATCH 12/13] vala: upgrade 0.46.5 -> 0.46.6 Alexander Kanavin
2020-02-19 19:47 ` [PATCH 13/13] virglrenderer: upgrade 0.8.1 -> 0.8.2 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200219194752.7967-10-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.