GNU bug report logs - #65375
[PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65375 in the body.
You can then email your comments to 65375 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 64981 <at> debbugs.gnu.org
Subject: [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.
Date: Sat, 19 Aug 2023 10:59:34 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

Fixes <https://issues.guix.gnu.org/64981>.

* 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(-)

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))

base-commit: 597af70fd24eb85a85fa8c45008c9cfa241f4d0b
-- 
2.41.0

Message #8 received at 65375 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: iyzsong <at> envs.net, "(" <paren <at> disroot.org>, Csepp <raingloom <at> riseup.net>,
 liliana.prikler <at> gmail.com, Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>,
 Efraim Flashner <efraim <at> flashner.co.il>, jbranso <at> dismail.de
Cc: 宋文武 <iyzsong <at> member.fsf.org>, 64981 <at> debbugs.gnu.org,
 guix-patches <at> gnu.org, 65375 <at> debbugs.gnu.org
Subject: Re: bug#64981: GTK4 applications broken (missing libGLESv2)
Date: Fri, 06 Oct 2023 15:47:00 +0000

Hi everyone,

Not sure if people saw this patch, has anyone tested if it fixes the
problem for them? I can include it in an upcoming mesa-updates branch
with other related updates/rebuilds.

<https://issues.guix.gnu.org/65375>

Hope I got everyone from the original bug thread (seems many replies
didn't go directly to everyone) and cc'ed the patch number as well.

Thanks!
John

On Sat, Aug 19, 2023 at 10:59 AM, iyzsong <at> envs.net wrote:

> From: 宋文武 <iyzsong <at> member.fsf.org>
>
> Fixes <https://issues.guix.gnu.org/64981>.
>
> * 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(-)
>
> 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))
>
> base-commit: 597af70fd24eb85a85fa8c45008c9cfa241f4d0b

Message #13 received at 65375-done <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: 64981-done <at> debbugs.gnu.org, 65375-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>, "\(" <paren <at> disroot.org>,
 Efraim Flashner <efraim <at> flashner.co.il>, iyzsong <at> envs.net,
 liliana.prikler <at> gmail.com, guix-patches <at> gnu.org, jbranso <at> dismail.de,
 Csepp <raingloom <at> riseup.net>,
 Denis 'GNUtoo' Carikli <GNUtoo <at> cyberdimension.org>
Subject: Re: bug#64981: GTK4 applications broken (missing libGLESv2)
Date: Tue, 28 Nov 2023 05:33:06 +0000

On Fri, Oct 06, 2023 at 03:47 PM, John Kehayias wrote:

> Hi everyone,
>
> Not sure if people saw this patch, has anyone tested if it fixes the
> problem for them? I can include it in an upcoming mesa-updates branch
> with other related updates/rebuilds.
>
> <https://issues.guix.gnu.org/65375>
>
> Hope I got everyone from the original bug thread (seems many replies
> didn't go directly to everyone) and cc'ed the patch number as well.
>

Pushed as 37fc2c99e0067dfd669526c61dc10d014b89c08b (on mesa-updates
first and then merged to master).

Thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.