From patchwork Fri Sep 15 19:10:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 53932 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 0227627BBEA; Fri, 15 Sep 2023 20:12:23 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 DD51527BBE2 for ; Fri, 15 Sep 2023 20:12:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhEEQ-00081n-US; Fri, 15 Sep 2023 15:11:58 -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 1qhEEP-00080y-Hv for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:57 -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 1qhEEP-0001gy-9P for guix-patches@gnu.org; Fri, 15 Sep 2023 15:11:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhEEV-0006yY-Qc for guix-patches@gnu.org; Fri, 15 Sep 2023 15:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66013] [PATCH 3/4] gnu: python-glcontext: Update to 2.4.0-0.beebc1f. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Sep 2023 19:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66013 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66013@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66013-submit@debbugs.gnu.org id=B66013.169480507726688 (code B ref 66013); Fri, 15 Sep 2023 19:12:03 +0000 Received: (at 66013) by debbugs.gnu.org; 15 Sep 2023 19:11:17 +0000 Received: from localhost ([127.0.0.1]:44765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDk-0006wN-Ew for submit@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:16 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhEDc-0006vY-WA for 66013@debbugs.gnu.org; Fri, 15 Sep 2023 15:11:10 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-31ffc8ead75so35237f8f.0 for <66013@debbugs.gnu.org>; Fri, 15 Sep 2023 12:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694805056; x=1695409856; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9x//yOdSW6cLxQZDPc9G9wv286y3Q1h2zUG6GtQCK24=; b=BQL8LSE/jkC3DOoPq5ckdVYJt76dDZxLLZ0SrG+J/QyyzhtcDkE68M690VMXX7xx6l lxUUhy6vWMhFC+H5AyyZvHObylGj6jJxqqOFtBgIoMFIqgk60Edr3eSnWjnOy03fpR+q W2VjScIqZQ8/82r2ICU0JqCurKF3UapMQA5m7ZQ/qE3XFtbv3GDm+PmENETrNLBtME1f L+XSI7Xy3NiAPQ4pal0YxjzFHzNBKoloey7KjWZ0DNwWYBMzH4vVYFaKqtxUC3nIX5yM Xcsu6VaIbtUagyQODRDvPx+8PrQTEh1o4HaqfLP8hlFxzbSiodUcl1fBC4LEGDqhs833 En/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805056; x=1695409856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9x//yOdSW6cLxQZDPc9G9wv286y3Q1h2zUG6GtQCK24=; b=FVmTs6mU/2uJNQ5Iqur0oeawLvvYBrLZzGydhwB+fCX0Faz293uSyZJf8CHWBOJJ/i FFkV3me5tZqp6iI/O7pNZqm2TXwT4nkqQjdFaoJXU3TBqwQh66FAhc4vSDYI61NJ05Ob ClPQ1UqG1rLR3FIU4MSJ9svZxAx7RccIo07lKrSvjzn6y3iNsUYA/ONvY6k+Gc0ZPDam wyLRrw3LswUhqhuwJkCJwqHQnwJIsHM6VfVE4coXkzZqHjCdbvAxFUJzrN0AAJOolom4 Q7pOlhDWAXPgfe8zD6V/Y/AhV39G9aTomJuhz8MukhNCqPQfLPw9h7b39JOWav2r9UsT Od9Q== X-Gm-Message-State: AOJu0YyAVDzoRbxzMXBQNy22CxeR6KeqMrsdltfJVqyOkVz5teY9pqfZ uMJ4yg5ID8A4X6f1Cs6Xw4Kfv3gMoDw= X-Google-Smtp-Source: AGHT+IFXQ0+wnSaHS62872Wzc4b9X3a+xJeG+9R8UEaRKYoj5/8Me/cZwwv51NtjToauNyxWapdw6A== X-Received: by 2002:a05:6000:91:b0:317:3da0:7606 with SMTP id m17-20020a056000009100b003173da07606mr2246698wrx.4.1694805056251; Fri, 15 Sep 2023 12:10:56 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id s10-20020a5d510a000000b0031971ab70c9sm5142381wrt.73.2023.09.15.12.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:10:55 -0700 (PDT) From: Simon Tournier Date: Fri, 15 Sep 2023 21:10:39 +0200 Message-Id: <375535045b489ea3432fe79940db0f36d18021aa.1694800551.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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-glcontext): Explicitly refer to commit instead of mutable Git tag. --- gnu/packages/python-xyz.scm | 100 +++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2230310a0350..481326b8e162 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22986,55 +22986,59 @@ (define-public python-pyopengl-accelerate "This is the Cython-coded accelerator module for PyOpenGL."))) (define-public python-glcontext - (package - (name "python-glcontext") - (version "2.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/moderngl/glcontext") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac")))) - (build-system pyproject-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-before 'build 'fix-lib-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((mesa (assoc-ref inputs "mesa")) - (libx11 (assoc-ref inputs "libx11"))) - (substitute* '("glcontext/x11.cpp" - "glcontext/egl.cpp") - (("\"libGL.so\"") - (string-append "\"" mesa "/lib/libGL.so\"")) - (("\"libEGL.so\"") - (string-append "\"" mesa "/lib/libEGL.so\"")) - (("\"libX11.so\"") - (string-append "\"" libx11 "/lib/libX11.so\""))) - (substitute* '("glcontext/__init__.py") - (("find_library\\('GL'\\)") - (string-append "'" mesa "/lib/libGL.so'")) - (("find_library\\('EGL'\\)") - (string-append "'" mesa "/lib/libEGL.so'")) - (("find_library\\(\"X11\"\\)") - (string-append "'" libx11 "/lib/libX11.so'")))))) - (replace 'check - (lambda* (#:key inputs outputs tests? - #:allow-other-keys) - (when tests? - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "tests"))))))) - (inputs (list libx11 mesa)) - (native-inputs (list xorg-server-for-tests python-pytest python-psutil)) - (home-page "https://github.com/moderngl/glcontext") - (synopsis "Portable OpenGL Context for ModernGL") - (description "Python-glcontext is a library providing an OpenGL + (let (;; Upstream is known for abusing mutable tag, hence pinpoint the + ;; relevant commit. + (revision "0") + (commit "beebc1fd08ee850f06f4390be4b280824e383074")) + (package + (name "python-glcontext") + (version (git-version "2.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moderngl/glcontext") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'build 'fix-lib-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((mesa (assoc-ref inputs "mesa")) + (libx11 (assoc-ref inputs "libx11"))) + (substitute* '("glcontext/x11.cpp" + "glcontext/egl.cpp") + (("\"libGL.so\"") + (string-append "\"" mesa "/lib/libGL.so\"")) + (("\"libEGL.so\"") + (string-append "\"" mesa "/lib/libEGL.so\"")) + (("\"libX11.so\"") + (string-append "\"" libx11 "/lib/libX11.so\""))) + (substitute* '("glcontext/__init__.py") + (("find_library\\('GL'\\)") + (string-append "'" mesa "/lib/libGL.so'")) + (("find_library\\('EGL'\\)") + (string-append "'" mesa "/lib/libEGL.so'")) + (("find_library\\(\"X11\"\\)") + (string-append "'" libx11 "/lib/libX11.so'")))))) + (replace 'check + (lambda* (#:key inputs outputs tests? + #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests"))))))) + (inputs (list libx11 mesa)) + (native-inputs (list xorg-server-for-tests python-pytest python-psutil)) + (home-page "https://github.com/moderngl/glcontext") + (synopsis "Portable OpenGL Context for ModernGL") + (description "Python-glcontext is a library providing an OpenGL implementation for ModernGL on multiple platforms.") - (license license:expat))) + (license license:expat)))) (define-public python-rencode (package