From patchwork Sat Jul 13 11:13:10 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: 66211 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 A13C227BBE2; Sat, 13 Jul 2024 12:15: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 F3B8D27BBE9 for ; Sat, 13 Jul 2024 12:15:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaid-0007sq-3B; Sat, 13 Jul 2024 07:15:12 -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 1sSaiU-0007sB-17 for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -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 1sSaiT-0000HK-N4 for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiT-0002xj-UM for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 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, 13 Jul 2024 11:15:01 +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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086926811216 (code B ref 70880); Sat, 13 Jul 2024 11:15:01 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:28 +0000 Received: from localhost ([127.0.0.1]:55200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahv-0002uq-VU for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:28 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:46545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaht-0002ud-UG for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:27 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2eede876fbfso8576011fa.1 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869204; x=1721474004; 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=RidZDTQt1hC7kbjdpGutjkWYGItaC0wG5f3PvB4n/Ds=; b=UHPzRxP9mMXL5eHDNJ8/pfWKY+EyZNykMHRHYWQLOmGphcB1QZpYqSZ5uYY55yhyiq tORcHKM5u10zaB3QVwsVQ8ZY9+bjJicOg7QoDcfI8vp9sDeVopgXAjmeCpjvRmK3eo/x zsFbsWQpGwIghf4TYLv3ns9x9/XAZR5L10CFrvoISvzpIkGFVmLRqLy6xrlASFGp1Cj3 Jz+f7E9TlEmDi1h5zfeb1bXn2eQOoyXdxv/OxUZpSb9PpvROVS0bvs+jZQydB2u8sdQf fUJvqIgNc91KVB6gpZDPx2JVMa/d1wWXt6kd6nGEZT+BlkC41T5MQR07IKIXlGV/1fqb Zc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869204; x=1721474004; 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=RidZDTQt1hC7kbjdpGutjkWYGItaC0wG5f3PvB4n/Ds=; b=TDJjGsh7zQl6NR1WD32zVWkfjtUp89aLP1aEqaihfo8lr81IZtnBqdkhM8TDeCpeSL W5moobubI0rBkDm/+k/Diuhs8fXCAhGFK6w5h3sT8CHpnTh0vzwZOX9bNWmIh6O+0kpK goI+6A/5jLJUtu44NftBVFgtxAQc4tU2vud8jtn39BxV+18EiPw5mzRSiCfBv0aqHa5g fV8B69exAq7dSsvgUPaiJZ/+UsnPRYf2ZAZ9Aj3GfsBdp6Lgqxuu8j6iGe/bLhJnUOFZ he70COz/Ad5NgKCqzJ3SnT/o/7RHARfGbAAexS2gzHuqVYp8enGzdReJ1zANmQKy9K4E HFyw== X-Gm-Message-State: AOJu0YzfKyr8N7XKZOWTuyAXxK+UN3sa0fmNoys36WUkcVX+BxwBDzmV NVQmDnW2qZESgUCRWYuUjp9NEZx0gR4qylENekNLgcndwly9JHhsa36t6w== X-Google-Smtp-Source: AGHT+IFDVy9qPf1DtuHSbLtxVgkWlFbK3tWS3+QChXE/FqbbQ6zC32b753/v119zQZ0nCh2QruErOA== X-Received: by 2002:a2e:a582:0:b0:2ee:8b92:952f with SMTP id 38308e7fff4ca-2eeb304ea94mr125857761fa.0.1720869203119; Sat, 13 Jul 2024 04:13:23 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:22 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:10 +0300 Message-ID: <97d7c9dbc9e6b917a926a3c22c48ae7bd2318616.1720869087.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.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/graphics.scm (cgal): Update to 5.6.1. Change-Id: Id909fc7be5d421496e6a3cd87d366f437f76bcfa --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d85ac8bfa6..eb90713159 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -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 Jul 13 11:13:11 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: 66209 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 8D54D27BBEB; Sat, 13 Jul 2024 12:15:20 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 1E38527BBE2 for ; Sat, 13 Jul 2024 12:15:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaiY-0007sh-QD; Sat, 13 Jul 2024 07:15: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 1sSaiU-0007sD-26 for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -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 1sSaiT-0000HL-PF for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiU-0002xs-Bc for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 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, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086927511259 (code B ref 70880); Sat, 13 Jul 2024 11:15:02 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:35 +0000 Received: from localhost ([127.0.0.1]:55206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai2-0002vU-85 for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:34 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:57711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahz-0002ue-HD for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ebe40673d8so37920061fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869204; x=1721474004; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=Tv9n91uqGwRQjoMaJk8fQpM7PCXktCGYfB+7w1XbLhPzffHkJxbJIwK8DOELhXRDMb TzSBJ1gVXTqQQYlvYmczX72xZNAJ/BFnR4j2ALj37Wsn5luC9wwR4nE81nMpvM2kasmo qwiZ9NDPZYBnNyZYBN0luDX0VySZX8Jyz8RPBISP9CoZIw+E3xzx0q7r2QuWoK2AJhma iFZYYX122jWxj042Wk1wCksOrJNTSB77/bUhd+2VO80vAnxDn0ztY41oYpbmmyN9BcYz tRXUEeQRy3DH2HUb0rXD2n78OnV8E/CTK8veMEu3r+xCkIso7NOtqRkYroculiN7D8Z1 dUPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869204; x=1721474004; 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=nFgjmxOZb/xzWS8aygv1VObJd+lGV1N0fSe28oOkwaw=; b=xQLNLYXZsS/I53NN1G+4L69uxTiIVs3Oir8dRuPUsskf5NLv6QKI73RfW6jOd8483T eAObrl/l9tLIHET2jbQtvVnQUXTtAqXkO5khVfSA3Cgpxwkidb7FUZBIuXFqRwCErjan WMfrUxIlQtVX9Ja4D2MrKw6NMS9kfLgXarP55/6VjHXLT4v1kje3S+Q95LwMnXSuw305 fjWBpeDqjBHzRbjI/MDf+O5SJSbLz1U8rU2QqgszYQQWnwqSnmT9BEMGbLgqiz5Xgzox c8mdSHjh/nilV5QkOxl/AF3kHyMXDBwm8wJJmfLkDW6mjFC+hx56eaYd3QPQ9JoEW5By Mxow== X-Gm-Message-State: AOJu0YwvbSSwDu795Wr0IuCkUX/WFfIzouGjHf2cV2lM6HuKQSKvYmZ1 0+EFI66Ls1ArdqNNlA+LGsvTr/hgYQ89C0wGISliTdvM7nFFTij5kbwAjg== X-Google-Smtp-Source: AGHT+IFzm9EITq9mvdNSs5lQZuECzwqqW8lLUp/32VF/gjz7MHaY2r98E+zRBscMXAQb5ZMf8dChiQ== X-Received: by 2002:a2e:7d0e:0:b0:2ee:7e62:8886 with SMTP id 38308e7fff4ca-2eeb30bbf6dmr81811871fa.4.1720869204042; Sat, 13 Jul 2024 04:13:24 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:23 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:11 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/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 Jul 13 11:13:12 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: 66214 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 9BEF327BBEC; Sat, 13 Jul 2024 12:16:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 35FD927BBE9 for ; Sat, 13 Jul 2024 12:16:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaij-0007uq-N2; Sat, 13 Jul 2024 07:15:17 -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 1sSaif-0007tj-8F for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:15 -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 1sSaiU-0000Ho-Lk for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiV-0002y7-Bp for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 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, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086927611284 (code B ref 70880); Sat, 13 Jul 2024 11:15:03 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:36 +0000 Received: from localhost ([127.0.0.1]:55210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai3-0002vq-Ro for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:36 -0400 Received: from mail-lj1-f172.google.com ([209.85.208.172]:61858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai0-0002ui-Br for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2eee083c044so6055811fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869205; x=1721474005; 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=w13gxZFwPqjTTtAtj1i2hCxMhokK+oIfm/WoqKMCRJk=; b=mt8oG2yr515HcTBD5uLXbrVDVrCPS5BHLKcBiXHYk0L+c6r8Xt1zOUQQV1kIeehige EO4WaWnfzOLffRMOyDAYvI4ksyjYIC+GdH2mm3QcQODBVe3HVnD7CYLV5X6BygZqsMEW A7hHYzeT6nh1LkRi9PUzkumEDv+AQnXRBJHh8HyPavRZt3BnlQuOUaN+v/gyU9GiK+mK Ye5akCR4To8DQ0/agIkWlDPZOFig0BwoZFSjra4pC7eo35vsQ5sa20M78qhY9JgvnHFa haMVV4Gga63QrBmf+hzdO7d1lKHcYzLRuk4jki6tcMIdOFhzd8PKaiNKcNhf+gxxh5tt wt9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869205; x=1721474005; 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=w13gxZFwPqjTTtAtj1i2hCxMhokK+oIfm/WoqKMCRJk=; b=fYsQQG7IEWqJJxpWsattfaukC7sEFIl9p7yiDlNQTqLN1kxgnIsg2XcRQHkSkEBA/H AU8nI7Y7Aepw7HKqg1p+eNvo4yy/+xqQGtfTpld5NtYYz1LLqGbo7QBw2QeQLHapdyjS pn2rAo8Ja/ROpG1pJEt7R1OuwZhswPtTnOIEfSSOYZc0UVXpKETQHL5LQVUIkj3j84mW szMXpXeGXAmC06UPBjkF7uysfV2yR8GTcrbLPtnPoNGciJq4XyDc2j3cwX5qgBmXQhqB sjBmAsgx8QT8XVDtJG8lyqHnAeZDkO4hPhTT+0NJQT3q9ELix1Y3ibaCxbXHYKt0wPhV GjPA== X-Gm-Message-State: AOJu0YwhF2Nzv3oc/J4OuSx35KTf4lXczPF+8icMX3ZIGVNa1qcz7mZ9 Cw2gBj61lo9xcZjFcipZVbXp4TOzG1NYs1KMBrLCq5fsExQupOg9+mUAbA== X-Google-Smtp-Source: AGHT+IGsaZVXU0tihUFrGkcuu1pBtgwkwB6vP/m+QdY4MgO71adpP/epaX1lAwpYj9zVGqFZdXrbsQ== X-Received: by 2002:a2e:9d06:0:b0:2ec:4acf:97dc with SMTP id 38308e7fff4ca-2eeb30bc9eemr93717961fa.11.1720869204977; Sat, 13 Jul 2024 04:13:24 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:24 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:12 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/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..8441f3ae65 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")))) + (native-inputs (modify-inputs (package-native-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") From patchwork Sat Jul 13 11:13:13 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: 66213 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 157CC27BBEA; Sat, 13 Jul 2024 12:15:34 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E596727BBE2 for ; Sat, 13 Jul 2024 12:15:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaik-0007w1-DM; Sat, 13 Jul 2024 07:15:18 -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 1sSaif-0007tg-7z for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:15 -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 1sSaiV-0000Hv-1A for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiV-0002yE-OY for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 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, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086927711291 (code B ref 70880); Sat, 13 Jul 2024 11:15:03 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:37 +0000 Received: from localhost ([127.0.0.1]:55212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai4-0002vx-68 for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:37 -0400 Received: from mail-lj1-f173.google.com ([209.85.208.173]:56776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai1-0002uw-Gc for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:35 -0400 Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2eee1384e0aso4465921fa.1 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869207; x=1721474007; 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=o09OH4WSIEGBpIflZzgQf+5DydiiFvH5C+xVQdbMSWg=; b=VwLJqqIHPyatm+SX1ngwrJXf97PPSExSkOnFYvJDbSqq099jnVn8EZnfFS2wX9zs77 TztdcSsn/4MbKac2aFJMNRJaUNd88RuwMllbkKCL5SLmVxrmrKt/HUqPRaVJG3dgyxiR A14EGaPVzVTFpk2o6i1kKzRsZi1RjpzQwBPcpMfEEInwbCBLt2a7YZNOXPIs25Tx75+H M1XNqyfNPdFzbYPPoDmf0o4TRRyy0vE6phSVHzUIVlqLleefuDLoOipipR3WQDxSqiE4 GZ30WYqd0DEoRUhbJaJpGhm0XMXuMZY+WBNIhk6RmHICE5+u2Hagiw/UuHHnYqLZM23W h0FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869207; x=1721474007; 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=o09OH4WSIEGBpIflZzgQf+5DydiiFvH5C+xVQdbMSWg=; b=KXG70YJMX+mZjqAUV8BQhbz8TeFc1J2qOF3CpB42drToRMWXbrgMXeAt54uHWwj4L6 wlfTvGqqNxb0ftvF9QpNoETNAAibhBU00qjaqo1DFa8jCKu46Ddw+zmDjMQWKt4/K6BT lGgyPqQwAaVz1lioSfj/JHIBZPoTRkMuxYCXd1R0YPF4PrscJKAlr3hbMwZ9ginuEaby 2v2AYvCowABfj/c/9lgm7ZOEe8pcBs7gNmOkb0XqzdnkIBGRJaLtkPdxhqp9y5ROsS0v xNj5Fg9RuriyAO34i4ofNakBNuXnRz2VhGVhdCJhaylO8cQL2f6YgpH1CS/WJtBOqiUC GnTg== X-Gm-Message-State: AOJu0YzwFoBuX2FJPiy+6Oo3BQj8udE3Nnppfx9AuX3YtJFNVGbF5STD Sivnb8ZDRNjdgIolBWB+MN29fjum/s47IZ/3fFHW7KtX//5hZH3a8v1C/g== X-Google-Smtp-Source: AGHT+IEyEFUAsAkO35tKrY7zDmbukzAO+u83lT9WmqflauS276HsIlYJIJlGVjGr2pcvXbe4vss6Ug== X-Received: by 2002:a2e:9e54:0:b0:2ec:6608:a3af with SMTP id 38308e7fff4ca-2eeb3103d02mr87528851fa.31.1720869206018; Sat, 13 Jul 2024 04:13:26 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:25 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:13 +0300 Message-ID: <5d6dafedfbdcb3eb6a67930d37049eca1d60bf51.1720869087.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.45.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/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 | 287 +++++++++++++++++++++++++---------- 1 file changed, 204 insertions(+), 83 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index cc9020c6fd..5dfb1e1be3 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 @@ -162,6 +162,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) @@ -3511,7 +3512,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3521,90 +3522,162 @@ (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-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-glad") + "external/glad") + (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 "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" @@ -3614,15 +3687,20 @@ (define-public libigl (url "https://github.com/libigl/libigl-tests-data") (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) (file-name (git-file-name "libigl-test-data" version)) - (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) + (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) @@ -3630,24 +3708,67 @@ (define-public libigl (url "https://github.com/libigl/libigl-stb.git") (commit "cd0fa3fcd90325c83be4d697b00214e029f94ca3"))) (file-name (git-file-name "libigl-stb" version)) - (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) + (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 Jul 13 11:13:14 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: 66210 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 2E01C27BBE2; Sat, 13 Jul 2024 12:15:21 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C7D8427BBE9 for ; Sat, 13 Jul 2024 12:15:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaih-0007tt-KL; Sat, 13 Jul 2024 07:15:15 -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 1sSaiU-0007sG-Eh for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -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 1sSaiU-0000Hi-5J for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiU-0002xz-Sv for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 5/8] gnu: Add heatshrink. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086927611277 (code B ref 70880); Sat, 13 Jul 2024 11:15:02 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:36 +0000 Received: from localhost ([127.0.0.1]:55208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai2-0002vY-Vv for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:35 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:59763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSahz-0002v4-Pk for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:33 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2eedeca1c79so7430881fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869210; x=1721474010; 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=ljk9zBP+YaaK+wl51WyCNh/28pIaVJSM299q8askKgA=; b=SROEGmVnD7rEup48JYBaMmFCaUzq1YaicVOhQ69f9wE2xxm3akd0rPx6DzmGmioU9M 5v4OCKcL5JUxj1epR2xvQdaVnqUJanc/q9SCUh34DJ6RvUExdwjryIGaghKUSWpxBhaG m2dzXJ/NcCOlyx5gO+1GtXVUfOfKI7y25V3rXTB75yMRWEVeKoYIrtpb9xZO+uRV9Xj8 +O8FL5XJSnM3Y0H71PBLqZSV2JdToVtjPCxvpCr9iy+l+QErPSQOptDqiixdbuymUXjQ ECecjK330LXAqO6utaAOWnPHzfAtmwyKK5CgGgMVNxZmkMM6FMIbLpv8+P0hEiyauOJO Dneg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869210; x=1721474010; 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=ljk9zBP+YaaK+wl51WyCNh/28pIaVJSM299q8askKgA=; b=PqUcQHsZfQIf58YMhdSIIxOoKkt7meafbtgh6P3KSolVbtIVltl7z6DrS0nvJytfb1 xBPz8P1aSQXqSgJ/WdAYbVY/uzSUeOmJzDvX0zKqW4Yxx2CcBBc+4hrEc5T9Cb6x1fW8 l2xex/o6MCvlQUaYZ7cidReiWUi0yE8lAz/TEApdrwoN96sVHEC5VzdABkCzaEJmfj1a j46wwLRwRpAUumUyKzn11ue3fH9MFJowOqXJWBwlf91a7DR87HD7L4M+HD4E1+AjfYgn /tYv/k7JIshdxbwQUD7rQOEz3UrbI+YYBj8ea4oFs2weIOfHMk5gxpniWx+xvXq47msg zQ9A== X-Gm-Message-State: AOJu0YxFzzhTcT7AwpjHm/LxT64KlbwXdWx60twXULuvOl1RbqQgLvL5 ZZVbXlrjvPNQRFb/7aRm8A2MxOuaM8bveuBK/wK98Bhdded/vecFfUASFQ== X-Google-Smtp-Source: AGHT+IHLkZ1IVsndwNMddP+jHEZSgG/N2IGis4cSEZ7SN/bv55T0Aj2j6+KKU8UVhW58exm8LwMRzw== X-Received: by 2002:a2e:300b:0:b0:2ee:d5f5:43e with SMTP id 38308e7fff4ca-2eed5f50f1amr31569481fa.32.1720869207029; Sat, 13 Jul 2024 04:13:27 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:26 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:14 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/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 | 40 +++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index ea4cc251ae..4726e2c128 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1482,6 +1482,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 ac025e0e3d..1c9e0a804c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2024 Vinicius Monego ;;; Copyright © 2024 David Elsing +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -574,6 +575,45 @@ (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. + +Among its features are: +@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 less than 300 bytes. +@item Incremental, bounded CPU use. It can be used to 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. +@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 Jul 13 11:13:15 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: 66212 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 AAA0B27BBEA; Sat, 13 Jul 2024 12:15: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 DC39627BBE2 for ; Sat, 13 Jul 2024 12:15:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaik-0007vT-2b; Sat, 13 Jul 2024 07:15:18 -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 1sSaif-0007ti-7G for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:15 -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 1sSaiV-0000Hw-Fj for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiW-0002yL-7W for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 6/8] gnu: Add prusa-libbgcode. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086928211320 (code B ref 70880); Sat, 13 Jul 2024 11:15:04 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:42 +0000 Received: from localhost ([127.0.0.1]:55217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiA-0002wV-8j for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:42 -0400 Received: from mail-lj1-f174.google.com ([209.85.208.174]:49412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai5-0002v6-D6 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:37 -0400 Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2eea7e2b0e6so35090411fa.3 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869210; x=1721474010; 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=QlnJi+Hrl2UBbY6LbAo0dlF0srhaopMQxTpxc3U+ZfQ=; b=KgIu1XiC0lgwByw4pg3So6/8aAnYmGGDrCHpBumACVhMz2bp/fIzLClSaR04O87GV4 ILxUiafwila8AvDh4jbaSHJANNQFuCK4B0fXu9s7kwDm/f0N28KNjc/EarHXuwn8Vbqc OQERvkW2Hwp/JnmxhHmKGoikzClIGlvNtL/DQRuSWWECIBhg1qIOIR7Hlo1fS8iJl65X dJX5bv8lEEnNeXkcAbRX6PKS80Dvwh5oV4H+dyYzxLuRKyf3z6y1nTcvUwzEysWJDuuF r4fz41PD2e+eFynDDOMABW6kTAbRKpNeI/T2wkmonVaq+m2MPAXm1/3INPzrDS83fsIu ZNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869210; x=1721474010; 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=QlnJi+Hrl2UBbY6LbAo0dlF0srhaopMQxTpxc3U+ZfQ=; b=n+DOc06YpleTMgZ37IIhjUSsmn/c0U7oV/5RFYD9Y3jRIaUHanbx5HI9wTUgm0Q795 4Yxcyob7j6z1WAlSTqHlSt5/eLlOgTyj0Ih+wne2WCNdo9NetWbEqmDh9FZeMMOEWyHO XC4ITJpXFLR+YcCv36Mx9+m7wm4cUdivfZ2vkoamjsv5GLP8SsHFinqAGnyg7CtG0ZAM X0JR+/KUKU/xtxZORmhjY1JDNRI4CIE3UBrUCSpxbO70zXFfN6E/73cc3YoPlNIi/9i1 VR3tuu1LpRxj6i2VwMl1aOv6cwAW1Y+PXq0JQy2Rj5EwwDkrKxHdj3+ZXHoHAY/n5oi1 jsvw== X-Gm-Message-State: AOJu0YyuuZNrTJ6Ao2HH8hBgs/zn1iOA9yUJ+Ovp8JmM/aCD8QYrre7v BN6qn6AZ/8l8ZVOYQEkzWVZ/uQuayrK3XMMUCH4beT/KzCz54JPET5xmDQ== X-Google-Smtp-Source: AGHT+IGwC7vQOlS7tyHsrI+DDW/XxqTV/jeV2ab9GS5NqtsJ3HOCKKdbkrXK3DGWOVJ19Mycd1cfzQ== X-Received: by 2002:a2e:97cb:0:b0:2ec:1042:fb02 with SMTP id 38308e7fff4ca-2eeb30b4debmr100701921fa.8.1720869209938; Sat, 13 Jul 2024 04:13:29 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:29 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:15 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/engineering.scm (prusa-libbgcode): New variable. Change-Id: I1f18c399d0fe36987c613ce4c0c3845c803beb45 --- gnu/packages/engineering.scm | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5dfb1e1be3..30eb5a7773 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3775,6 +3775,52 @@ (define-public libigl visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + ;; Use the latest commit since there are no proper releases nor tags. + (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 and Binary G-code reader/writer/converter") + (description + "Binary G-code is a new standard for encoding and compressing ASCII G-code +files. G-code files are easy to read and interpret, but their downside is that the +data is not saved efficiently, and the file size is often very large. Compression of +the file is problematic because the printers usually run on limited hardware and they +may not have enough memory and/or CPU power to decompress it. + +Block and Binary G-Code is a new G-code file format featuring the following +improvements over the legacy G-code: +@itemize +@item Block structure with distinct blocks for metadata vs. G-code. +@item Faster navigation. +@item Coding and compression for smaller file size. +@item Checksum for data validity. +@item Extensibility through new (custom) blocks. For example, a file signature block +may be welcome by corporate customers. +@end itemize + +The binary G-code format is flexible and the encoding and compression of individual +blocks is variable. @code{libbgcode} library contains the routines to convert ASCII +G-codes to binary and vice versa.") + ;; See + ;; + (license license:agpl3+)))) + (define-public prusa-slicer (package (name "prusa-slicer") From patchwork Sat Jul 13 11:13:16 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: 66215 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 542B827BBE9; Sat, 13 Jul 2024 12:16: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 326AF27BBE2 for ; Sat, 13 Jul 2024 12:16:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaij-0007ur-O2; Sat, 13 Jul 2024 07:15:17 -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 1sSaif-0007tf-5u for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:15 -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 1sSaiV-0000I1-Sp for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiW-0002yU-KL for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 7/8] gnu: Add prusa-wxwidgets. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Nikita Domnitskii Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086928311328 (code B ref 70880); Sat, 13 Jul 2024 11:15:04 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:43 +0000 Received: from localhost ([127.0.0.1]:55219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiA-0002wY-LD for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:43 -0400 Received: from mail-lj1-f181.google.com ([209.85.208.181]:58392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai6-0002vB-E3 for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:39 -0400 Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2ee9b098bd5so38889171fa.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869211; x=1721474011; 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=GVRpAmkbpNMTuLOv+vXpL7vVOPJoLj+rF+SEti7X83I=; b=eF4ggaGzFk9HMSpd9+TIVcw6T+UPjtqkiIQudy3p53rndTRWRfwv339nuvNbyrQ8VM rHJ0B0E7chQuJGSa82VeZRVf47EJIQQpumhKptIq/TlWviKStltxJlg/IAYdtohMfnl1 CiPcGbEl8YO8bqs34esPF34eafntISPCPLkMahydJ6x9AgUWz3LSx6LEzXJkTO2rMYlz e0bGFCnWNgCGrAgrNB33jLE97nGuF0yEZCkJJxvOjWFNea41kP9xgtf/kGXv9DfTJsEq x5+aTzNsWC8XuXcdBAS5+mJVWlsGbXu5PlDjZXWNK+MpDfrbtuQnhpmQcdRYTz/RFqwh v+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869211; x=1721474011; 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=GVRpAmkbpNMTuLOv+vXpL7vVOPJoLj+rF+SEti7X83I=; b=wzsnvRfI7pWAASJu86RGa06Sce8fpyG3d6X2Semap74CXIYBevyCRHOjhVxTp/VBY4 AJrLJWT/TEL6PqRp4Uw7oJsssHYp2SnwmOxwq34QB1HGR5NbO2k1xQ1gpne65TEvTI9P LR8YDoUSwfqpxGTWV6HC98gnB5d7pJYa5dXzC1Bp7AEkTaggUXAXGVIG5/TSTWQzPo+E DL2ll3PJkIcZEEDBBgzWfP9Lz1GCcuQalvrmZeLjZim/JKrwhGrgmRq/CFhPelBGNdLx PVOHj4/GJJ5mykyM+EGGavNdU8IMzCe1biPlADwlc9NDtE39kIoFfNNUXSCLhlp/fG1w v5SA== X-Gm-Message-State: AOJu0YyqHtQ466Bne/eonaqs2Xgfwsik+K65YqqmZT6mZgHlnWvNADQH wsBTFhahTkYx35yVZMnRZjdsgIi+Xnhy+/4KC2jd+1Q1fmg7VYivti/GWg== X-Google-Smtp-Source: AGHT+IEBO6Fm3aObNLWmgx/EeY0DeDkfBuJlyKv4uTkMzgRFRPPa5q+g3NJAGdM4K9DG7Gsv9r0xaQ== X-Received: by 2002:a2e:91d3:0:b0:2ee:7bed:2cff with SMTP id 38308e7fff4ca-2eeb30dc158mr101881641fa.13.1720869210990; Sat, 13 Jul 2024 04:13:30 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:30 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:16 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/engineering.scm (prusa-wxwidgets): New variable. * gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register "prusa-wxwidgets-makefile-fix.patch". Co-authored-by: Nikita Domnitskii Change-Id: I9043c2acc95986275ee24d9c5d944e5fe2702e99 --- gnu/local.mk | 1 + .../prusa-wxwidgets-makefile-fix.patch | 112 ++++++++++++++++++ gnu/packages/wxwidgets.scm | 39 ++++++ 3 files changed, 152 insertions(+) create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4726e2c128..541f636c35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1847,6 +1847,7 @@ dist_patch_DATA = \ %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/prusa-wxwidgets-makefile-fix.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/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch new file mode 100644 index 0000000000..aadf976588 --- /dev/null +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 973e962fb1..11c2ac2154 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -46,6 +46,7 @@ (define-module (gnu packages wxwidgets) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -265,6 +266,44 @@ (define-public wxwidgets-2 (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(define-public prusa-wxwidgets + ;; There is no proper tag/release, all patches are in separate branches based on + ;; the wxWidgets release (e.g. this commit is taken from "v3.2.0-patched" branch".) + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26") + (revision "0")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version (git-version "3.2.0" revision commit)) + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + ;; The patch is taken from the NixOS nixpkgs repository (see + ;; .) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv")))) + (native-inputs (modify-inputs (package-native-inputs wxwidgets) + (prepend nanosvg))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag (see + ;; .) + #~(cons "--disable-glcanvasegl" #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-nanosvg-source + (lambda _ + (copy-recursively #$(package-source nanosvg) "3rdparty/nanosvg/")))))))))) + (define-public python-wxpython (package (name "python-wxpython") From patchwork Sat Jul 13 11:13:17 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: 66216 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 947A227BBE2; Sat, 13 Jul 2024 12:16:34 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 26E2F27BBEB for ; Sat, 13 Jul 2024 12:16:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSaik-0007ve-5b; Sat, 13 Jul 2024 07:15:18 -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 1sSaif-0007th-7X for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:15 -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 1sSaiW-0000I5-9S for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSaiX-0002yd-0Y for guix-patches@gnu.org; Sat, 13 Jul 2024 07:15:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v3 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, 13 Jul 2024 11:15: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172086928411334 (code B ref 70880); Sat, 13 Jul 2024 11:15:04 +0000 Received: (at 70880) by debbugs.gnu.org; 13 Jul 2024 11:14:44 +0000 Received: from localhost ([127.0.0.1]:55221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSaiB-0002wf-9p for submit@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:44 -0400 Received: from mail-lj1-f170.google.com ([209.85.208.170]:52349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSai7-0002vW-IN for 70880@debbugs.gnu.org; Sat, 13 Jul 2024 07:14:40 -0400 Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2eaae2a6dc1so43695531fa.0 for <70880@debbugs.gnu.org>; Sat, 13 Jul 2024 04:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720869212; x=1721474012; 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=sQ/cZoW5AdDegWIwoarfaTmpFei3mgHh4d+uxjAEOWE=; b=Gc1fCNYEpcXWJ5HLwX/sPx9kS1bXOYt4uiLX3OLr4LOlhl3MRI7xs9aLbDYJ767xRR W706e8BNpDTnXqaIwJoVkS9JKqUBpglyP7DZqtIOOkLtsvvUm+CyYJubrecZoWcfSg8M mCSoiKWXklO30xjdzbi+1zpBr2F0GVrXEcFfEkzYthpAvxdwk61FjwhRiPlyR9eGnL33 nj9ZBEDXsnxDcbYyzzyYqV/URFiUsOx9p924eRRSINUwqp0L1LIDttH3IhD4lb/V+oN8 18cQYw1AHHa6i2klC5moZxnF4VEIXyJ/Y5LPm8uuzMXubuDYnJ3S5n5F4fRA6z8G/fhj UW/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720869212; x=1721474012; 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=sQ/cZoW5AdDegWIwoarfaTmpFei3mgHh4d+uxjAEOWE=; b=EfrW4PkUvv7LtW2GvnI+fpn397e8Ctk9NTaBO0qd5MLZKjCTgRz2tA0oFqke4x2BNy ZhR2XfYHJfol3bonFUJj7MPddC7JzqPvO+60a5FevKZc5o5tmjmLgwVdtL9MSgNiCWs4 S2UUXrw1GqWkTHKAqjJx6dfD2A5fv82xMn9VNu+5o1xYUkv+O5Fypcb+8VrEDSmUWnQ7 HEpAb+hfvYA4/B0awiBQDEpFOUjATamb5A/AD5yEFDuob9haj/TmRJXV+jEYoKkSab+y /99KrUe1i+jeVcaNshfYU/kXoOA6VDRw1tDrmq4J0ua0tdQSkqWNzJhRC5sGQoNdXDrb FjMw== X-Gm-Message-State: AOJu0YxGmzYIBvL+aY7ODScbFnT/r72OSkWODFJQFedgFskWapsVLssv OrerEq+N0psH7A9pBqfl2wFY17P1A7vvIl18Mo6xBr4GvGySgmjXlZ8LOA== X-Google-Smtp-Source: AGHT+IEPUgyvzYP4BeIF6D7lrvh+uvYYKgZEUIuHQ6v4Ni7ResMg5nHfTJUKM6wg57mTiPxOgUWGIA== X-Received: by 2002:a2e:3315:0:b0:2ec:5777:aa5c with SMTP id 38308e7fff4ca-2eeb30529b9mr118289741fa.0.1720869211958; Sat, 13 Jul 2024 04:13:31 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2eee179e797sm1781541fa.21.2024.07.13.04.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 04:13:31 -0700 (PDT) From: "Artyom V. Poptsov" Date: Sat, 13 Jul 2024 14:13:17 +0300 Message-ID: X-Mailer: git-send-email 2.45.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/engineering.scm (prusa-slicer): Update to 2.7.4. [source]: Remove "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Move some part of the snippet code to custom build phases. [arguments] : Add paths to external libraries. Add "fix-include-paths" phase. [native-inputs]: Add catch2. [inputs]: Use prusa-wxwidgets instead of wxwidgets to fix segfaults. Add qhull, nanosvg, heatshrink and prusa-libbgcode. Sort inputs aphabetically. * 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): De-register "prusa-slicer-boost-fixes.patch" and "prusa-slicer-with-cereal-1.3.1.patch". Change-Id: I15e85d63c9ad6c731c8040ef2d8ec8b2f31f2ab7 --- gnu/local.mk | 2 - gnu/packages/engineering.scm | 55 +++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 36 insertions(+), 170 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 541f636c35..92bbe821cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1844,9 +1844,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/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 30eb5a7773..f017d75f2e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3824,7 +3824,7 @@ (define-public prusa-libbgcode (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3833,13 +3833,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. @@ -3847,10 +3845,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\\)") @@ -3863,13 +3863,26 @@ (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" + (search-input-directory %build-inputs + "lib/cmake/igl/")) + (format #f "-DCatch2_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/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 @@ -3877,11 +3890,13 @@ (define-public prusa-slicer curl dbus eigen + eudev expat glew glib gmp gtk+ + heatshrink hidapi ilmbase libigl @@ -3889,15 +3904,17 @@ (define-public prusa-slicer libpng mesa mpfr + nanosvg nlopt opencascade-occt openvdb pango + prusa-libbgcode + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + qhull tbb - eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 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")