From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id uLKkIirzQ2e1cAAA62LTzQ:P1 (envelope-from ) for ; Mon, 25 Nov 2024 03:46:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id uLKkIirzQ2e1cAAA62LTzQ (envelope-from ) for ; Mon, 25 Nov 2024 04:46:50 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=N5wbVVrc; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PYy3403x; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732506410; a=rsa-sha256; cv=none; b=cXcpxoTYlmmZdXmcqyKWF3vdXuGM6X++LfWVxsYbhAGdVn4uyylhGPnwkyILrGgyYUPCGd n8ZQH82zT5+VWiQ0SggEJHmOuUcRdQaDY06R/fJLSR30eBmmh7PXb6D61EctU8SfKO28pz VtSycZelYTMkvYJRZ1dn686WT/CBDHqBVyBAuzRWHTbCbgfK+6bF6lvtT9MCMRVbjTGm9T O8HfnnHb+NjL18Hy+J/RMi0sQMlX9z9BCgvRf1mvR+I3UWaOWGh8j9Cv5n/tNNGS7ki4Rj 2jiuSPsHJYvFSbqtUr+W45ipdqMULIMSlcMxwuqDMwO+3i1sn+cPa3glJ/fdpg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=N5wbVVrc; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=PYy3403x; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732506410; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=mERQAU706g8qWrFr0fAf8f5H1AuCOtS5qm44wFcuHoA=; b=JAQ0lZMnYn5QKcmtw/4GT7SkdMOfZ+szL7UfaOPp3szA5+dlhWKzY08s/TLuDswj5P4Vah FoKZelbjLqsi28z1dcBOJZMvrdNQr0AjyKpUmfn7G7HF2phxzMU261prlT2ohgAtb3WemV eDoiloYkp8mUeKLfDoyLE14s423QN+Vzv1CPr2xkAt1B4RvPxbGB1v7Z6tcCQfBZ9jxC5c Hzb6SAWrQmSqsRP+Xqi1LH6D3mVaU1uOW3p6BxBLmqSUdGbZONVVYsL+x4Ea7pekLIqVw8 5ue5vObugzSjBEGYcxw07Wk1fP2hZWc2jcC568e3OdB2rNtDDy6dehBlNFOmfQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 586A18C020 for ; Mon, 25 Nov 2024 04:46:50 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tFQ3N-0003QE-AI; Sun, 24 Nov 2024 22:46:25 -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 1tFQ3H-0003DF-42 for guix-patches@gnu.org; Sun, 24 Nov 2024 22:46:19 -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 1tFQ3D-0008Lf-9n; Sun, 24 Nov 2024 22:46:15 -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:References:In-Reply-To:Date:From:To:Subject; bh=mERQAU706g8qWrFr0fAf8f5H1AuCOtS5qm44wFcuHoA=; b=N5wbVVrc39oXD/fbZVoRYk84+41xobaW/dPh+DP+RF4Yv9jl1xiwoPqOmDclRILVL1uEkImXZrsL0CD8eujlGRfAEricGC7aaSmUr7iDQHAlBixyBkutCu3zyN9gCjwHZpXefdmyu6KNUNvonykvyp209P4Hfr6fRGjyZkhtMg4bXqZQhzbb887sCL689OmwjIZXFp1YMnLSKvnJBmr6zAvaAVR3XFuigOG+U5PMkEr3jrUM/ZAFcfa5lIuqp63jtSzcGxPYXduly9j3ioT1uOegUzkYOZ4Wi38Vv2JbXgHsqr/z87JY3Z7JZKCHSBgxPpWCp3B21KqoPJ2T4wlANA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tFQ35-0005gS-0j; Sun, 24 Nov 2024 22:46:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74522] [PATCH 45/73] move libgl provider from mesa to libglvnd+mesa Resent-From: The Man Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Mon, 25 Nov 2024 03:46:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74522@debbugs.gnu.org Cc: The Man , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 74522-submit@debbugs.gnu.org id=B74522.173250636021709 (code B ref 74522); Mon, 25 Nov 2024 03:46:06 +0000 Received: (at 74522) by debbugs.gnu.org; 25 Nov 2024 03:46:00 +0000 Received: from localhost ([127.0.0.1]:37213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFQ2x-0005dz-Jj for submit@debbugs.gnu.org; Sun, 24 Nov 2024 22:45:59 -0500 Received: from mail-oa1-f48.google.com ([209.85.160.48]:42465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFQ1Y-0005Ly-B3 for 74522@debbugs.gnu.org; Sun, 24 Nov 2024 22:44:33 -0500 Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-2969bf1680cso2163796fac.1 for <74522@debbugs.gnu.org>; Sun, 24 Nov 2024 19:44:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732506207; x=1733111007; 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=mERQAU706g8qWrFr0fAf8f5H1AuCOtS5qm44wFcuHoA=; b=PYy3403x+gEjIqYUnaO1IfHYRfLp+A4WPv0x7DKz9qZiD2vvokMrdma2k0qFyXtQfi bz5TsPvW5uLOWGqAr5j2EM93UQ2bIOKBwRtfoxvJt9ScAiH+FEs/AjRw3fFCXSvOD355 e3hnB4OEyUa1qLUH7+itwn2Zppm89j1IttQZMveykM7OnA366a9ybeSKbRYdOnuKD9iq D4YKWRLqahBLJdLLzPNkd+5Ah8Wdu4z3SpNErxUqcfPKd1SUi5yXCpZKafyNQ6xvZXjR 0YPF6n3OoRDB/uDRpe6xsDvA2l/qu7E0NqeuiiSjxlpSNB4J+61ZX8DbM1cX4ZjXBt+b vFKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732506207; x=1733111007; 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=mERQAU706g8qWrFr0fAf8f5H1AuCOtS5qm44wFcuHoA=; b=ZVOcYtOkG7s41E8t8IMiSzVwedELSkyHErXtcBAMRDsZqheR+DUArRFJyB+j34P+04 9BS3KMeSzwuy9t13StySg6IlCXDRvOKzNWV7oXs7eeV5jkg9SWBzW1fghfEGX7qNsKui xv9UncBbYNBb9iT1IWo7CtUL51pz8kD+H5vepO++V1o06ZEuODs0sjI7c8e7zPUZgp1p 6tbz5Vil2UVAB3isaKPXAfbmY8S1GLRxvxJX1Eo8msP+l/1cNc6BuLQZNdIMj6mHcXHv dH2EopFguzzK7EOfZ51UD4HmUo1TIaACJ6PKEDflqcEI4Il1jFzZLYrq/l+WbL1E4Qqd 2QlQ== X-Gm-Message-State: AOJu0Yx2KSLWI+cPFzGpUCXNVEQ3QUpFHlsg3hYYjseKfJGd8Tndcq0I ELCMekJrLMk4r9ZL66vcS3ejBcntl+tm47Fm5HPGPrCXGkFFtdPCMkcvKg== X-Gm-Gg: ASbGncsZAr4FMAw92SXbP8ge9jWDpxnRGNEK9OMY4+SJEOFGSG6J6mtbos0C5JpBkj3 lXrkrp+rjWiONpxGjQBlg1YLhQYCCn/hcM5jbIx6ww2K7MV6VFG29wnnDIaVNxTsdazS591dVYL NSS7WA4jT4FZgbyqmaPXJIRnlhhsoB+4zZQ5WBYTIHUu7Xtrx3CMcTN5uMeUYvGTfiIYW3O4RkM xdiZHYqpGMzr+6VhTSuPHdJbSkxvwGgNiHJGX4y1hDU1jfrnV0rm6rlvRGD7gp40NDsD7/arWXA IZFPD8wRLF4uQd+vr7OFOzWvrJ5bcQ3Jxg== X-Google-Smtp-Source: AGHT+IF/2Ca02W3FoxNaxoowgR3IeSG4lgP0eYTeLGt/8M3H/FfSAPt9D5NHnGt61/YxJv8KNx3oew== X-Received: by 2002:a05:6870:5691:b0:297:683:8b5b with SMTP id 586e51a60fabf-29706839e98mr7898622fac.10.1732506206802; Sun, 24 Nov 2024 19:43:26 -0800 (PST) Received: from Mothership.1.1.1.1 (syn-070-113-036-046.res.spectrum.com. [70.113.36.46]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2971d6b8c98sm2785726fac.32.2024.11.24.19.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Nov 2024 19:43:26 -0800 (PST) From: The Man Date: Sun, 24 Nov 2024 21:41:38 -0600 Message-ID: <63115c166d7dc8db08bcf254d835c85e5459aa9b.1732504868.git.squishypinkelephant@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.15 X-Spam-Score: 0.15 X-Migadu-Queue-Id: 586A18C020 X-Migadu-Scanner: mx12.migadu.com X-TUID: ly46ii6ZECsc Change-Id: I4a17476f9cb026896fd3b889ef356c64e42a6a7c --- gnu/packages/python-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ceb122e08d..3dad9f6570 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22788,7 +22788,7 @@ (define-public python-kivy (list pkg-config python-cython)) (inputs (list gstreamer - mesa + libgl (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)) python-docutils python-kivy-garden @@ -25757,7 +25757,7 @@ (define-public python-pyopengl "09syrsfrcknr1k2wmj05gfd5d0dyjfxzbipzbd0agv9775vwi9lf")))) (build-system python-build-system) (inputs - (list mesa freeglut glu)) + (list libgl freeglut glu)) (arguments `(#:tests? #f ; Tests fail: AttributeError: 'GLXPlatform' object has no ;attribute 'OSMesa' @@ -25769,15 +25769,15 @@ (define-public python-pyopengl (("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'")) + (string-append "'" (assoc-ref inputs "libgl") "/lib/libGL.so'")) (("'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'")) + (string-append "'" (assoc-ref inputs "libgl") "/lib/libGLESv1_CM.so'")) (("'GLESv2'") - (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'"))) + (string-append "'" (assoc-ref inputs "libgl") "/lib/libGLESv2.so'"))) ;; Not providing libgle. It seems to be very old. #t))))) (home-page "https://pyopengl.sourceforge.net") @@ -25801,7 +25801,7 @@ (define-public python-pyopengl-accelerate (base32 "1hydrpdn4p4z6mlczcg1y4s0z8si3rs6zq8x4ql558pcaq1312md")))) (inputs - (list mesa python-numpy)) ; for cython module + (list libgl python-numpy)) ; for cython module ; numpy_formathandler, thus not propagated (arguments `(#:tests? #f -- 2.46.0