From patchwork Wed Jun 26 01:53:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 14391 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 2452217167; Wed, 26 Jun 2019 02:55:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CDE3517165 for ; Wed, 26 Jun 2019 02:55:29 +0100 (BST) Received: from localhost ([::1]:36140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfx9i-0004gT-Ug for patchwork@mira.cbaines.net; Tue, 25 Jun 2019 21:55:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46389) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfx9O-0004bL-3e for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfx9L-0006ax-Eb for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfx9L-0006aH-9Z for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfx9L-0007KV-7L for guix-patches@gnu.org; Tue, 25 Jun 2019 21:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36387] [PATCH] gnu: mesa: Fix detection of wayland-scanner pkg-config file. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2019 01:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36387 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36387@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156151405228085 (code B ref -1); Wed, 26 Jun 2019 01:55:03 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2019 01:54:12 +0000 Received: from localhost ([127.0.0.1]:33960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfx8W-0007Iv-Df for submit@debbugs.gnu.org; Tue, 25 Jun 2019 21:54:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:39741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfx8V-0007Io-42 for submit@debbugs.gnu.org; Tue, 25 Jun 2019 21:54:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45683) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfx8S-0004CR-KP for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfx8R-0005Ca-1r for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60288) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfx8Q-0005AU-RC for guix-patches@gnu.org; Tue, 25 Jun 2019 21:54:06 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5A35B16005D for ; Wed, 26 Jun 2019 03:54:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1561514044; bh=3u6sYwWxssrZu4r699tKr9e4WcT7R3KPsxaJrcRSK0w=; h=From:To:Cc:Subject:Date:From; b=hvJv2OVdcVOg1/vqyiPWQ+5LGnuXLhUqEZPzwUImglHA8hVPdLerESmXajszEgY8u pyTvGdOgR0cW+DVzfNCqzvcJwBEHEl+Z5c0hGtd3kfw8IP4J/4xEj8SPVMOw/P2vP3 fRoDAssFrG4SojI1mHjNjVSwbHDJgg4oTs/V3RFMaR42wz41dnNr/x6ZWOEvdYSnyM oVFltLAAxOuq+KKL1cC7akYIPrd0H1+Ziz2pzV6hjRtznNUuwBV+/JT1OImlxEWWWt wZ8EWo5gNo8G0dqwGE0SFhZi4B/q5HyDS9ha7JwhKvrc7UpMvawxR8hvvYNSvLL/Zf EkNXWl/yyhJcw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 45YR0C4Ycpz6tm6; Wed, 26 Jun 2019 03:54:03 +0200 (CEST) From: Kei Kebreau Date: Tue, 25 Jun 2019 21:53:45 -0400 Message-Id: <20190626015345.19432-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190626015345.19432-1-kkebreau@posteo.net> References: <20190626015345.19432-1-kkebreau@posteo.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gl.scm (mesa)[arguments]: Add "patch-meson-build" phase. --- gnu/packages/gl.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 96e7fc7165..78f7401f20 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -337,6 +337,15 @@ also known as DXTn or DXTC) for Mesa.") (("'u_format_test',") "")) #t))) '()) + (add-after + 'unpack 'patch-meson-build + (lambda _ + ;; Without this, meson fails with the following error: + ;; Dependency "wayland-scanner" not found, tried pkgconfig. + (substitute* "meson.build" + (("dependency\\('wayland-scanner', native: true\\)") + "dependency('wayland-scanner')")) + #t)) (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys)