[ptxdist] [PATCH 1/2] igt-gpu-tools: fix build with meson 0.60

[ptxdist] [PATCH 1/2] igt-gpu-tools: fix build with meson 0.60

[Philipp Zabel]

Backport igt-gpu-tools commit 963917a35654 ("lib/meson.build: Fix
underscorify call") to fix build with recent Meson.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...ib-meson.build-Fix-underscorify-call.patch | 36 +++++++++++++++++++
 patches/igt-gpu-tools-1.26/series             |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
 create mode 100644 patches/igt-gpu-tools-1.26/series

diff --git a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
new file mode 100644
index 000000000000..51df2f0c40d6
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc82c29..297b0ad26ee5 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+ 
+ lib_intermediates = []
+ foreach f: lib_sources
+-    name = f.underscorify(f)
++    name = f.underscorify()
+     lib = static_library('igt-' + name,
+ 	[ f, lib_version ],
+ 	include_directories: inc,
+-- 
+2.30.2
+
diff --git a/patches/igt-gpu-tools-1.26/series b/patches/igt-gpu-tools-1.26/series
new file mode 100644
index 000000000000..30537838e16d
--- /dev/null
+++ b/patches/igt-gpu-tools-1.26/series
@@ -0,0 +1 @@
+0001-lib-meson.build-Fix-underscorify-call.patch
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/2] meson: version bump 0.56.0 -> 0.60.2

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/host-meson.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/host-meson.make b/rules/host-meson.make
index 98c4e453ba36..dd9bc37ee1af 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
 #
 # Paths and names
 #
-HOST_MESON_VERSION	:= 0.56.0
-HOST_MESON_MD5		:= 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
+HOST_MESON_VERSION	:= 0.60.2
+HOST_MESON_MD5		:= 48a898e25f35e57a1b72c2b578884960
 HOST_MESON		:= meson-$(HOST_MESON_VERSION)
 HOST_MESON_SUFFIX	:= tar.gz
 HOST_MESON_URL		:= https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/2] meson: version bump 0.56.0 -> 0.60.2

[Michael Olbrich]

On Wed, Dec 15, 2021 at 11:00:18AM +0100, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  rules/host-meson.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 98c4e453ba36..dd9bc37ee1af 100644
> --- a/rules/host-meson.make
> +++ b/rules/host-meson.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
>  #
>  # Paths and names
>  #
> -HOST_MESON_VERSION	:= 0.56.0
> -HOST_MESON_MD5		:= 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
> +HOST_MESON_VERSION	:= 0.60.2

This raises the required Python version to 3.6. This means we won't be able
to build BSPs on Debian Stretch, Ubuntu Xenial and other distros of the
same generation. Those are pretty old, but still have some LTS support.
So if we do this, then I'd like to have an actual reason for this. A
package that needs a newer meson version, problems with the old version
etc.

Michael

> +HOST_MESON_MD5		:= 48a898e25f35e57a1b72c2b578884960
>  HOST_MESON		:= meson-$(HOST_MESON_VERSION)
>  HOST_MESON_SUFFIX	:= tar.gz
>  HOST_MESON_URL		:= https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/2] meson: version bump 0.56.0 -> 0.60.2

[Philipp Zabel]

On Fri, 2021-12-17 at 08:51 +0100, Michael Olbrich wrote:
> On Wed, Dec 15, 2021 at 11:00:18AM +0100, Philipp Zabel wrote:
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  rules/host-meson.make | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/host-meson.make b/rules/host-meson.make
> > index 98c4e453ba36..dd9bc37ee1af 100644
> > --- a/rules/host-meson.make
> > +++ b/rules/host-meson.make
> > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
> >  #
> >  # Paths and names
> >  #
> > -HOST_MESON_VERSION	:= 0.56.0
> > -HOST_MESON_MD5		:= 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
> > +HOST_MESON_VERSION	:= 0.60.2
> 
> This raises the required Python version to 3.6. This means we won't be able
> to build BSPs on Debian Stretch, Ubuntu Xenial and other distros of the
> same generation. Those are pretty old, but still have some LTS support.
> So if we do this, then I'd like to have an actual reason for this. A
> package that needs a newer meson version, problems with the old version
> etc.

GStreamer 1.19.3 depends on Meson >= 0.59, so this will become relevant
when 1.20 is released.

regards
Philipp

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] igt-gpu-tools: fix build with meson 0.60

[Michael Olbrich]

Thanks, applied as 981a6f88eea3565e8d700fa6dbce146fa3553fc0.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:31 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Backport igt-gpu-tools commit 963917a35654 ("lib/meson.build: Fix
> underscorify call") to fix build with recent Meson.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211215100018.3352980-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
> new file mode 100644
> index 000000000000..51df2f0c40d6
> --- /dev/null
> +++ b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
> @@ -0,0 +1,36 @@
> +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
> +From: Petri Latvala <petri.latvala@intel.com>
> +Date: Thu, 28 Oct 2021 11:05:31 +0300
> +Subject: [PATCH] lib/meson.build: Fix underscorify call
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +f.underscorify() is correct, f.underscorify(f) is an error that later
> +meson versions don't like at all.
> +
> +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
> +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
> +Cc: Arkadiusz Hiler <arek@hiler.eu>
> +Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> +Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> +---
> + lib/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/lib/meson.build b/lib/meson.build
> +index c3080fc82c29..297b0ad26ee5 100644
> +--- a/lib/meson.build
> ++++ b/lib/meson.build
> +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
> + 
> + lib_intermediates = []
> + foreach f: lib_sources
> +-    name = f.underscorify(f)
> ++    name = f.underscorify()
> +     lib = static_library('igt-' + name,
> + 	[ f, lib_version ],
> + 	include_directories: inc,
> +-- 
> +2.30.2
> +
> diff --git a/patches/igt-gpu-tools-1.26/series b/patches/igt-gpu-tools-1.26/series
> new file mode 100644
> index 000000000000..30537838e16d
> --- /dev/null
> +++ b/patches/igt-gpu-tools-1.26/series
> @@ -0,0 +1 @@
> +0001-lib-meson.build-Fix-underscorify-call.patch

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] meson: version bump 0.56.0 -> 0.60.2

[Michael Olbrich]

Thanks, applied as 8329bce800852c6c0a705d66d1c87f895386cb11.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:32 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211215100018.3352980-2-p.zabel@pengutronix.de>
> [mol: migrate patches]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch b/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
> deleted file mode 100644
> index 086ec0d8126b..000000000000
> --- a/patches/meson-0.56.0/0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From: Xavier Claessens <xavier.claessens@collabora.com>
> -Date: Mon, 7 Dec 2020 11:40:20 -0500
> -Subject: [PATCH] pkgconfig: Respect variable ordering when passed as list
> -
> -This fix a regression introduced in Meson 0.56.0 when using python 3.5.
> -Also mention in documentation that using a meson dict does not guarantee
> -ordering.
> -
> -Fixes: #8074.
> ----
> - mesonbuild/interpreter.py | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
> -index 6222f97a71d8..b0cbecc75114 100644
> ---- a/mesonbuild/interpreter.py
> -+++ b/mesonbuild/interpreter.py
> -@@ -2690,7 +2690,7 @@ class Interpreter(InterpreterBase):
> -             varlist = mesonlib.stringlistify(variables)
> -             if list_new:
> -                 FeatureNew.single_use('variables as list of strings', '0.56.0', self.subproject)
> --            variables = {}
> -+            variables = collections.OrderedDict()
> -             for v in varlist:
> -                 try:
> -                     (key, value) = v.split('=', 1)
> diff --git a/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 79%
> rename from patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index ccf5bfc2ff09..b0319b36566b 100644
> --- a/patches/meson-0.56.0/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ b/patches/meson-0.60.2/0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -7,14 +7,14 @@ size unnecessarily.
>  
>  Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>  ---
> - mesonbuild/linkers.py | 8 ++++++--
> + mesonbuild/linkers/linkers.py | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>  
> -diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
> -index 589945c511ff..59463bdfdcc5 100644
> ---- a/mesonbuild/linkers.py
> -+++ b/mesonbuild/linkers.py
> -@@ -605,7 +605,10 @@ class GnuLikeDynamicLinkerMixin:
> +diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
> +index 334fc4f24e13..9545744b9bca 100644
> +--- a/mesonbuild/linkers/linkers.py
> ++++ b/mesonbuild/linkers/linkers.py
> +@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
>           # Need to deduplicate rpaths, as macOS's install_name_tool
>           # is *very* allergic to duplicate -delete_rpath arguments
>           # when calling depfixer on installation.
> @@ -26,7 +26,7 @@ index 589945c511ff..59463bdfdcc5 100644
>           rpath_dirs_to_remove = set()
>           for p in all_paths:
>               rpath_dirs_to_remove.add(p.encode('utf8'))
> -@@ -633,7 +636,8 @@ class GnuLikeDynamicLinkerMixin:
> +@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
>                   paths = padding
>               else:
>                   paths = paths + ':' + padding
> diff --git a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 91%
> rename from patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch
> index f6f0dc44818e..f6c355728034 100644
> --- a/patches/meson-0.56.0/0101-HACK-enable-NEON-only-for-ARMv7.patch
> +++ b/patches/meson-0.60.2/0101-HACK-enable-NEON-only-for-ARMv7.patch
> @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>   1 file changed, 3 insertions(+)
>  
>  diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
> -index 4c066fb91339..e4b1824a7087 100644
> +index 3339cea5a03f..da2e740d4cd3 100644
>  --- a/mesonbuild/modules/unstable_simd.py
>  +++ b/mesonbuild/modules/unstable_simd.py
> -@@ -62,6 +62,9 @@ class SimdModule(ExtensionModule):
> +@@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
>                   continue
>               iset_fname = kwargs[iset] # Might also be an array or Files. static_library will validate.
>               args = compiler.get_instruction_set_args(iset)
> diff --git a/patches/meson-0.56.0/series b/patches/meson-0.60.2/series
> similarity index 61%
> rename from patches/meson-0.56.0/series
> rename to patches/meson-0.60.2/series
> index 10eaa55734b1..9c5fc70fddcf 100644
> --- a/patches/meson-0.56.0/series
> +++ b/patches/meson-0.60.2/series
> @@ -1,7 +1,6 @@
>  # generated by git-ptx-patches
>  #tag:upstream --start-number 1
> -0001-pkgconfig-Respect-variable-ordering-when-passed-as-l.patch
>  #tag:ptxdist --start-number 100
>  0100-don-t-add-rpaths-for-build-directories-when-cross-co.patch
>  0101-HACK-enable-NEON-only-for-ARMv7.patch
> -# a15bcb28786933dffabce202768a0e86  - git-ptx-patches magic
> +# 33cfd20a0dde8e2402f10a8f1e93fe81  - git-ptx-patches magic
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 98c4e453ba36..dd9bc37ee1af 100644
> --- a/rules/host-meson.make
> +++ b/rules/host-meson.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
>  #
>  # Paths and names
>  #
> -HOST_MESON_VERSION	:= 0.56.0
> -HOST_MESON_MD5		:= 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
> +HOST_MESON_VERSION	:= 0.60.2
> +HOST_MESON_MD5		:= 48a898e25f35e57a1b72c2b578884960
>  HOST_MESON		:= meson-$(HOST_MESON_VERSION)
>  HOST_MESON_SUFFIX	:= tar.gz
>  HOST_MESON_URL		:= https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/2] meson: version bump 0.56.0 -> 0.60.2

[Michael Olbrich]

On Fri, Dec 17, 2021 at 09:55:53AM +0100, Philipp Zabel wrote:
> On Fri, 2021-12-17 at 08:51 +0100, Michael Olbrich wrote:
> > On Wed, Dec 15, 2021 at 11:00:18AM +0100, Philipp Zabel wrote:
> > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > > ---
> > >  rules/host-meson.make | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/rules/host-meson.make b/rules/host-meson.make
> > > index 98c4e453ba36..dd9bc37ee1af 100644
> > > --- a/rules/host-meson.make
> > > +++ b/rules/host-meson.make
> > > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
> > >  #
> > >  # Paths and names
> > >  #
> > > -HOST_MESON_VERSION	:= 0.56.0
> > > -HOST_MESON_MD5		:= 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
> > > +HOST_MESON_VERSION	:= 0.60.2
> > 
> > This raises the required Python version to 3.6. This means we won't be able
> > to build BSPs on Debian Stretch, Ubuntu Xenial and other distros of the
> > same generation. Those are pretty old, but still have some LTS support.
> > So if we do this, then I'd like to have an actual reason for this. A
> > package that needs a newer meson version, problems with the old version
> > etc.
> 
> GStreamer 1.19.3 depends on Meson >= 0.59, so this will become relevant
> when 1.20 is released.

The latest pipewire update requires a new meson version as well. And the
latest systemd uses some Python 3.6 features. So I've applied this now.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de