From patchwork Wed Nov 20 11:32:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sisiutl X-Patchwork-Id: 70603 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 97EA227BBEA; Wed, 20 Nov 2024 11:34:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 E344D27BBE2 for ; Wed, 20 Nov 2024 11:34:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDiyE-0007ZR-2c; Wed, 20 Nov 2024 06:34:06 -0500 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 1tDiyC-0007Yz-4M for guix-patches@gnu.org; Wed, 20 Nov 2024 06:34:04 -0500 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 1tDiyB-0003gR-SC for guix-patches@gnu.org; Wed, 20 Nov 2024 06:34:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=by9JzQn1SSuWzsqxO91NxCAzlhBBBpguacxmHICecho=; b=PP04XRDGaWC1OlfA/2AoE0h862hyGWgEF6DTRFDMzMT2Ax0od/0wHfpqbkOMNzT4nwVORyXwveI09F8yWdx+TkmH4JBYRdTkkmZHYwUPz2PKfEugCRXUZBrAODSZI9Pbb3Sm6O1lcaY2R3C4cFtaE8sHCC+YnV6soXXejMe4OJEWr4SDS5r7ZpqmC7j5qpPKTeq3UtrpDRxr+cx2eR2DkpYI+Po3Ucl/Lj2HQSG5cb/EZuPosGzG7Ay9IBehqPsV2YWjnHaL4Ar0zyGbHUikxfHZ5pdvSbAli7FW3ZAvMaA/O+dOCgQ2sDZ3o6TunMa9xveN1Ta4/mvTLvoHPkJqNQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDiyA-0007Ro-DU for guix-patches@gnu.org; Wed, 20 Nov 2024 06:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74443] [PATCH] gnu: python-pyopengl: Add support for additional GL platforms. Resent-From: Sisiutl Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 11:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74443 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74443@debbugs.gnu.org Cc: Sisiutl X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173210241128579 (code B ref -1); Wed, 20 Nov 2024 11:34:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Nov 2024 11:33:31 +0000 Received: from localhost ([127.0.0.1]:45563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDixe-0007Qt-Rx for submit@debbugs.gnu.org; Wed, 20 Nov 2024 06:33:31 -0500 Received: from lists.gnu.org ([209.51.188.17]:43170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDixd-0007Qk-6v for submit@debbugs.gnu.org; Wed, 20 Nov 2024 06:33:29 -0500 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 1tDixc-0007WP-UA for guix-patches@gnu.org; Wed, 20 Nov 2024 06:33:28 -0500 Received: from 2a02-8428-4716-0c01-eecc-61c0-3286-ff35.rev.sfr.net ([2a02:8428:4716:c01:eecc:61c0:3286:ff35] helo=fujo.egregore.fun) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDixb-00032P-7o for guix-patches@gnu.org; Wed, 20 Nov 2024 06:33:28 -0500 Received: from localhost (2a02-8428-4716-0c01-69f4-ade7-72a4-dc0f.rev.sfr.net [IPv6:2a02:8428:4716:c01:69f4:ade7:72a4:dc0f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) (Authenticated sender: sisiutl@egregore.fun) by fujo.egregore.fun (Postfix) with ESMTPSA id 99B5B6D4F4; Wed, 20 Nov 2024 12:32:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=egregore.fun; s=fujo; t=1732102343; bh=by9JzQn1SSuWzsqxO91NxCAzlhBBBpguacxmHICecho=; h=From:To:Cc:Subject:Date; b=emKywX1fKn/Z+/zptyX9wV57mf91mhM+ha7cYjjHTjc73PAMLnQlG/0WYXXWo4qDF QeYp8NtvS3s00/NX8x9uEpW5jVtQu/fow0ZcHWcHbsDZsuu2ouTjEFQvpMpnVoK9eH 1IleGu6DlNkH1Ov0gSS8eFa8cnRsQhncGZajFxKU= From: Sisiutl Date: Wed, 20 Nov 2024 12:32:10 +0100 Message-ID: <20241120113213.18100-1-sisiutl@egregore.fun> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:8428:4716:c01:eecc:61c0:3286:ff35; envelope-from=sisiutl@egregore.fun; helo=fujo.egregore.fun X-Spam_score_int: 67 X-Spam_score: 6.7 X-Spam_bar: ++++++ X-Spam_report: (6.7 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.999, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_PBL=3.335, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: reject 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: , 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 * gnu/packages/python-xyz.scm (python-pyopengl)[arguments]: Fix paths for non-GLX platforms too. Change-Id: Ib50d5c64ff73079c4ffa3bd3e03012a66591ddfc --- gnu/packages/python-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5083473c08..04af924a71 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25706,18 +25706,18 @@ (define-public python-pyopengl (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* '("OpenGL/platform/ctypesloader.py") (("filenames_to_try = \\[\\]") "filenames_to_try = [name]")) - (substitute* '("OpenGL/platform/glx.py" "tests/check_glut_load.py") - (("'GL'") - (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'")) + (substitute* '("OpenGL/platform/glx.py" + "OpenGL/platform/egl.py" + "OpenGL/platform/osmesa.py" + "OpenGL/platform/darwin.py" + "tests/check_glut_load.py") (("'GLU'") (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'")) (("'glut',") (string-append "'" (assoc-ref inputs "freeglut") "/lib/libglut.so',")) - (("'GLESv1_CM'") - (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv1_CM.so'")) - (("'GLESv2'") - (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'"))) - ;; Not providing libgle. It seems to be very old. + (("'(GL|EGL|GLESv1_CM|GLESv2|OSMesa)'" all gl-library) + (string-append "'" (assoc-ref inputs "mesa") (string-append "/lib/lib" gl-library ".so'")))) + ;; Not providing libgle. It seems to be very old. #t))))) (home-page "https://pyopengl.sourceforge.net") (synopsis "Standard OpenGL bindings for Python")