all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: The Man <squishypinkelephant@gmail.com>
To: 74522@debbugs.gnu.org
Cc: The Man <squishypinkelephant@gmail.com>,
	Lars-Dominik Braun <lars@6xq.net>, Marius Bakke <marius@gnu.org>,
	Munyoki Kilyungi <me@bonfacemunyoki.com>,
	Sharlatan Hellseher <sharlatanus@gmail.com>,
	Tanguy Le Carrour <tanguy@bioneland.org>,
	jgart <jgart@dismail.de>
Subject: [bug#74522] [PATCH 44/73] move libgl provider from mesa to libglvnd+mesa
Date: Sun, 24 Nov 2024 21:41:37 -0600	[thread overview]
Message-ID: <d04c10319a76687e4854f534c32cf9600f02fe18.1732504868.git.squishypinkelephant@gmail.com> (raw)
In-Reply-To: <cover.1732504867.git.squishypinkelephant@gmail.com>

Change-Id: Ib02f8c469979adbbf20f2872e50ebc175a777380
---
 gnu/packages/python-graphics.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index 403a3c3b34..8ed16ef70b 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -61,21 +61,21 @@ (define-public python-glcontext
         #~(modify-phases %standard-phases
             (add-before 'build 'fix-lib-paths
               (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let ((mesa (assoc-ref inputs "mesa"))
+                (let ((libgl (assoc-ref inputs "libgl"))
                       (libx11 (assoc-ref inputs "libx11")))
                   (substitute* '("glcontext/x11.cpp"
                                  "glcontext/egl.cpp")
                     (("\"libGL.so\"")
-                     (string-append "\"" mesa "/lib/libGL.so\""))
+                     (string-append "\"" libgl "/lib/libGL.so\""))
                     (("\"libEGL.so\"")
-                     (string-append "\"" mesa "/lib/libEGL.so\""))
+                     (string-append "\"" libgl "/lib/libEGL.so\""))
                     (("\"libX11.so\"")
                      (string-append "\"" libx11 "/lib/libX11.so\"")))
                   (substitute* '("glcontext/__init__.py")
                     (("find_library\\('GL'\\)")
-                     (string-append "'" mesa "/lib/libGL.so'"))
+                     (string-append "'" libgl "/lib/libGL.so'"))
                     (("find_library\\('EGL'\\)")
-                     (string-append "'" mesa "/lib/libEGL.so'"))
+                     (string-append "'" libgl "/lib/libEGL.so'"))
                     (("find_library\\(\"X11\"\\)")
                      (string-append "'" libx11 "/lib/libX11.so'"))))))
             (add-before 'check 'prepare-test-environment
@@ -84,7 +84,7 @@ (define-public python-glcontext
                 (setenv "DISPLAY" ":1"))))))
       (inputs
        (list libx11
-             mesa))
+             libgl))
       (native-inputs
        (list python-psutil
              python-pytest
@@ -157,7 +157,7 @@ (define-public python-pyglet
                                  "pyglet/media/drivers/openal/lib_openal.py"
                                  "pyglet/media/drivers/pulse/lib_pulseaudio.py")
                 (("'EGL'")
-                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                 (format #f "'~a/~a'" #$(this-package-input "libgl")
                          "lib/libEGL.so"))
                 (("\"fontconfig\"")
                  (format #f "'~a/~a'" #$(this-package-input "fontconfig-minimal")
@@ -166,7 +166,7 @@ (define-public python-pyglet
                  (format #f "'~a/~a'" #$(this-package-input "freetype")
                          "lib/libfreetype.so"))
                 (("'GL'")
-                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                 (format #f "'~a/~a'" #$(this-package-input "libgl")
                          "lib/libGL.so"))
                 (("'GLU'")
                  (format #f "'~a/~a'" #$(this-package-input "glu")
@@ -223,7 +223,7 @@ (define-public python-pyglet
            libxext
            libxinerama
            libxxf86vm
-           mesa
+           libgl
            openal
            pulseaudio))
     (home-page "https://github.com/pyglet/pyglet")
-- 
2.46.0





  parent reply	other threads:[~2024-11-25  3:46 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-25  3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 01/73] move libgl provider from mesa to libglvnd+mesa The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 02/73] " The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 03/73] " The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 04/73] " The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 05/73] " The Man
2024-11-25  3:40 ` [bug#74522] [PATCH 06/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 07/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 08/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 09/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 10/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 11/73] " The Man
2024-11-25  5:18   ` Liliana Marie Prikler
2024-11-25  3:41 ` [bug#74522] [PATCH 12/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 13/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 14/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 15/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 16/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 17/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 18/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 19/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 20/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 21/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 22/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 23/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 24/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 25/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 26/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 27/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 28/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 29/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 30/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 31/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 32/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 33/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 34/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 35/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 36/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 37/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 38/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 39/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 40/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 41/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 42/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 43/73] " The Man
2024-11-25  3:41 ` The Man [this message]
2024-11-25  3:41 ` [bug#74522] [PATCH 45/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 46/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 47/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 48/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 49/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 50/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 51/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 52/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 53/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 54/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 55/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 56/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 57/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 58/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 59/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 60/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 61/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 62/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 63/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 64/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 65/73] " The Man
2024-11-25  3:41 ` [bug#74522] [PATCH 66/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 67/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 68/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 69/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 70/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 71/73] " The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 72/73] move libgl provider from mesa to libglvnd+mesa TEMP The Man
2024-11-25  3:42 ` [bug#74522] [PATCH 73/73] move libgl provider from mesa to libglvnd+mesa The Man

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d04c10319a76687e4854f534c32cf9600f02fe18.1732504868.git.squishypinkelephant@gmail.com \
    --to=squishypinkelephant@gmail.com \
    --cc=74522@debbugs.gnu.org \
    --cc=jgart@dismail.de \
    --cc=lars@6xq.net \
    --cc=marius@gnu.org \
    --cc=me@bonfacemunyoki.com \
    --cc=sharlatanus@gmail.com \
    --cc=tanguy@bioneland.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.