From patchwork Sat Aug 19 02:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53004 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 0111227BBEA; Sat, 19 Aug 2023 04:00:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D4EED27BBE9 for ; Sat, 19 Aug 2023 04:00:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXCC6-0004RE-Im; Fri, 18 Aug 2023 23:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXCC2-0004Qj-Sk for guix-patches@gnu.org; Fri, 18 Aug 2023 23:00:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXCC2-0006Ww-K4 for guix-patches@gnu.org; Fri, 18 Aug 2023 23:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXCC2-0003t6-Tm for guix-patches@gnu.org; Fri, 18 Aug 2023 23:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65375] [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 03:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65375 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65375@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , 64981@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169241398914892 (code B ref -1); Sat, 19 Aug 2023 03:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Aug 2023 02:59:49 +0000 Received: from localhost ([127.0.0.1]:49139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXCBo-0003s7-UH for submit@debbugs.gnu.org; Fri, 18 Aug 2023 22:59:49 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXCBm-0003rp-G5 for submit@debbugs.gnu.org; Fri, 18 Aug 2023 22:59:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXCBf-0004P9-Vn for guix-patches@gnu.org; Fri, 18 Aug 2023 22:59:40 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXCBd-0006UL-8L for guix-patches@gnu.org; Fri, 18 Aug 2023 22:59:39 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id ADE4238A0097; Sat, 19 Aug 2023 02:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1692413974; bh=62CqGjG0NQEf0cqNwe60oU+5u+5Mhc1lzYhxJ80i0eI=; h=From:To:Cc:Subject:Date:From; b=a/JG+B1xEhXj+UuNfsoIDxGbXLpE7QNbR+9ZCwdNTki5wRYFwUy5o4e9RptxBRHw6 Tu7oH3xcaYeXCSX+sH2QfMgjWD2GcKTdsr/1RJJDt8tkvegTfs/go5sf/QWlCJPyRs UJ7V/dbWGm2cvWR2/GYZMx6VrQ7S4+GlCQfjXk00kYvo6hCOpuSbXugMsIV6ERVmrB +wqqTpnpIpVAZCwKs8zivFpu91DakjthT0UukPs8sYlHKstXzoQAVtAb/gaG5ZYeHt k5fLBan/Hyx8Ycx96bmhc9l5XjBsDQavwz7Bm++XQP63TuEwfSdtG7ivgeBvixPt9K HGme9lDH1d2/pB1X9MmEOfS1Uv4wTBK3n/cgnq6nORAtUdUUp/cwDNNWWSSZm9S1br 9tTYfgyFldVKFZosvfnkgs4xfC8hH2P55+XUsA8sy+EH6Q1uT++k82SaHBr1f7G59o 8/cxXTnP/eywrnhFT8yWI/Qa/tc8JWvvBtYBD0nxRrOAtGr15VuFUS1D7c45bA9U7g hwvgTGazo5NmyqU29nBW9DzLEFWWQJgcvZySRI6ooVTZEmb7ilo64dqrB8i3RCxC21 bQRfX1R4Dg7nJXpnN5NzX6w0f6s4mB01oR6WeNQkvSYalFu4hlZ5l9JitmB7l2+dK4 nEoZYbkch+/sxcIXx1FWFetU= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id IilMCLFNdV6M; Sat, 19 Aug 2023 02:59:29 +0000 (UTC) Received: from localhost (unknown [36.170.56.121]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 19 Aug 2023 02:59:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4b8b40c6; Sat, 19 Aug 2023 02:59:43 +0000 (UTC) Date: Sat, 19 Aug 2023 10:59:34 +0800 Message-ID: <4d6f572f6f936a57f80f0447ef8b7ce0ec06b663.1692413930.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 Fixes . * gnu/packages/gl.scm (libepoxy)[arguments]<#:phases>: Hardcode paths to libGLESv1_CM.so.1 and libGLESv2.so.2. --- gnu/packages/gl.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) base-commit: 597af70fd24eb85a85fa8c45008c9cfa241f4d0b diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b53b42a9ba..f662f0f7da 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -742,10 +742,14 @@ (define-public libepoxy #~(modify-phases %standard-phases (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((mesa (dirname (search-input-file inputs "lib/libGL.so")))) + (let ((mesa-lib + (lambda (file) + (search-input-file inputs (string-append "lib/" file))))) (substitute* (find-files "." "\\.[ch]$") - (("libGL.so.1") (string-append mesa "/libGL.so.1")) - (("libEGL.so.1") (string-append mesa "/libEGL.so.1"))))))))) + (("libGL.so.1") (mesa-lib "libGL.so.1")) + (("libEGL.so.1") (mesa-lib "libEGL.so.1")) + (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1")) + (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2"))))))))) (build-system meson-build-system) (native-inputs (list pkg-config python))