[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
libpciaccess to a propagated input as the pkg-config for libdrm_intel now
includes it in the libs.
---
 gnu/packages/xdisorg.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d0da2d28d1..1b38149654 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -638,7 +638,7 @@ rasterisation.")
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.104")
+    (version "2.4.107")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -646,7 +646,7 @@ rasterisation.")
                     version ".tar.xz"))
               (sha256
                (base32
-                "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"))))
+                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -663,7 +663,7 @@ rasterisation.")
                   (replace 'check
                     (lambda _
                       (invoke "meson" "test" "--timeout-multiplier" "5"))))))
-    (inputs
+    (propagated-inputs
      `(("libpciaccess" ,libpciaccess)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.32.0

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[Maxime Devos]

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

Kaelyn Takata via Guix-patches via schreef op ma 05-07-2021 om 08:43 [+0000]:
> * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
> libpciaccess to a propagated input as the pkg-config for libdrm_intel now
> includes it in the libs.
> ---
>  gnu/packages/xdisorg.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index d0da2d28d1..1b38149654 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -638,7 +638,7 @@ rasterisation.")
>  (define-public libdrm
>    (package
>      (name "libdrm")
> -    (version "2.4.104")
> +    (version "2.4.107")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> @@ -646,7 +646,7 @@ rasterisation.")
>                      version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"))))
> +                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
>      (build-system meson-build-system)
>      (arguments
>       `(#:configure-flags
> @@ -663,7 +663,7 @@ rasterisation.")
>                    (replace 'check
>                      (lambda _
>                        (invoke "meson" "test" "--timeout-multiplier" "5"))))))

If you are updating "libdrm" on core-updates anyway,
can you also make the following change (as a separate patch)?:

(replace 'check
  (lambda* (#:key tests? #:allow-other-keys)
    (when tests?
      (invoke "meson" "test" "--timeout-multiplier" 5))))

That should allow "guix build SOMETHING --without-tests=libdrm" to work.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[Kaelyn via Guix-patches via]

On Monday, July 5th, 2021 at 11:15 AM, Maxime Devos <maximedevos@telenet.be> wrote:

> Kaelyn Takata via Guix-patches via schreef op ma 05-07-2021 om 08:43 [+0000]:
>
> > -   gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
> >
> >     libpciaccess to a propagated input as the pkg-config for libdrm_intel now
> >
> >     includes it in the libs.
> >
> > gnu/packages/xdisorg.scm | 6 +++---
> >
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> >
> > index d0da2d28d1..1b38149654 100644
> >
> > --- a/gnu/packages/xdisorg.scm
> >
> > +++ b/gnu/packages/xdisorg.scm
> >
> > @@ -638,7 +638,7 @@ rasterisation.")
> >
> > (define-public libdrm
> >
> > (package
> >
> > (name "libdrm")
> >
> > -   (version "2.4.104")
> >
> > -   (version "2.4.107")
> >
> >     (source (origin
> >
> >     (method url-fetch)
> >
> >     (uri (string-append
> >
> >     @@ -646,7 +646,7 @@ rasterisation.")
> >
> >     version ".tar.xz"))
> >
> >     (sha256
> >
> >     (base32
> >
> > -                  "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"))))
> >
> >
> >
> > -                  "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
> >
> >
> >     (build-system meson-build-system)
> >
> >     (arguments
> >
> >     `(#:configure-flags
> >
> >     @@ -663,7 +663,7 @@ rasterisation.")
> >
> >     (replace 'check
> >
> >     (lambda _
> >
> >     (invoke "meson" "test" "--timeout-multiplier" "5"))))))
>
> If you are updating "libdrm" on core-updates anyway,
>
> can you also make the following change (as a separate patch)?:
>
> (replace 'check
>
> (lambda* (#:key tests? #:allow-other-keys)
>
> (when tests?
>
> (invoke "meson" "test" "--timeout-multiplier" 5))))
>
> That should allow "guix build SOMETHING --without-tests=libdrm" to work.

I'm not familiar with the "--without-tests=" flag and mechanism, but would be happy to add a patch for it. I've only recently started using Guix and this is my first patch submission (it's a precursor patch from my attempt to update mesa to 21.1.x); should I email that patch to 49412@debbugs.gnu.org to make it part of the same issue?

Cheers,
Kaelyn

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107

[John Kehayias via Guix-patches via]

With regards to updating Mesa, please see the issue below for work on that (looks like some packages will have be updated with the new Mesa, too):

https://issues.guix.gnu.org/49339

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[Maxime Devos]

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

Kaelyn schreef op ma 05-07-2021 om 15:58 [+0000]:
> [...]
> I'm not familiar with the "--without-tests=" flag and mechanism, but would be happy
> to add a patch for it. I've only recently started using Guix and this is my first
> patch submission (it's a precursor patch from my attempt to update mesa to 21.1.x);
> should I email that patch to 49412@debbugs.gnu.org to make it part of the same issue?

If you mean the 'when tests?' patch, then I'd send it to 49412@debbugs.gnu.org
to keep the libdrm patches together (maybe as a v2 patch series).  If you mean
‘updating mesa to 21.1.1x’, then I'd send that patch to guix-patches@gnu.org,
as updating 'mesa' seems much more complicated than only updating 'libdrm'
(see reply by John Kehayias).

There is some documentation in the chapter ‘16 Contributing’ in the manual
on the process (more specifically, the section ‘16.6 Submitting Patches’)
but it doesn't have much advice on when to split patch series ...

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107

[John Kehayias via Guix-patches via]

> If you mean the 'when tests?' patch, then I'd send it to 49412@debbugs.gnu.orgto keep the libdrm patches together (maybe as a v2 patch series).  If you mean‘updating mesa to 21.1.1x’, then I'd send that patch to guix-patches@gnu.org,as updating 'mesa' seems much more complicated than only updating 'libdrm'(see reply by John Kehayias).

Just to follow up here, I think Mesa can be updated pretty simply too, as the original Mesa patch referenced also enabled libglvnd. I've followed up on both the original patch submission and on guix-devel (to gather feedback on moving things to libglvnd).

[bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107

[John Kehayias via Guix-patches via]

I've updated the Mesa patch over at https://issues.guix.gnu.org/49339 to just do a minimal version bump and not touch libdrm, relying on this patch for that. So it would be great to get this libdrm update merged so we can move ahead with Mesa to 21.1.4.

[bug#49412] [PATCH v2] gnu: libdrm: Update to 2.4.107.

[Kaelyn Takata via Guix-patches via]

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
libpciaccess to a propagated input as the pkg-config for libdrm_intel now
includes it in the libs.
* gnu/packages/xdisorg.scm (libdrm): Add conditional testing support to the
replacement for the standard check phase.
---
 gnu/packages/xdisorg.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d0da2d28d1..dd30dbf844 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -638,7 +638,7 @@ rasterisation.")
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.104")
+    (version "2.4.107")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -646,7 +646,7 @@ rasterisation.")
                     version ".tar.xz"))
               (sha256
                (base32
-                "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"))))
+                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -661,9 +661,10 @@ rasterisation.")
 
        #:phases (modify-phases %standard-phases
                   (replace 'check
-                    (lambda _
-                      (invoke "meson" "test" "--timeout-multiplier" "5"))))))
-    (inputs
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "meson" "test" "--timeout-multiplier" "5")))))))
+    (propagated-inputs
      `(("libpciaccess" ,libpciaccess)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.32.0

[bug#49412] [PATCH v2] gnu: libdrm: Update to 2.4.107.

[Thiago Jung Bauermann via Guix-patches via]

Hello,

Em terça-feira, 13 de julho de 2021, às 13:57:48 -03, Kaelyn Takata via 
Guix-patches via escreveu:
> * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
> libpciaccess to a propagated input as the pkg-config for libdrm_intel now
> includes it in the libs.
> * gnu/packages/xdisorg.scm (libdrm): Add conditional testing support to
> the replacement for the standard check phase.
> ---
>  gnu/packages/xdisorg.scm | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)

Thank you for this patch. FWIW, I applied it and built libdrm successfully 
on x86_64-linux. I also verified that the SHA256 sum matches the one from 
the official release announcement¹, and that:

$ ./pre-inst-env guix build --without-tests=libdrm plymouth

skips the libdrm tests.

I wasn’t able to find the OpenPGP key that signed the release tarball, so I 
couldn’t check its signature.

-- 
Thanks,
Thiago

¹ https://lists.freedesktop.org/archives/dri-devel/2021-July/313594.html

bug#49412: [PATCH core-updates] gnu: libdrm: Update to 2.4.107.

[Ludovic Courtès]

Hi,

Kaelyn Takata <kaelyn.alexi@protonmail.com> skribis:

> * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.107, and change
> libpciaccess to a propagated input as the pkg-config for libdrm_intel now
> includes it in the libs.
> * gnu/packages/xdisorg.scm (libdrm): Add conditional testing support to the
> replacement for the standard check phase.

I tweaked the commit log and applied it.

Thank you, and thanks Maxime and Thiego for reviewing!

Ludo’.