From patchwork Sat May 11 17:58:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27392 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 47C7227BBEA; Sat, 11 May 2024 19:00:28 +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 33D2627BBE2 for ; Sat, 11 May 2024 19:00:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r0z-0000ZJ-7f; Sat, 11 May 2024 14:00:09 -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 1s5r0w-0000Yr-F8 for guix-patches@gnu.org; Sat, 11 May 2024 14:00:06 -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 1s5r0v-0007tf-Tf for guix-patches@gnu.org; Sat, 11 May 2024 14:00:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r0v-0004In-9J for guix-patches@gnu.org; Sat, 11 May 2024 14:00:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 1/8] gnu: cgal: Update to 5.6.1. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:00:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545040116482 (code B ref 70880); Sat, 11 May 2024 18:00:05 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:01 +0000 Received: from localhost ([127.0.0.1]:49621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0q-0004HQ-E9 for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:01 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:60647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0o-0004Gr-2a for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-52232d0e5ceso1172806e87.0 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450331; x=1716055131; 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=DXYI9HN2W7SlnQgbh7SLHKpr6qw3NnggO6868wlCKZg=; b=NkLBV0YeQsFF0mMe/S2xEfB4EZsaGHWTVK4pCdZs20AosnQsCuVNb4ocmuFn/61k5H jXsRGvn+T3Efdz/jMApeCIDuWUtqHIQEtEEAZ76PTy6nOjKiOLqbQ5L0dz708g7oxiCa q8KnaeO9Pcgo6ElhxuOu+R7VaCzrMufjH5xj1TrEXCe1gL1i6mwWRAT9nhLG2r2FMBxl IjLCnAi0+rqyFo7NjatuHHVt2mSn3UPvRW2mpCSNiass2alqqQqnDMrO1bOJiST9f+Qa 69XOMRmm2w7Mk1zGtjU2qO7rcczxht7sYKlofiDAlWyA3JBJDOAy1TqX9XV2ZQ6ame4c IgaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450331; x=1716055131; 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=DXYI9HN2W7SlnQgbh7SLHKpr6qw3NnggO6868wlCKZg=; b=HfdPLgp3tD1yQDAGIqECbgMe9tYFjgCVgCtnenY6Gt0ohpmhNLeXiXE4Up6FagTjSt bQCH/ihTdeVLhsKR9Owq2lgHtmy5Glm1WOhorIRL78snGeDnAyr+uflVaKmn3omrcwkR 1BXIwVlMibk0meI4NNTQeneULdN0t2mMgjKOnzamVEqzuk3aFPPVW2JMWCF5PE0GU6/K UydrfhMC/MM2GowE5gXrP0V1AuQWE7roySEbATz2gMa6E2Wozb0mAyhDR6RkXlEhgEDY lb99BM3UU748X5zUcq6l4DbVyP0fiKwtzG8zg2shWVBPkGrx6U6anqJkXDxSUGoQsW8S 28Ig== X-Gm-Message-State: AOJu0YxE5GfRgYmPlVWgqsGQ1ppHuMamiPMYYRdduWy/cD+Sr+QoNCQ+ PHGjeYCwuIBv1R/TQ4T2xXYTw3N9OppQLGM5uHq3oZ5fX96CJ/o+l7cW2w== X-Google-Smtp-Source: AGHT+IEEgWtzGIqwvQ4ka9LWvPl2uYQeG6d4sbUpBkvoUtUAMS/5V5msbXNH2+AkUQIXyrWZuDveDA== X-Received: by 2002:ac2:560a:0:b0:51c:ee04:3732 with SMTP id 2adb3069b0e04-5220fb77553mr3597783e87.7.1715450330857; Sat, 11 May 2024 10:58:50 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:50 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:29 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 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/graphics.scm (cgal): Update to 5.6.1. Change-Id: Id909fc7be5d421496e6a3cd87d366f437f76bcfa --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ca2d74224f..cfd908be68 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Eric Bavier -;;; Copyright © 2023 Artyom V. Poptsov +;;; Copyright © 2023, 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -775,7 +775,7 @@ (define-public openshadinglanguage (define-public cgal (package (name "cgal") - (version "5.2.2") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ (define-public cgal "/CGAL-" version ".tar.xz")) (sha256 (base32 - "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40")))) + "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd")))) (build-system cmake-build-system) (arguments `(#:configure-flags From patchwork Sat May 11 17:58:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27393 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 A339027BBEA; Sat, 11 May 2024 19:00:35 +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 9528D27BBE2 for ; Sat, 11 May 2024 19:00:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r0y-0000ZH-VE; Sat, 11 May 2024 14:00:08 -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 1s5r0y-0000Z3-5Y for guix-patches@gnu.org; Sat, 11 May 2024 14:00:08 -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 1s5r0x-0007to-Lx for guix-patches@gnu.org; Sat, 11 May 2024 14:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r0w-0004Iu-0l for guix-patches@gnu.org; Sat, 11 May 2024 14:00:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 2/8] gnu: glfw: Update to 3.3.10. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:00:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545040316510 (code B ref 70880); Sat, 11 May 2024 18:00:05 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:03 +0000 Received: from localhost ([127.0.0.1]:49624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0r-0004Hm-7m for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:03 -0400 Received: from mail-lf1-f45.google.com ([209.85.167.45]:42018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0n-0004Gq-EW for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-51fa75d54a4so2704681e87.0 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450332; x=1716055132; 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=2AMtb208lwYep0bHpy/hhr8U8BXHYCoDAf/UrFJbZjE=; b=BKvH/vGYViwtGMmT4R8CPC6MOLog86kfLhJUuT90sMV4wyPB/pMihzuKFg/PuDj5x0 DXxaXQ2ea5ZQr3L9d23G1t0IZ4AJDzsxA+Rw+GbXtuCKNZC+LPLL4G75FeaCSLRJuieN Cz+4vIl7vSNnM2RPV6pzQ9s/JGuLBrtOxmp4goLxdG9YCP6vYMKVZsXRb3ywGkOMQRDN UmMcQlQ2jJ/sdRmuzPZCQY0Qz8TmEuILUUnwQZmv1ezbQIMGp9LUgFCkpGilq+0e79cO 7NStLK2nh4huQpDV0m6Erfah+n3vZZyFaM2pDdTeFFfzWxglzJ0MJp+JeETzOu6x4rGo upOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450332; x=1716055132; 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=2AMtb208lwYep0bHpy/hhr8U8BXHYCoDAf/UrFJbZjE=; b=QCPKL/JnAsHC51lYkPutccmUU3WrQsY9/c1Ps59VhSUmx53llGnGYS+wwg4KwEzY7e ecg1W2CR0gy2pR1aK9L7liKHDAuil4sf0SJO+pf8DO76RJEmSFlx8qpB2rlRg4Mj8ciV HUE7dyxEpyt36+gYbBRhoS9LBioytYGsunHTQQB15QQViGSXH26GckefGlh3aMGT3hLy OP+WDCT+1L7GCet7hfAH3Q6JP1rOwwgBYDRWdIhkkrUXYpy3hljD45ajCGhmNl+arpDC 3MMnHw7vf/BPyxWFTrHxA0gXwG2HxofOjLxoMNyok639aAWPwyzdOQsn0+TjpDR9ZLAB Djig== X-Gm-Message-State: AOJu0YzetpQ+VckxUgZzxDGw0iMxg8Xx41PJbL+Z30DYnekugBzS3e3m McqfuX3XoCRNagzDcNMK5I/nIW1sAudMHpWYrgsbN7XJXH0tr1Lnkxwf2w== X-Google-Smtp-Source: AGHT+IFy2ulbT2qCMVO9Qf5wb7bERyOsw+9ExabcFqK2dKOzNb4LUfwvhv6XpNd0WDAhRUp45UbBtg== X-Received: by 2002:a05:6512:2116:b0:51f:25f8:7757 with SMTP id 2adb3069b0e04-521e155a1afmr2501827e87.32.1715450331743; Sat, 11 May 2024 10:58:51 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:51 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:30 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 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/gl.scm (glfw): Update to 3.3.10. Change-Id: I9d789fb74af4ed649102195891adc5e437883d30 --- gnu/packages/gl.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2100bb4872..f40ddaeb86 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -924,7 +925,7 @@ (define-public soil (define-public glfw (package (name "glfw") - (version "3.3.9") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -932,7 +933,7 @@ (define-public glfw "/glfw-" version ".zip")) (sha256 (base32 - "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) + "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8")))) (build-system cmake-build-system) (arguments (list From patchwork Sat May 11 17:58:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27396 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 F0F0627BBE9; Sat, 11 May 2024 19:01:32 +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=unavailable 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 69A2127BBE2 for ; Sat, 11 May 2024 19:01:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1t-0000rI-DS; Sat, 11 May 2024 14:01:05 -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 1s5r1r-0000qM-59 for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -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 1s5r1q-0007yp-TD for guix-patches@gnu.org; Sat, 11 May 2024 14:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1q-0004ML-8s for guix-patches@gnu.org; Sat, 11 May 2024 14:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 3/8] gnu: glfw-3.4: New variable. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545041416588 (code B ref 70880); Sat, 11 May 2024 18:01:02 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:14 +0000 Received: from localhost ([127.0.0.1]:49633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0y-0004JM-GC for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:14 -0400 Received: from mail-lf1-f52.google.com ([209.85.167.52]:51596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0o-0004Gu-KZ for 70880@debbugs.gnu.org; Sat, 11 May 2024 13:59:59 -0400 Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51f45104ef0so3173948e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 10:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450333; x=1716055133; 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=6FXxTwgMR0W45834W+eUPi4buGr5VuduWQ5nRe9PEGk=; b=aiMhgxlCt3uLeZ7ufNt3vMhAhlTJ2ReCdra0mMvqiX0Ac6XyGrjK4agqtwBph4M051 ziX6Tfjprc4KlaNNpOWUwBxfqrY3rM+1ZI2csgOaqxpGovQR2rbCejFwWeh6MZpmAJ2k 38PobAY6X0y3CHbk7OQCnM8J+7OQBgnZ0CnjdYr6Ov7KeNBKdioXP80JlEDBflPk71h8 v2B4CMXYbIhX0eZwyN9BBjz9y3DG5LUGFsLCy3pRA7jjRSZbXhTP//QJ4q7MqEM/RBcI x2DuTrDA9r8AZ6iA+4j5AYTBCF4VEMpO0ddYCWPkt8jEFGEZLwH8A7UZ6dX1jSz03eCT MZdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450333; x=1716055133; 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=6FXxTwgMR0W45834W+eUPi4buGr5VuduWQ5nRe9PEGk=; b=mnadZ6GmD9wUSyV81s5TwlTTwWuTBCP27BlPgS7JWYdCxUg8TLneqmvMHaJzktx1rS 62c/1O0N90+5pFNozlN1EXe3pq/NLhOdIBhC8Xt88dwNGGBavAyKgfajVD4vUAk7nlXS ARTjmUqi5wb2wTuqm9aiLhnS6z2YuXOW2mNI4kxlxXtVptUr379zSav+fiXgiIbIAPKp FGT+5ok/b1WrJli2Z1tFd7ndaQZWKrsMdaClUWp6A+onaP1HGzwv77kJmv64iSMskFZu RrnWrDjr4uznTc026T4+oM5dPcA7dpXJdO+9K7Z58MCKsAaoUqDSyP9KSqURbjuXlalT rs2Q== X-Gm-Message-State: AOJu0YwWaNaJZ14WLxFs88K5s5y4JyuGrILMaLtFWi9eURX0ZiOar4L6 XZsc1xvb0aYA4kXtEsrhxpljhgggQQmTr/H1k6F/HT4otKsPTS3RJHFM/g== X-Google-Smtp-Source: AGHT+IEdafnHNuw8xuZtsoImDv52KNCSqxw6jJ/ZBd0MizYJzPqiO8ntIGOgYgB/WQ3GtsKnUx0Qaw== X-Received: by 2002:a19:5f0d:0:b0:51d:d4e8:c71c with SMTP id 2adb3069b0e04-5220fc6d501mr3202349e87.36.1715450332824; Sat, 11 May 2024 10:58:52 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:52 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:31 +0300 Message-ID: <5bea79f76507d2150d32cd58c7369671ab35f8e7.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 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/gl.scm (glfw-3.4): New variable. Change-Id: I77f2214c78f35455436897a3fbff083331295314 --- gnu/packages/gl.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f40ddaeb86..2d684e9c80 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -995,6 +995,21 @@ (define-public glfw and surfaces, receiving input and events.") (license license:zlib))) +(define-public glfw-3.4 + (package + (inherit glfw) + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/glfw/glfw" + "/releases/download/" version + "/glfw-" version ".zip")) + (sha256 + (base32 + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) + (inputs (modify-inputs (package-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") From patchwork Sat May 11 17:58:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27398 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 73A7F27BBEA; Sat, 11 May 2024 19:01:48 +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,URIBL_BLOCKED autolearn=unavailable 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 E3D0027BBE2 for ; Sat, 11 May 2024 19:01:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1u-0000rQ-0C; Sat, 11 May 2024 14:01:06 -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 1s5r1r-0000qV-Hq for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -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 1s5r1r-0007yx-9U for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1q-0004MS-Lv for guix-patches@gnu.org; Sat, 11 May 2024 14:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 4/8] gnu: libigl: Update to 2.4.0. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545041716673 (code B ref 70880); Sat, 11 May 2024 18:01:02 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:17 +0000 Received: from localhost ([127.0.0.1]:49635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r14-0004JV-63 for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:17 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:53503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0p-0004H0-T9 for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:02 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51ffff16400so5020028e87.2 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450334; x=1716055134; 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=6tDDgPXawOPva5/mjmQe1mB6SdKc4kB04yjwSPs+kGA=; b=WmXE0P5s2gbsAsxoQbMEwrKF19fiEhE9445ZVG+jEQesOT3QEtwDKb0/SaYvKE/kOS 65tqAC6Ae936o60rMnraW66K9CNeJGr2hXNgVZBjtI6Z/+oEimdqtfhTrOEoTLxrjzjs jWsNhShUgxfkT66T6O9H9N9Yqz24hEvYni6t+UFjMSSXKL+QeXmXooeVdi/Zsyk5kjrN wtQ1pPztNFcaL1rF0U/zP7Ryu8I3DLdwckM1HfE982gruPNGMdcs+SA1W5hCfhDtshkD mPx99ahn1OcuHnS/9ivrscayJuTJvQsfFJvHCxttFg2SUj8zxhefb2tmCUQWuIie9k1y 2Tnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450334; x=1716055134; 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=6tDDgPXawOPva5/mjmQe1mB6SdKc4kB04yjwSPs+kGA=; b=INC6A2D6RZmYcnKRyN2pP2lqPs01YYOgHz7v2dLRa0494oz70pByOlLogPdpV8gfYW wjq6hGcsIfTCiKPPwVdFgqvdXzLmhQEllvjPWeCZ3atovb72a/O9vCTwcXcv64321/sR Y7rloKYsuUKlTJt8KA2B2E9zGvkp8MaF3/Z4Jur5kAo0q9gKcEcIb7IikkH0n9CPdNB+ 39D6gXnyp7cSp9cb1SrvI0Zb110RcDeTdikJCPNj2NOEj/l0VUl4G8dQkzg/iXPyZ1Pj WN6bqeqgaVooiA4Uk3cI3ux95DLIGalMIivEt/13AOGJf4HxK2k8ZbJTRcXaIxSocoNs pPyg== X-Gm-Message-State: AOJu0Yy0NaTOgVm7ztnl8iEQo197Zy3O7fu/zYVWVugvffiY3Ec5IcMr PbM/CVW+A+ukMTnLA4KhvhhKO6iVBFCc3B5/wlDAOp28fxuohv2kGcJ4cQ== X-Google-Smtp-Source: AGHT+IGn+lcO7J5rfFAaVV84CkMARcNXjKDFtXAtmz5VMyUUuj69FRImX7qlwp04h887glxFdq9otw== X-Received: by 2002:a05:6512:220a:b0:522:3487:3f3b with SMTP id 2adb3069b0e04-52234874078mr2330096e87.36.1715450333987; Sat, 11 May 2024 10:58:53 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:53 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:32 +0300 Message-ID: <78bd2eeee639dd0d324266dadb6d982405ab6242.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 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/engineering.scm (libigl): Update to 2.4.0. [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as they are failing with SEGFAULT errors (see .) Update "unpack-external" phase: add new dependencies. Update "patch-cmake" phase to prevent CMake from trying to download external dependencies. Help CMake to find the package inputs. Add "fix-assertions" and "install-copyleft-modules" phase. [native-inputs]: Add catch2. [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl packages and imguizmo. Remove catch2. Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 --- gnu/packages/engineering.scm | 258 ++++++++++++++++++++++++----------- 1 file changed, 179 insertions(+), 79 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4e30772296..1a0b136952 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Konstantinos Agiannis ;;; Copyright © 2022 Greg Hogan -;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022-2024 Artyom V. Poptsov ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022, 2023 Felix Gruber ;;; Copyright © 2023 Theofilos Pechlivanis @@ -161,6 +161,7 @@ (define-module (gnu packages engineering) #:use-module (gnu packages text-editors) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages toolkits) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -3531,7 +3532,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3541,90 +3542,151 @@ (define-public libigl (file-name (git-file-name name version)) (sha256 (base32 - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DLIBIGL_USE_STATIC_LIBRARY=OFF" - "-DLIBIGL_BUILD_TESTS=ON" - "-DLIBIGL_BUILD_TUTORIALS=OFF" - "-DLIBIGL_EXPORT_TARGETS=ON" - ;; The following options disable tests for the corresponding libraries. - ;; The options do not affect whether the libraries are linked to - ;; libigl or not, they are used for tests. - "-DLIBIGL_WITH_COMISO=OFF" - "-DLIBIGL_WITH_CORK=OFF" - "-DLIBIGL_WITH_MATLAB=OFF" - "-DLIBIGL_WITH_MOSEK=OFF" - "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate". - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF") + (list #:configure-flags + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_INSTALL=ON" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2")) + (format #f "-DSpectra_DIR=~a/share/pectra/cmake/" + #$(this-package-input "spectra")) + ;; The following options disable tests for the corresponding libraries. + ;; The options do not affect whether the libraries are linked to + ;; libigl or not, they are used for tests. + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_MATLAB=OFF" + "-DLIBIGL_MOSEK=OFF" + ;; XXX: GLFW tests are failing with SEGFAULT. See + ;; + "-DLIBIGL_GLFW_TESTS=OFF") + #:build-type "Release" #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'unpack-external (lambda _ (setenv "HOME" (getcwd)) ;; cmake needs this to export modules (mkdir "external") (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad") - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb") + (copy-recursively (assoc-ref %build-inputs "libigl-test-data") "external/test-data") + (copy-recursively (assoc-ref %build-inputs "libigl-comiso") "external/comiso") (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates") + (copy-recursively (assoc-ref %build-inputs "imguizmo") "external/imguizmo") + (copy-recursively (assoc-ref %build-inputs "eigen") "external/eigen"))) (add-after 'unpack-external 'patch-cmake - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (define (source-dir library-name) + (format #f "SOURCE_DIR \"~a\"" + (assoc-ref %build-inputs library-name))) + (define (fix-external-library cmake source) + (substitute* (format #f "cmake/recipes/external/~a.cmake" + cmake) + (("GIT_REPOSITORY.*") (source-dir source)) + (("GIT_TAG.*") ""))) ;; Fix references to external libraries - (substitute* "cmake/libigl.cmake" - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET CGAL::CGAL\\)" all) - (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all)) - (("if\\(NOT TARGET tinyxml2\\)" all) - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" - "if (NOT TARGET tinyxml2::tinyxml2)")) - (("if\\(NOT TARGET embree\\)" all) - (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET glfw\\)" all) - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all)) - (("igl_download_glad\\(\\)" all) "") - (("igl_download_stb\\(\\)" all) "") - (("igl_download_tetgen\\(\\)" all) "") - (("igl_download_triangle\\(\\)" all) "") - (("igl_download_predicates\\(\\)" all) "")) - (substitute* "tests/CMakeLists.txt" - (("igl_download_test_data\\(\\)") "") - (("set\\(IGL_TEST_DATA.*") - (format #f "set(IGL_TEST_DATA ~a)\n" - (assoc-ref %build-inputs "libigl-test-data"))) - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)") - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)") - "") - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") "")) - ;; Install otherwise missing headers - (substitute* "cmake/libigl.cmake" - (("install_dir_files\\(copyleft\\)" all) - (string-join (list all - "install_dir_files(copyleft/cgal)" - "install_dir_files(copyleft/opengl)" - "install_dir_files(copyleft/tetgen)" - "install_dir_files(embree)" - "install_dir_files(opengl)" - "install_dir_files(png)" - "install_dir_files(predicates)" - "install_dir_files(xml)") - "\n")))))))) + (fix-external-library "comiso" "libigl-comiso") + (fix-external-library "tetgen" "libigl-tetgen") + (fix-external-library "triangle" "libigl-triangle") + (fix-external-library "predicates" "libigl-predicates") + (fix-external-library "glad" "libigl-glad") + (fix-external-library "libigl_tests_data" "libigl-test-data") + (fix-external-library "stb" "libigl-stb") + (substitute* "cmake/recipes/external/imguizmo.cmake" + (("if\\(TARGET imguizmo::imguizmo\\)") + "if(true)") + (("target_link_libraries.*") + (format #f "include_directories(~a/include/imgui/)" + (assoc-ref inputs "imgui")))) + + (substitute* "cmake/igl/igl_add_test.cmake" + (("include\\(\".*/contrib/Catch.cmake\"\\)") + (format #f + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" + (assoc-ref inputs "catch2")))) + (substitute* "cmake/recipes/external/cgal.cmake" + (("FetchContent_Populate\\(cgal\\)") + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) + (substitute* "cmake/recipes/external/eigen.cmake" + (("FetchContent_Populate\\(eigen\\)") + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/catch2.cmake" + (("message.*") + "find_package(Catch2 CONFIG)\nreturn()")) + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake" + (("if\\(TARGET igl::imgui_fonts\\)") + "if(true)")) + (substitute* "cmake/recipes/external/tinyxml2.cmake" + (("FetchContent_Populate\\(tinyxml2\\)") + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/embree.cmake" + (("FetchContent_MakeAvailable\\(embree\\)") + (string-join (list "find_package(Embree 3 CONFIG)" + "add_library(embree::embree ALIAS embree)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/glfw.cmake" + (("FetchContent_MakeAvailable\\(glfw\\)") + (string-join + (list "find_package(glfw3 CONFIG REQUIRED)" + "add_library(glfw::glfw ALIAS glfw)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/imgui.cmake" + (("FetchContent_MakeAvailable\\(imgui\\)") + "return()")))) + + (add-after 'unpack-external 'fix-assertions + (lambda _ + ;; Current Tetgen version has a bug. + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp" + (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);") + ";")) + ;; CGAL has a bug in assertion as well. + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" + (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);") + ";")))) + + ;; XXX: Install modules as CMake fails to install them. + (add-after 'install 'install-includes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/igl/"))) + (for-each (lambda (module) + (copy-recursively (format #f "../source/include/igl/~a" + module) + (format #f "~a/~a" include-dir module))) + (list "copyleft/cgal" + "copyleft/opengl2" + "copyleft/tetgen" + "embree" + "opengl" + "predicates" + "xml")))))))) + + (native-inputs (list catch2)) ;; XXX: Inputs are currently only used to build tests. ;; We would need to patch the CMake recipe to build a shared library ;; with all of these. (inputs `(("boost" ,boost) - ("catch2" ,catch2) ("cgal" ,cgal) ("eigen" ,eigen) ("embree" ,embree) - ("glfw" ,glfw) + ("glfw" ,glfw-3.4) ("gmp" ,gmp) ("mesa" ,mesa) ("mpfr" ,mpfr) ("tbb" ,tbb) ("tinyxml2" ,tinyxml2) + ("openblas" ,openblas) + ("imgui" ,imgui) + ("spectra" ,spectra) ;; When updating this package, update commit fields below according to ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". ("libigl-test-data" @@ -3636,13 +3698,16 @@ (define-public libigl (file-name (git-file-name "libigl-test-data" version)) (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) ("libigl-glad" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libigl/libigl-glad") - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) - (file-name (git-file-name "libigl-glad" version)) - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-glad") + (commit commit))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay"))))) ("libigl-stb" ,(origin (method git-fetch) @@ -3652,22 +3717,57 @@ (define-public libigl (file-name (git-file-name "libigl-stb" version)) (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) ("libigl-predicates" + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + (commit commit))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz"))))) + ;; TODO: Package tetgen separately from + ("libigl-tetgen" + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + (commit commit))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))) + ("libigl-comiso" + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/comiso.git") + (commit commit))) + (file-name (git-file-name "libigl-comiso" version)) + (sha256 (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba"))))) + ("libigl-triangle" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/libigl-predicates.git") - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) - (file-name (git-file-name "libigl-predicates" version)) - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))) - ;; TODO: Package tetgen separately from - ("libigl-tetgen" + (url "https://github.com/libigl/triangle.git") + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) + (file-name (git-file-name "libigl-triangle" version)) + (sha256 (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3")))) + ;; XXX: This is a source-only library which is currently required only for + ;; libigl. + ("imguizmo" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/tetgen.git") - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) - (file-name (git-file-name "libigl-tetgen" version)) - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))) + (url "https://github.com/CedricGuillemet/ImGuizmo") + (commit "1.83"))) + (file-name (git-file-name "imguizmo" version)) + (sha256 (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0")))))) (home-page "https://libigl.github.io/") (synopsis "Simple C++ geometry processing library") (description "This library provides functionality for shape modelling, From patchwork Sat May 11 17:58:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27394 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 6F86B27BBE9; Sat, 11 May 2024 19:01:25 +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,URIBL_BLOCKED autolearn=unavailable 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 180B327BBE2 for ; Sat, 11 May 2024 19:01:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1t-0000rM-Qn; Sat, 11 May 2024 14:01:05 -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 1s5r1s-0000qm-AU for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -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 1s5r1s-0007zE-2W for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1r-0004Mg-EG for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 5/8] gnu: heatshrink: New variable. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545041816689 (code B ref 70880); Sat, 11 May 2024 18:01:03 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:18 +0000 Received: from localhost ([127.0.0.1]:49639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r18-0004Kz-0W for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:18 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:55555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0q-0004H4-V3 for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:04 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51aa6a8e49aso3888907e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450335; x=1716055135; 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=4YMGQxA4eSB9RGJ46/w1eSURcG2bdMeyZvFvwZx4m0g=; b=fJOuIEr54BEkTt5Texr6ASqR9C/gx4xEvRzwaAxP/Rj5rEf+FPdiVxXKDNGNzKkcXR r3Nuv0XsHmTPt0ILfUT4Vbrkz73CkmRVl3b9igFwBzd8YdUAy3ihPtgYSbjEj25qIyYv 1Dc69UZyrtHbdGfQkqreqqwa21BkwxG9S69lTax/cbuBHxuKvs8ns1yTXgInhnzKkz6J L/t176Furu5jYO++smgkPpdmnPdilaq0YklUDQwxQW0Cwx0Ib9jHkkBuxUwmYlRRQ2oa MKJCSe30ZYk+ziUZbCgC1+asQWMrB7AJz1Pjjm6ZWJq6o+cGjsMklLgiMfymZaeWn4Fl K6Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450335; x=1716055135; 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=4YMGQxA4eSB9RGJ46/w1eSURcG2bdMeyZvFvwZx4m0g=; b=B0uR+vTixsf+yrVGbwGKAzTptPJ/w+N78ruhTerLXXYHP+S5TR7noBW+wVR55UFJGD 7NYiBxHjPyzLJ1t+t0urS0ZwNw8n7t5p2WRUBCuy5NppjxU+JxSEabiu1Dy66ciS2CLJ un5tiEbmm3zqsz6Sj4I1y2EMRfSmj2RdKsub/VDuIXCML0fOD/URjsvYquYvNztEtRPs q+F9VM8VKdkrw8MxhOMSYphIuQrh8RKsv009OYWOj9/YeHoMpWz3o68vX37Auwgz8ZTk 5243VE2WhCQRE3mVOsb3kvEgfPeMP7wLjpnc4wxmyIWJGmJXWwwskr2K6PWXsb1IeMcD Ii0A== X-Gm-Message-State: AOJu0Ywb8oO9xJRFiPxbAIogcbnABVIXhrgapw+9D/l3yLkrLbzYA+oH zILaHVMtCu7/trB30acDxNVCM/OGJlvq9Mj7YQZwjtpiUO1XmSv/PaNChg== X-Google-Smtp-Source: AGHT+IGmNwEkHNJyCeXUDFSsSuA8TdOZR5XyKj7p0Lu0YRuJwRgwlAr7fAklWS/ndsRVQU26yE/6Aw== X-Received: by 2002:a05:6512:2389:b0:520:ed4e:220f with SMTP id 2adb3069b0e04-5220fa7187amr5064348e87.2.1715450335210; Sat, 11 May 2024 10:58:55 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:54 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:33 +0300 Message-ID: <5ed96653a085765c79a2bf6b0150ddab179339f9.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 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/compression.scm (heatshrink): New variable. * gnu/packages/patches/heatshrink-add-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Add "heatshrink-add-cmake.patch". Change-Id: I0beccdcaed22e47ac6bfe522497e0759a315813d --- gnu/local.mk | 1 + gnu/packages/compression.scm | 54 +++++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index edd546f81d..3ba9253ae2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1455,6 +1455,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heatshrink-add-cmake.patch \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 55784a70de..187bc73f2f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2024 Vinicius Monego +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -570,6 +571,59 @@ (define-public xz (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both (home-page "https://tukaani.org/xz/"))) +(define-public heatshrink + (package + (name "heatshrink") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicobject/heatshrink/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the + ;; only users of this library. + ;; + ;; See + ;; + (patches (search-patches "heatshrink-add-cmake.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: No tests available with CMake. + ;; See + #:tests? #f)) + (home-page "https://github.com/atomicobject/heatshrink/") + (synopsis "Data compression library for embedded/real-time systems") + (description + "A data compression/decompression library for embedded/real-time systems. + +Key features: +@itemize +@item Low memory usage (as low as 50 bytes.) + +It is useful for some cases with less than 50 bytes, and useful for many general +cases with < 300 bytes. + +@item Incremental, bounded CPU use. + +You can chew on input data in arbitrarily tiny bites. This is a useful property in +hard real-time environments. + +@item Can use either static or dynamic memory allocation. + +The library doesn't impose any constraints on memory management. + +@item ISC license. + +You can use it freely, even for commercial purposes. +@end itemize +") + (license license:isc))) + (define-public lhasa (package (name "lhasa") diff --git a/gnu/packages/patches/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch new file mode 100644 index 0000000000..f67f87126e --- /dev/null +++ b/gnu/packages/patches/heatshrink-add-cmake.patch @@ -0,0 +1,111 @@ +From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001 +From: tamasmeszaros +Date: Thu, 27 Jul 2023 23:11:25 +0200 +Subject: [PATCH] Add CMake build script + +--- + CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ + Config.cmake.in | 5 +++ + 2 files changed, 87 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 Config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..5b840eb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,82 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(heatshrink C) ++ ++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c) ++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c) ++ ++find_library(MATH_LIBRARY m) # Business as usual ++if(MATH_LIBRARY) ++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $) ++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $) ++ ++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0) ++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1) ++ ++if (UNIX) ++ add_executable(${PROJECT_NAME}_cmd heatshrink.c) ++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc) ++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++endif () ++ ++# Installation and export: ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 0.4.1 ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc) ++if (UNIX) ++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd) ++endif () ++ ++install(TARGETS ${_exported_targets} ++ EXPORT ${PROJECT_NAME}Targets ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++ ++include(GNUInstallDirs) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ heatshrink_common.h ++ heatshrink_config.h ++ heatshrink_encoder.h ++ heatshrink_decoder.h ++ DESTINATION ++ include/${PROJECT_NAME} ++ ) ++ ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..0809ba9 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,5 @@ ++@PACKAGE_INIT@ ++ ++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++endif () From patchwork Sat May 11 17:58:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27395 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 BCF1F27BBE9; Sat, 11 May 2024 19:01:27 +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=unavailable 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 B8D9127BBE2 for ; Sat, 11 May 2024 19:01:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1t-0000rH-Cw; Sat, 11 May 2024 14:01:05 -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 1s5r1r-0000qX-Up for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -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 1s5r1r-0007z7-Mv for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1r-0004MZ-2m for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 6/8] gnu: Add prusa-libbgcode. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545041816680 (code B ref 70880); Sat, 11 May 2024 18:01:03 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:18 +0000 Received: from localhost ([127.0.0.1]:49637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r17-0004Ks-Le for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:17 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:45528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0s-0004H5-0w for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:03 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-520f9d559f6so3412994e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450336; x=1716055136; 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=K6TAoGD8f1hmJ6TolsQv6L2vnVh5C0QgbdMYkY1tbQ8=; b=O/U0iIWK8N8i8EJKxjP7NB2uz31Zg86mlS+HJVrL4noWXNpFYXQTzni8DQL4NTfCvy BN5dr19nx2XlBNNQCo5PgnAP2Hri70bijYk67lwX4YoAxP6dSBjkUfCOCBO8VOGPVYW1 OoH4l4ZCOuuX+fpNPzfr/fpfPWcipbXktZE7KMajZxoW8MOhBZXxXv+cewd0IZy4cnDY Gze4cB/Zz+89kDLncq8PCITzlYfutUisHazXK+WmVfklr2B22uY/HImkueZTdO6M/UZY awrTrhdR4oGt4NtWC4AveOsbfZ0wloAWyZi1ASsFOPEIbjhf9OTy6j+t2MfeqKfAY1qX mNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450336; x=1716055136; 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=K6TAoGD8f1hmJ6TolsQv6L2vnVh5C0QgbdMYkY1tbQ8=; b=sWdmqdlXJUHQYrvSOZufbyvtbpx+knvnlrauSFU8UHfQSksZebzCqq/tXjRVDk5mxP h7TmumqMs9TBWNy1WmuwETIqATHoW3KQ9uraF2EkJn5QOd8+a9R1U3hTspexSUeCajZL Mxaehq+QeZ0LxDJ5vmIfGVuQkdVLCD/CpkaW/HmF54y4VGCMjzfrdTxH1rmQblGLTl70 na7Nj8Eyc3ORaOr7m4aVRQ9N415BqXuuiEpv+hud2srrviTyz3sh6rU+znM5tYKNGJcI lNjmPnwBxTmBvpXHeFGk5mkycOQONl4lCDX5zGjresyVFvmW2VI5mw5ApdgxucPZBccy yX8w== X-Gm-Message-State: AOJu0YzGh8+p2vrWvBGZNugeq/8wFxz8h55UAL1TZW+s7QFMf7rgTT+x HFdSESOeuT0eS/4hokIrRQwBYc7QOVncaBmPIwvHJIOT78toHgX8oT/wFg== X-Google-Smtp-Source: AGHT+IEowLLdJf/d2xFqQda8/6GxpvgQKuJD/uPihom3EZ5tcywG19dvdJkis6r3Gx8ibT6K2vIvIw== X-Received: by 2002:a19:8c1a:0:b0:51a:f3b9:f774 with SMTP id 2adb3069b0e04-5220fb74698mr3635849e87.21.1715450336450; Sat, 11 May 2024 10:58:56 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:55 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:34 +0300 Message-ID: <15e75ed6a8a2c035194ca4ee66c0fb48b04a48d7.1715450052.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.41.0 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/engineering.scm (prusa-libbgcode): New variable. Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 --- gnu/packages/engineering.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1a0b136952..b1776484b5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3774,6 +3774,30 @@ (define-public libigl visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") + (revision "0")) + (package + (name "prusa-libbgcode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prusa3d/libbgcode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) + (native-inputs (list catch2)) + (propagated-inputs + (list zlib boost heatshrink)) + (build-system cmake-build-system) + (home-page "https://github.com/prusa3d/libbgcode") + (synopsis "Prusa Block & Binary G-code reader/writer/converter") + (description + "Prusa Block & Binary G-code reader/writer/converter.") + (license license:agpl3)))) + (define-public prusa-slicer (package (name "prusa-slicer") From patchwork Sat May 11 17:58:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27399 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 1EB3727BBE9; Sat, 11 May 2024 19:01:49 +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=unavailable 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 844B327BBE2 for ; Sat, 11 May 2024 19:01:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1v-0000sK-79; Sat, 11 May 2024 14:01:07 -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 1s5r1s-0000qv-P0 for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -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 1s5r1s-0007zJ-Go for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1r-0004Ms-TU for guix-patches@gnu.org; Sat, 11 May 2024 14:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 7/8] gnu: Add prusa-wxwidgets. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Nikita Domnitskii Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545041916695 (code B ref 70880); Sat, 11 May 2024 18:01:03 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:19 +0000 Received: from localhost ([127.0.0.1]:49641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r18-0004L8-Ok for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:19 -0400 Received: from mail-lf1-f43.google.com ([209.85.167.43]:57820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0t-0004H6-6r for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:04 -0400 Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-51f72a29f13so3834269e87.3 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450337; x=1716055137; 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=bsv/66EDUWe1oxd7hS4dv/aOYRUZ8kN/Kvt0dUrd8vk=; b=ByQPRJpYawxkPQOa6kyyZd4heAHD4i2EHfMF3VEcWPjc2IxvIcXxU3+P/41Pq9xjK4 AkmiTOK/uue9NbeWVw2ZAnNctZaMgHNyF4HqKVx74GPD/pgB1t4Y7OoIQCEKR7N5Xn9W vnl8ug9q/o5XHCj2XVvK4kLNd42NXPLqJ9Gjen4sBO3qie7JLM77BsIMhCqnqIyoSvtE 0PXfdG+/U0mQtbYELnN+rWzlQc2ThGolLmB8lRcrYSXeir7k6G3FFoIcmOv7EiNXIGC+ x8uHSdSEo82/8ZY2DRjCWrsRfCogYfxgHvdD9OrZXHWHRJyPjXk3HD5MKJqUWMkI0lvB TXiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450337; x=1716055137; 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=bsv/66EDUWe1oxd7hS4dv/aOYRUZ8kN/Kvt0dUrd8vk=; b=lCgh9E3FvRrACS1MRYe8ybwewfbMoOWI73pwAsMzwLBD8m3Pd38LGtWskPmyl/1d2u RbQhddoZSvZHgEJKsJp3gtmSHy4K2dg1933nm2X1iX3G9jMPHg99gSCzN5FKRZInQvq6 E2pAUUl431dkr+OfhWOsO2InVWLp1lZGUmdjq57bdByldOd4kfUEDcMN6c8u7scjl7pf egCrmetLT/e01F5E+RaJn7U1f60Sqwc4O7kxf1CV3sXSG51OqXP+Bcv9W018dFq1YCZr GYyKaJk0obkkj0RWvryuKdRrRqEUkM4d5EcfkT3ec2iEG6SsskNp13FKAmG079SrBDsq SpdA== X-Gm-Message-State: AOJu0YwQxGwyS7DjyRqd15DfI5W0N2RG1DkuDtunbr/ZeORWEOeqRRDY N6xYmku9hA8wo8dFUdhRxw11DteI804IUZ1rGFZ17Hs8PAws8G9MNf23TA== X-Google-Smtp-Source: AGHT+IF0I+2wWPRIv7i4sImkOMkBXHD9KiIdCh2pD7QDjAPNC13CifuHIHLkubgzMrvmFXM13/zHyA== X-Received: by 2002:ac2:46ec:0:b0:516:d259:245e with SMTP id 2adb3069b0e04-5220ff72105mr3957656e87.9.1715450337397; Sat, 11 May 2024 10:58:57 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:56 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:35 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 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/engineering.scm (prusa-wxwidgets): New variable. Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/packages/engineering.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b1776484b5..08ff06fa94 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3798,6 +3798,33 @@ (define-public prusa-libbgcode "Prusa Block & Binary G-code reader/writer/converter.") (license license:agpl3)))) +(define-public prusa-wxwidgets + ;; There is no tag/release, all patches are in separate branch. + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version "3.2.0") + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (inherit (package-source wxwidgets)) + (method git-fetch) + (uri + (git-reference + (url home-page) + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "02nd07c23xbclnf1jjfbv6r5vqjb80gsdy2l559c5qzgdcvfd2xd")))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + #~(cons "--disable-glcanvasegl" #$flags))))))) + (define-public prusa-slicer (package (name "prusa-slicer") From patchwork Sat May 11 17:58:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 27397 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 6D48327BBE9; Sat, 11 May 2024 19:01:44 +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,URIBL_BLOCKED autolearn=unavailable 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 AB7BB27BBE2 for ; Sat, 11 May 2024 19:01:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5r1w-0000sR-7E; Sat, 11 May 2024 14:01:08 -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 1s5r1t-0000r9-5p for guix-patches@gnu.org; Sat, 11 May 2024 14:01:05 -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 1s5r1s-0007zS-U3 for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s5r1s-0004Mz-AR for guix-patches@gnu.org; Sat, 11 May 2024 14:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH 8/8] gnu: prusa-slicer: Update to 2.7.4. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 May 2024 18:01:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171545042016707 (code B ref 70880); Sat, 11 May 2024 18:01:04 +0000 Received: (at 70880) by debbugs.gnu.org; 11 May 2024 18:00:20 +0000 Received: from localhost ([127.0.0.1]:49643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r19-0004LJ-4Q for submit@debbugs.gnu.org; Sat, 11 May 2024 14:00:19 -0400 Received: from mail-lj1-f181.google.com ([209.85.208.181]:49318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s5r0u-0004H8-Dx for 70880@debbugs.gnu.org; Sat, 11 May 2024 14:00:06 -0400 Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2e43c481b53so37070271fa.2 for <70880@debbugs.gnu.org>; Sat, 11 May 2024 11:00:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715450339; x=1716055139; 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=tz/dyCuv3E+bxdzHtr2O90bdua5His85y83hDt99BYI=; b=Meu33TCbQ9HMSWSokn9lYFdDReUvyAi/oXCZRLcIhVG6+RhwV4ZmM4T4cRLXaIXDD/ CUtlk0yf6ZJWXbA7X7/VVPxSUspb8Cc3iATa3uunTRiu69v2nIHo4mMZc/knW0YNwwo6 UCfWHtzb0ndSJ8eR8NFnsIK+HveECJM4OtrSijhUT1Z37pfqZNXLuqnD6tpIWNP9FtYM ZqtQOdfT2i0Hx5ONtOXrmeY6pv61MGIlg1lUAXdD/6kfC96sgOg63rceYdwrO9HbzvdT o+zrSlwIeQ48GEqGKo0NUmwBl7fklXyhlKwZpss6E4UR+H8iDiVCuGAUcEfhqVK1p8fE 0awg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715450339; x=1716055139; 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=tz/dyCuv3E+bxdzHtr2O90bdua5His85y83hDt99BYI=; b=LIYH9mWKXRON3k/dCbNbTEj/j7y+xXbiXkSJ+YV1lnn+BRddkKo7V4j2pB76NUiAl6 /WJ4DjaVGvDaF33oAsE1u25R5TtcCYKtYDkXG1w41xbToAlQYQj5+XX1X6t+2D83vm7v MWbcwazXsky2QoKcGDbg12CAQjTm6k3r/ZtJNwLMa0LNX1+EGKsaT77bQR0m7hNqxI/F jwXtQQ3AH53hf/KZjwCvtZ62xPwC3imRwnBbo1iZoMDVOIW7R2TcET116ymdMdlJfsq1 sB2hPti346OZuiv1DoacMat0/TZRPnaTvJRsqXHH7Y24ZINNaf1mjDscwxHU1dTiL5mB yT/w== X-Gm-Message-State: AOJu0YzxRFlqu63rEjyrF0THdi12CRgmNZ4iBagnljpo/aMI56iRU+K5 Vbwl3mqOCEP0IrqFMCBePTijiIdED3OGLLT4TA5Liy0f4DjhM8TuOahD9Q== X-Google-Smtp-Source: AGHT+IFVm7ptt0zf2qRuzS23A0qlGWOgOkEoUUOTMtXDAaBYl02uY2wBNxP8D2Fs1mK6D/zs4CeXGg== X-Received: by 2002:a19:ca47:0:b0:51e:fa8c:47cc with SMTP id 2adb3069b0e04-5220fc7ef13mr3469141e87.30.1715450338638; Sat, 11 May 2024 10:58:58 -0700 (PDT) Received: from elephant.. ([5.166.209.213]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ad59asm1075411e87.45.2024.05.11.10.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 May 2024 10:58:57 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 11 May 2024 20:58:36 +0300 Message-ID: X-Mailer: git-send-email 2.41.0 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/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: Add "prusa-slicer-boost-fixes.patch". Move some part of the snippet code to custom build phases. [arguments]: In configure flags add paths to external libraries. Add "fix-include-paths" phase. [native-inputs]: Add "catch2". [inputs]: Use "prusa-wxwidgets" instead of "wxwidgets" to fix segfaults. Ad "qhull", "nanosvg", "heatshrink" and "prusa-libbgcode". * gnu/packages/patches/prusa-slicer-boost-fixes.patch, gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch: Remove unused patches. * gnu/local.mk (dist_patch_DATA): Remove unused "prusa-slicer" patches. Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 --- gnu/local.mk | 2 - gnu/packages/engineering.scm | 51 ++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 33 insertions(+), 169 deletions(-) delete mode 100644 gnu/packages/patches/prusa-slicer-boost-fixes.patch delete mode 100644 gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3ba9253ae2..3b61666803 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1816,9 +1816,7 @@ dist_patch_DATA = \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 08ff06fa94..99f7c82d7d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3828,7 +3828,7 @@ (define-public prusa-wxwidgets (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3837,13 +3837,11 @@ (define-public prusa-slicer (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) - (patches (search-patches "prusa-slicer-boost-fixes.patch" - "prusa-slicer-fix-tests.patch" - "prusa-slicer-with-cereal-1.3.1.patch")) + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) + (patches (search-patches "prusa-slicer-fix-tests.patch")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; Prusa slicer bundles a lot of dependencies in src/ directory. ;; Most of them contain prusa-specific modifications (e.g. avrdude), ;; but others do not. Here we replace the latter with Guix packages. @@ -3851,10 +3849,12 @@ (define-public prusa-slicer (delete-file-recursively "src/hidapi") (delete-file-recursively "src/eigen") (delete-file-recursively "src/libigl/igl") + (substitute* "CMakeLists.txt" + (("add_library\\(libexpat INTERFACE\\)") + "")) + (substitute* "src/libigl/CMakeLists.txt" + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(libigl\\)" all) - (string-append - all "\ninclude_directories(libigl INTERFACE libigl::core)")) (("add_subdirectory\\(hidapi\\)") "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") (("include_directories\\(hidapi/include\\)") @@ -3867,13 +3867,24 @@ (define-public prusa-slicer (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. - "-DSLIC3R_GTK=3" ;; Use GTK+ - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. - "-DSLIC3R_WX_STABLE=1"))) + (list #:configure-flags + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. + "-DSLIC3R_WX_STABLE=1" + (format #f "-Dlibigl_DIR=~a/lib/cmake/igl/" + #$(this-package-input "libigl")) + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include-paths + (lambda _ + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" + (("#include ") + "#include "))))))) (native-inputs - (list pkg-config)) + (list pkg-config catch2)) (inputs (list boost cereal @@ -3899,9 +3910,13 @@ (define-public prusa-slicer pango tbb eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 + qhull + nanosvg + heatshrink + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + prusa-libbgcode zlib)) (home-page "https://www.prusa3d.com/prusaslicer/") (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch deleted file mode 100644 index 5bca271625..0000000000 --- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fixes for Boost compatibility. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch - ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -9,7 +10,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(std::move(path), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include - #include - #include - #include -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -15,6 +15,7 @@ - #include "libslic3r/PrintConfig.hpp" - - #include -+#include - #include - #include - #include -@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +85,7 @@ void read_used_binary(std::vector& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch deleted file mode 100644 index affa506b1c..0000000000 --- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix for building with cereal>=1.3.1. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -127,7 +127,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r libcereal) - - if (APPLE) - # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -395,7 +395,7 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ libcereal - libigl - miniz - boost_libs ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -446,6 +446,12 @@ - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+add_library(libcereal INTERFACE) -+if (NOT TARGET cereal::cereal) -+ target_link_libraries(libcereal INTERFACE cereal) -+else() -+ target_link_libraries(libcereal INTERFACE cereal::cereal) -+endif() - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")