[bug#36386] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[bug#36386] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Kei Kebreau]

This is a patch that enables mesa to build on my machine on the core-updates
branch as of June 25. Somehow, meson (the build system, not "mesa") fails to
detect wayland-scanner when the keyword argument "native" is set to true.
Hopefully this change does not cause trouble with cross-building.

[bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Kei Kebreau]

* gnu/packages/gl.scm (mesa)[arguments]: Add "patch-meson-build" phase.
---
 gnu/packages/gl.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 96e7fc7165..78f7401f20 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -337,6 +337,15 @@ also known as DXTn or DXTC) for Mesa.")
                        (("'u_format_test',") ""))
                      #t)))
                '())
+         (add-after
+           'unpack 'patch-meson-build
+           (lambda _
+             ;; Without this, meson fails with the following error:
+             ;; Dependency "wayland-scanner" not found, tried pkgconfig.
+             (substitute* "meson.build"
+               (("dependency\\('wayland-scanner', native: true\\)")
+                "dependency('wayland-scanner')"))
+             #t))
          (add-before
            'configure 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
2.22.0

bug#36386: [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

Kei Kebreau <kkebreau@posteo.net> writes:

> This is a patch that enables mesa to build on my machine on the core-updates
> branch as of June 25. Somehow, meson (the build system, not "mesa") fails to
> detect wayland-scanner when the keyword argument "native" is set to true.
> Hopefully this change does not cause trouble with cross-building.

This is due to a regression in Meson 0.51:

<https://github.com/mesonbuild/meson/issues/5502>

I reverted the upgrade for now, in commit
fd3594bf3881fb8d4c04f76db0f1a9cbd5fae871.  Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Maxim Cournoyer]

Hello,

Kei Kebreau <kkebreau@posteo.net> writes:

> * gnu/packages/gl.scm (mesa)[arguments]: Add "patch-meson-build" phase.
> ---
>  gnu/packages/gl.scm | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
> index 96e7fc7165..78f7401f20 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -337,6 +337,15 @@ also known as DXTn or DXTC) for Mesa.")
>                         (("'u_format_test',") ""))
>                       #t)))
>                 '())
> +         (add-after
> +           'unpack 'patch-meson-build
> +           (lambda _
> +             ;; Without this, meson fails with the following error:
> +             ;; Dependency "wayland-scanner" not found, tried pkgconfig.
> +             (substitute* "meson.build"
> +               (("dependency\\('wayland-scanner', native: true\\)")
> +                "dependency('wayland-scanner')"))
> +             #t))
>           (add-before
>             'configure 'fix-dlopen-libnames
>             (lambda* (#:key inputs outputs #:allow-other-keys)

Was this fixing a build failure of mesa itself?  Or does it manifest
when building other packages depending on mesa?

Given the patch is 2 years old, I'm guessing it went stale?

Thanks,

Maxim

[bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Kei Kebreau]

It did in fact go stale. I vaguely remember having some trouble building 
mesa locally, but this no longer seems to be the case.

On 11/13/21 8:22 PM, Maxim Cournoyer wrote:
> Hello,
>
> Kei Kebreau<kkebreau@posteo.net>  writes:
>
>> * gnu/packages/gl.scm (mesa)[arguments]: Add "patch-meson-build" phase.
>> ---
>>   gnu/packages/gl.scm | 9 +++++++++
>>   1 file changed, 9 insertions(+)
>>
>> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
>> index 96e7fc7165..78f7401f20 100644
>> --- a/gnu/packages/gl.scm
>> +++ b/gnu/packages/gl.scm
>> @@ -337,6 +337,15 @@ also known as DXTn or DXTC) for Mesa.")
>>                          (("'u_format_test',") ""))
>>                        #t)))
>>                  '())
>> +         (add-after
>> +           'unpack 'patch-meson-build
>> +           (lambda _
>> +             ;; Without this, meson fails with the following error:
>> +             ;; Dependency "wayland-scanner" not found, tried pkgconfig.
>> +             (substitute* "meson.build"
>> +               (("dependency\\('wayland-scanner', native: true\\)")
>> +                "dependency('wayland-scanner')"))
>> +             #t))
>>            (add-before
>>              'configure 'fix-dlopen-libnames
>>              (lambda* (#:key inputs outputs #:allow-other-keys)
> Was this fixing a build failure of mesa itself?  Or does it manifest
> when building other packages depending on mesa?
>
> Given the patch is 2 years old, I'm guessing it went stale?
>
> Thanks,
>
> Maxim

bug#36387: [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file.

[Maxim Cournoyer]

Hello,

Kei Kebreau <kkebreau@posteo.net> writes:

> It did in fact go stale. I vaguely remember having some trouble
> building mesa locally, but this no longer seems to be the case.

Alright, thank you for the heads up.  Closing.

Maxim