From patchwork Sat Feb 26 04:32:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37456 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 EA0C627BBEA; Sat, 26 Feb 2022 04:34:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A8FE627BBE9 for ; Sat, 26 Feb 2022 04:34:25 +0000 (GMT) Received: from localhost ([::1]:36348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNoml-000293-Gg for patchwork@mira.cbaines.net; Fri, 25 Feb 2022 23:34:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027W-Ma for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomR-000841-Ed for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomR-0005XZ-CV for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 4/4] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164585000221213 (code B ref 54069); Sat, 26 Feb 2022 04:34:03 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:22 +0000 Received: from localhost ([127.0.0.1]:54070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNoll-0005W4-HL for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:21 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:46922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNola-0005Uv-OG for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:20 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4K5DKF2TYDz9sTj; Sat, 26 Feb 2022 05:33:05 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fyKbFmRYWH04Q30NYoCpr2IESdxVpC6jHCM41BR4KOI=; b=GCfgi7mz0x9hlVwPm3oFXk3M8Hxx3GoBhTiGBkEtSz5sOPQ3xAGxYsuw+5DLejY+vemU+I TSmHjAW+21WgZqyirMvoCCtRJgxFnXgPbc2co56rzu5BQmuBzJrrY/k6pyEC3I3ggPLwvM FIANIHnQWLUsLQ9hqiP+xFuNklyEqLZIQAmWHZAwlNIv6D+FSNvYddRXgupbWrCbm7uwcp 1FLOpvYNeLMMQRp1mrFuPXLz63FWS/2p3Jku2sBwlTvTZObPrFFkqgPoEMawQ1IX2ctJOB 2MpjwFzX0cOlHD+COSCmvFGX0qsVe8StfHvxuQc5fqxcMGS2ET6dn3vlZ6xDyQ== Date: Sat, 26 Feb 2022 15:32:38 +1100 Message-Id: <20220226043238.2657-4-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14e35d19ae..99ef114e9c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,16 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append "--with-pciids-path=" #$hwdata:pci "/share/hwdata")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.")