From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 37/37] meson: update 0.55.0 -> 0.55.1
Date: Sun, 23 Aug 2020 22:20:31 +0200 [thread overview]
Message-ID: <20200823202031.24686-37-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200823202031.24686-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-devtools/meson/meson.inc | 2 +-
.../0001-Make-CPU-family-warnings-fatal.patch | 7 ++---
...pport-building-allarch-recipes-again.patch | 4 +--
.../meson/meson/0003-native_bindir.patch | 28 +++++++++----------
.../{meson_0.55.0.bb => meson_0.55.1.bb} | 0
...on_0.55.0.bb => nativesdk-meson_0.55.1.bb} | 0
6 files changed, 19 insertions(+), 22 deletions(-)
rename meta/recipes-devtools/meson/{meson_0.55.0.bb => meson_0.55.1.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.55.0.bb => nativesdk-meson_0.55.1.bb} (100%)
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 607093a152..004189e36e 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
"
-SRC_URI[sha256sum] = "0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
+SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080"
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 ceb2fde342..fbc03b8ca0 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,7 +1,7 @@
-From 5624b5835af747b601780ad14646f9c1fb854931 Mon Sep 17 00:00:00 2001
+From 9311844b6c422479556e83b89a8e675ebcb2056c 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>
@@ -39,6 +39,3 @@ index bf09a88..8eabe78 100644
return trial
---
-2.24.0
-
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 7a3b01262e..2d804740ad 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 4b283d545152092fec12b9d80219161d11002c72 Mon Sep 17 00:00:00 2001
+From 38f59e256f760aa959c13f4c5713f87ff7addee5 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
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index dc20616..f54adcd 100644
+index d1be65b..90f3573 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index fb119ae852..5d7bdc2f59 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 da2091f6dfe978fc6140fc2d01bcafbbfae8d8db Mon Sep 17 00:00:00 2001
+From f06c89939d0d006090a8a8728b2a13d532b83047 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,10 +22,10 @@ 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 50f4179..e1529d8 100644
+index 368a4bc..9fc398e 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
-@@ -157,7 +157,7 @@ class Dependency:
+@@ -183,7 +183,7 @@ class Dependency:
def get_exe_args(self, compiler):
return []
@@ -34,16 +34,16 @@ index 50f4179..e1529d8 100644
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
def get_configtool_variable(self, variable_name):
-@@ -225,7 +225,7 @@ class InternalDependency(Dependency):
- self.ext_deps = ext_deps
- self.variables = variables
+@@ -261,7 +261,7 @@ class InternalDependency(Dependency):
+ setattr(result, k, copy.deepcopy(v, memo))
+ return result
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency')
-@@ -633,15 +633,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
@@ -65,7 +65,7 @@ index 50f4179..e1529d8 100644
# Always copy the environment since we're going to modify it
# with pkg-config variables
if env is None:
-@@ -667,7 +670,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency):
targs = tuple(args)
cache = PkgConfigDependency.pkgbin_cache
if (self.pkgbin, targs, fenv) not in cache:
@@ -74,7 +74,7 @@ index 50f4179..e1529d8 100644
return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
-@@ -876,7 +879,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
@@ -83,7 +83,7 @@ index 50f4179..e1529d8 100644
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
-@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
@@ -93,10 +93,10 @@ index 50f4179..e1529d8 100644
if ret != 0:
if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 741f0b8..134dd54 100644
+index 95dfe2b..5f82890 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
-@@ -320,7 +320,7 @@ class QtBaseDependency(ExternalDependency):
+@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
self.bindir = self.get_pkgconfig_host_bins(core)
if not self.bindir:
# If exec_prefix is not defined, the pkg-config file is broken
@@ -105,7 +105,7 @@ index 741f0b8..134dd54 100644
if prefix:
self.bindir = os.path.join(prefix, 'bin')
-@@ -524,7 +524,7 @@ class Qt4Dependency(QtBaseDependency):
+@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
@@ -114,7 +114,7 @@ index 741f0b8..134dd54 100644
except MesonException:
pass
-@@ -534,7 +534,7 @@ class Qt5Dependency(QtBaseDependency):
+@@ -538,7 +538,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.55.0.bb b/meta/recipes-devtools/meson/meson_0.55.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.55.0.bb
rename to meta/recipes-devtools/meson/meson_0.55.1.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb
similarity index 100%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.55.0.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb
--
2.28.0
prev parent reply other threads:[~2020-08-23 20:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-23 20:19 [PATCH 01/37] bison: upgrade 3.6.4 -> 3.7.1 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 02/37] util-linux: upgrade 2.35.2 -> 2.36 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 03/37] python3-numpy: upgrade 1.19.0 -> 1.19.1 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 04/37] python3-setuptools: upgrade 49.3.1 -> 49.6.0 Alexander Kanavin
2020-08-23 20:19 ` [PATCH 05/37] rsync: upgrade 3.2.2 -> 3.2.3 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 06/37] util-linux: merge .inc into .bb Alexander Kanavin
2020-08-23 20:20 ` [PATCH 07/37] acpica: upgrade 20200528 -> 20200717 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 08/37] asciidoc: upgrade 9.0.1 -> 9.0.2 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 09/37] cryptodev: upgrade 1.10 -> 1.11 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 10/37] diffoscope: upgrade 153 -> 156 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 11/37] epiphany: upgrade 3.36.3 -> 3.36.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 12/37] font-alias: upgrade 1.0.3 -> 1.0.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 13/37] gtk+3: upgrade 3.24.21 -> 3.24.22 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 14/37] libcheck: upgrade 0.15.0 -> 0.15.2 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 15/37] libinput: upgrade 1.16.0 -> 1.16.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 16/37] libpipeline: upgrade 1.5.2 -> 1.5.3 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 17/37] libx11: upgrade 1.6.9 -> 1.6.11 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 18/37] linux-firmware: upgrade 20200619 -> 20200721 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 19/37] man-pages: upgrade 5.07 -> 5.08 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 20/37] mc: upgrade 4.8.24 -> 4.8.25 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 21/37] mesa: upgrade 20.1.4 -> 20.1.5 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 22/37] piglit: upgrade to latest revision Alexander Kanavin
2020-08-23 20:20 ` [PATCH 23/37] re2c: upgrade 2.0 -> 2.0.2 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 24/37] sysstat: upgrade 12.2.2 -> 12.4.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 25/37] vala: upgrade 0.48.7 -> 0.48.9 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 26/37] bootchart2: update 0.14.8 -> 0.14.9 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 27/37] harfbuzz: convert to meson, enable gobject introspection Alexander Kanavin
2020-08-23 20:20 ` [PATCH 28/37] pango: update 1.44.7 -> 1.46.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 29/37] boost: update 1.73.0 -> 1.74.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 30/37] xev: update 1.2.3 -> 1.2.4 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 31/37] wpebackend-fdo: update 1.6.1 -> 1.7.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 32/37] gpgme: update 1.13.1 -> 1.14.0 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 33/37] libpsl: update 0.21.0 -> 0.21.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 34/37] gettext: update 0.20.2 -> 0.21 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 35/37] cmake: update 3.17.3 -> 3.18.1 Alexander Kanavin
2020-08-23 20:20 ` [PATCH 36/37] linux-firmware: update 20200721 -> 20200817 Alexander Kanavin
2020-08-23 20:20 ` Alexander Kanavin [this message]
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=20200823202031.24686-37-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox