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

Previous Next

Package: guix-patches;

Reported by: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>

Date: Mon, 5 Jul 2021 10:38:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49412 in the body.
You can then email your comments to 49412 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Mon, 05 Jul 2021 10:38:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Kaelyn Takata <kaelyn.alexi <at> protonmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 05 Jul 2021 10:38:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
To: guix-patches <at> gnu.org
Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Subject: [PATCH core-updates] gnu: libdrm: Update to 2.4.107.
Date: Mon, 05 Jul 2021 08:43:54 +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"))))))
-    (inputs
+    (propagated-inputs
      `(("libpciaccess" ,libpciaccess)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.32.0






Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Mon, 05 Jul 2021 15:16:02 GMT) Full text and rfc822 format available.

Message #8 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>, 49412 <at> debbugs.gnu.org
Subject: Re: [bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.
Date: Mon, 05 Jul 2021 17:15:44 +0200
[Message part 1 (text/plain, inline)]
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.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Mon, 05 Jul 2021 15:59:02 GMT) Full text and rfc822 format available.

Message #11 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn <kaelyn.alexi <at> protonmail.com>
To: Maxime Devos <maximedevos <at> telenet.be>
Cc: 49412 <at> debbugs.gnu.org
Subject: Re: [bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.
Date: Mon, 05 Jul 2021 15:58:24 +0000
On Monday, July 5th, 2021 at 11:15 AM, Maxime Devos <maximedevos <at> 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 <at> debbugs.gnu.org to make it part of the same issue?

Cheers,
Kaelyn





Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Mon, 05 Jul 2021 21:59:01 GMT) Full text and rfc822 format available.

Message #14 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: "49412 <at> debbugs.gnu.org" <49412 <at> debbugs.gnu.org>
Subject: [PATCH core-updates] gnu: libdrm: Update to 2.4.107
Date: Mon, 05 Jul 2021 21:58:16 +0000
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




Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Tue, 06 Jul 2021 08:25:01 GMT) Full text and rfc822 format available.

Message #17 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Kaelyn <kaelyn.alexi <at> protonmail.com>
Cc: 49412 <at> debbugs.gnu.org
Subject: Re: [bug#49412] [PATCH core-updates] gnu: libdrm: Update to 2.4.107.
Date: Tue, 06 Jul 2021 10:24:47 +0200
[Message part 1 (text/plain, inline)]
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 <at> 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 <at> 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 <at> 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.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Thu, 08 Jul 2021 03:03:02 GMT) Full text and rfc822 format available.

Message #20 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: "49412 <at> debbugs.gnu.org" <49412 <at> debbugs.gnu.org>
Subject: Re: [PATCH core-updates] gnu: libdrm: Update to 2.4.107
Date: Thu, 08 Jul 2021 03:02:23 +0000
> If you mean the 'when tests?' patch, then I'd send it to 49412 <at> 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 <at> 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).




Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Thu, 08 Jul 2021 15:44:01 GMT) Full text and rfc822 format available.

Message #23 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: "49412 <at> debbugs.gnu.org" <49412 <at> debbugs.gnu.org>
Subject: Re: [PATCH core-updates] gnu: libdrm: Update to 2.4.107
Date: Thu, 08 Jul 2021 15:43:17 +0000
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.




Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Tue, 13 Jul 2021 16:59:02 GMT) Full text and rfc822 format available.

Message #26 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
To: 49412 <at> debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Subject: [PATCH v2] gnu: libdrm: Update to 2.4.107.
Date: Tue, 13 Jul 2021 16:57:48 +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 (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






Information forwarded to guix-patches <at> gnu.org:
bug#49412; Package guix-patches. (Mon, 26 Jul 2021 14:20:01 GMT) Full text and rfc822 format available.

Message #29 received at 49412 <at> debbugs.gnu.org (full text, mbox):

From: Thiago Jung Bauermann <bauermann <at> kolabnow.com>
To: 49412 <at> debbugs.gnu.org
Cc: John Kehayias <john.kehayias <at> protonmail.com>,
 Maxime Devos <maximedevos <at> telenet.be>,
 Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Subject: Re: [bug#49412] [PATCH v2] gnu: libdrm: Update to 2.4.107.
Date: Mon, 26 Jul 2021 11:19:23 -0300
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






Reply sent to Ludovic Courtès <ludo <at> gnu.org>:
You have taken responsibility. (Sat, 31 Jul 2021 10:05:01 GMT) Full text and rfc822 format available.

Notification sent to Kaelyn Takata <kaelyn.alexi <at> protonmail.com>:
bug acknowledged by developer. (Sat, 31 Jul 2021 10:05:02 GMT) Full text and rfc822 format available.

Message #34 received at 49412-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Cc: 49412-done <at> debbugs.gnu.org
Subject: Re: bug#49412: [PATCH core-updates] gnu: libdrm: Update to 2.4.107.
Date: Sat, 31 Jul 2021 12:03:51 +0200
Hi,

Kaelyn Takata <kaelyn.alexi <at> 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’.




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 28 Aug 2021 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 214 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.