Subject: bug#65375: closed (Re: bug#64981: GTK4 applications broken (missing libGLESv2))

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 28 Nov 2023 05:34:03 +0000

Your bug report

#65375: [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
65375: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65375
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#64981: GTK4 applications broken (missing libGLESv2)
From: John Kehayias <[email-masked]>
To: [email-masked], [email-masked]
Cc: 宋文武 <[email-masked]>, "\(" <[email-masked]>, Efraim Flashner <[email-masked]>, [email-masked], [email-masked], [email-masked], [email-masked], Csepp <[email-masked]>, Denis 'GNUtoo' Carikli <[email-masked]>
Date: Tue, 28 Nov 2023 05:33:06 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

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!

Subject: [PATCH] gnu: libepoxy: Hardcode paths to GLES libraries.
From: [email-masked]
To: [email-masked]
Cc: 宋文武 <[email-masked]>, [email-masked]
Date: Sat, 19 Aug 2023 10:59:34 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

From: 宋文武 <[email-masked]>

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