branch mesa-updates updated: gnu: libdrm: Restore building libdrm_intel by default.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

podiki pushed a commit to branch mesa-updates
in repository guix.

The following commit(s) were added to refs/heads/mesa-updates by this push:
     new e4f42164e9 gnu: libdrm: Restore building libdrm_intel by default.
e4f42164e9 is described below

commit e4f42164e93163d376cf1f842feffbd1c35ae72a
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Tue Nov 7 01:48:40 2023 -0500

    gnu: libdrm: Restore building libdrm_intel by default.
    
    This should fix mediasdk failing to build by not finding libdrm_intel as it
    was not built in libdrm after the update to 2.4.117.
    
    * gnu/packages/xdisorg.scm (libdrm)[phases]: Add phase to correct an 
upstream
    typo which disabled building libdrm_intel on supported platforms by default.
    
    Change-Id: I8a3f8d23ca3827a0c1f4fec47bca6cfa91a6526e
---
 gnu/packages/xdisorg.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index b310e6a20d..e4370b1150 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -744,6 +744,16 @@ rasterisation.")
              (_ ''()))
            #:phases
            #~(modify-phases %standard-phases
+               ;; A typo in a previous upstream commit disabled building
+               ;; libdrm_intel by default on supported platforms.  This was
+               ;; fixed by the following change in upstream commit
+               ;; 8a933c778a0eb36526bf3fc8a289e25add9ff8b0.
+               ;; TODO: Remove on next update of libdrm.
+               (add-after 'unpack 'build-intel-by-default
+                 (lambda _
+                   (substitute* "meson.build"
+                     (("system\\(\\)\\.startswith")
+                      "cpu_family().startswith"))))
                (replace 'check
                  (lambda* (#:key tests? #:allow-other-keys)
                    (when tests?