From patchwork Tue Jul 13 16:57:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 31376 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5A72527BC82; Tue, 13 Jul 2021 17:59:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A39427BC6B for ; Tue, 13 Jul 2021 17:59:11 +0100 (BST) Received: from localhost ([::1]:47790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3LkU-0000Us-5a for patchwork@mira.cbaines.net; Tue, 13 Jul 2021 12:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3LkM-0000Pl-Fs for guix-patches@gnu.org; Tue, 13 Jul 2021 12:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3LkM-00006d-8H for guix-patches@gnu.org; Tue, 13 Jul 2021 12:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3LkM-0008VF-40 for guix-patches@gnu.org; Tue, 13 Jul 2021 12:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49412] [PATCH v2] gnu: libdrm: Update to 2.4.107. References: <4s2tn7of6SN9mqU6sdllttaKyg4DEmnQh7R0axEJc@cp3-web-047.plabs.ch> In-Reply-To: <4s2tn7of6SN9mqU6sdllttaKyg4DEmnQh7R0axEJc@cp3-web-047.plabs.ch> Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jul 2021 16:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49412@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 49412-submit@debbugs.gnu.org id=B49412.162619548632623 (code B ref 49412); Tue, 13 Jul 2021 16:59:02 +0000 Received: (at 49412) by debbugs.gnu.org; 13 Jul 2021 16:58:06 +0000 Received: from localhost ([127.0.0.1]:41700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3LjS-0008U7-4B for submit@debbugs.gnu.org; Tue, 13 Jul 2021 12:58:06 -0400 Received: from mail-4324.protonmail.ch ([185.70.43.24]:22345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3LjO-0008Ta-1D for 49412@debbugs.gnu.org; Tue, 13 Jul 2021 12:58:04 -0400 Date: Tue, 13 Jul 2021 16:57:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1626195475; bh=YWYA3DqMTY8S7OjHbzBVH2Dc1x0IY+B9ZrSOttgVQuM=; h=Date:To:From:Cc:Reply-To:Subject:From; b=F0plnFZPJ/jG8HBcRRGzSS10BF7yT5ollnRLmvNUtcyqVFHQwEvLufJVCD884a1LE WsPl9q8VtFdO/+5lyRNNCPNC/HwfC5Iourx6eOJiLcvEbKkaoSRgnF5ck//FFFo2rD rA1naOy5nOU34hVrWrWvkUK5/TCRqXzan66SbpOU= Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata X-getmail-retrieved-from-mailbox: Patches * 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)))