From patchwork Mon Jul 1 17:07:03 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: 65813 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 BA4E527BBEB; Mon, 1 Jul 2024 18:09:22 +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 8400D27BBE2 for ; Mon, 1 Jul 2024 18:09:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWW-0002v2-7f; Mon, 01 Jul 2024 13:09:04 -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 1sOKWU-0002sb-F5 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWU-0007ew-6e for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWU-0004yb-OW for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 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: Mon, 01 Jul 2024 17:09: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.171985372019002 (code B ref 70880); Mon, 01 Jul 2024 17:09:02 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:40 +0000 Received: from localhost ([127.0.0.1]:34347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW7-0004wQ-MC for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:39 -0400 Received: from mail-lf1-f48.google.com ([209.85.167.48]:45482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW6-0004vt-0S for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:38 -0400 Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52e829086f3so2886481e87.3 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853651; x=1720458451; 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=DaACwQmu09jkpS9TjCtkeocIfpStWzpiPMu5xwaiDA4=; b=k3qx200E7KzDG7TxlJmol/cNvOVkEGJmvw3xkah0X3dHRkbqQdu19+rc6AGI7whmwQ xs4J3im8HiYNsgl+yOc0KyewuSmkLX5DyYnrsRz8MWW9vOxXMI3Dd8w7NeiMIO4gyQ10 AJnXpACv1jaLXr4b8zJ3vyRIYNMdEmgxrthq15fdjU25tOfJFb2VVW6r61Vio29Fai02 CsTdy9DCGzdHTPX4qklCysMgJAWMTFEbBxfEmGcf6NO1BRrGJ4gleGQ9UW7B6MjzO7NF QZdU2wMkt+k77S/ubIqKdwcM9dyKFlC6bo/flNFYoMCrTponok6cyok4VMuUCvMRtu+M sAuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853651; x=1720458451; 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=DaACwQmu09jkpS9TjCtkeocIfpStWzpiPMu5xwaiDA4=; b=czmGoN/oWwd5FcoYLShsS7NW3FuCm/2bjf4rMfdTOzlCeBtTmU76LjruN7WK9KOqUF gSgpKbrq97AwAnmFON5IdP3RlUJ0WvjBB5yHkAvrLbHuyIqPL0C+aDtmWNskmA2COxAM Lwfh0Bp8O6Z05XfOnHETR4BfIWTbXQquArUgfLkVQZq4EqSDjn3jG6nYHiKhmSij2Emn l+zL2/W6iHR+DBl3/QQsE0uLAv/suMkTp3VJvqUJ+MG5pBplW4N7kheHt+cBuV6D+ZcT ACxUVBs8TFj+LOw1A/AUKMuyYJCx1BPEBmvJVZg6kXmop0JL30G1GSN1P/IbsSs/NAME HI/g== X-Gm-Message-State: AOJu0Yxo1cqgjeVKjlJ14Flp9DoZwvtKoY+Flp5Ruvnn1EVUSTs7fW/n OSmIkc0/qBJ8WMT3GrmpA9XcsGujr3oU3UaJxNpGamj/gR6FTb3k/9w6nw== X-Google-Smtp-Source: AGHT+IEsMpC8DEFCUDluhz9baHwJkJeOmOMO/tab8nOpYubcLswyORrQep5OURYXoFh8uErxpOFgDg== X-Received: by 2002:a05:6512:3baa:b0:52c:d943:300f with SMTP id 2adb3069b0e04-52e8268b961mr3942175e87.38.1719853650358; Mon, 01 Jul 2024 10:07:30 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:29 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:03 +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/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 f609118c01..066cb550ff 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 Mon Jul 1 17:07:04 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: 65818 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 1858927BBEA; Mon, 1 Jul 2024 18:10:00 +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 A55F227BBE2 for ; Mon, 1 Jul 2024 18:09:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWW-0002vx-UX; Mon, 01 Jul 2024 13:09:04 -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 1sOKWV-0002t7-01 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWU-0007f4-Lg for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWV-0004yk-6Y for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 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: Mon, 01 Jul 2024 17:09: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.171985372219029 (code B ref 70880); Mon, 01 Jul 2024 17:09:03 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:42 +0000 Received: from localhost ([127.0.0.1]:34351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWA-0004wf-0D for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:50674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW6-0004vu-Se for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:40 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52cdbc20faeso4693859e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853652; x=1720458452; 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=lNm7k1YBngWtsmXcoyGrCy0Jw0XHrEZZSBsaH+PBFOzVfoMx0KtI/jXc6I8HQQw/bz TF21HNoqPveMeMTVTqqqlJCY8pZ4Yrfg2GZWt4JzQ4bkfz+kvpnLwoDlhK0CzqFZx3g9 9WYB/d7tmd4ixujHX5GwBF3MCf+6AzsacMfiGWUvtawA92RZcDvFmX1OGEHX8x2Fj9SW PKkoNkcJSgchInf3d4PJwH8SQ2JmZGg2MjQwWV3+d5n8HA/s+vOFkhtx8l6ajFJ+0Kwd rpVTyxFq+tJqEyPyIistSbTXgB77whL2rhZPRlkxdwUIw+MPZL63nDRueDwOr9M25KPj phvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853652; x=1720458452; 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=sWcpkCkq+k5h+cPfBsB9w6OR7dqnkTQxH49+tO0QfQdr0VUf6EOeFXuHxAxz4vJkCf oFTqOx27dQffCKe6wGh980krE8iU8dNMSefHM96V86Lszze6q1zKiTVEAo2YP/yJT+Ml J+TRrcjwQVwfTxvqfhLCk0GSwWa2OObZPy9WqAs9+2+hnZ+hNYNKlJLyPv4n/CThKz6i jmN8l1Rb6VKzYNWycaDizmWMq39LTYz2cqKqzO7OGI94iUofq36zON/24M+kuJ/pV63Q OTN59+UY1CHgvOftDDrkwNe6CNcaoOMwU6809Kyew5VeFvbvLzZEoCVV8Q1OR4fTUATx BOSA== X-Gm-Message-State: AOJu0Yyfcyy1sqPSnTiQa1T3T979oYGrjA/pMbVT6eecFOju2loYqrZg 3udy2MW9Gb6+5kKEui7OutrRP9Z1yzaz5gH3kRfzsD99E1h7iHMNLt5bvA== X-Google-Smtp-Source: AGHT+IEg1odPD1MBDsBidBr2gIHNd/53Ddo9HPBG9dynyBDwF76DgJkcssA490+YNqPKCPU3UAcQeQ== X-Received: by 2002:a05:6512:33d1:b0:52c:e3af:7c5c with SMTP id 2adb3069b0e04-52e82686b63mr4003473e87.34.1719853651295; Mon, 01 Jul 2024 10:07:31 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:30 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:04 +0300 Message-ID: <164af041e8271a27109c164ba5a1c57b6cd81140.1719853592.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/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 Mon Jul 1 17:07:05 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: 65811 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 4DA0F27BBEA; Mon, 1 Jul 2024 18:09:12 +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 934D227BBE2 for ; Mon, 1 Jul 2024 18:09:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWV-0002uK-Uq; Mon, 01 Jul 2024 13:09:03 -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 1sOKWU-0002sR-7p for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWT-0007es-WB for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWU-0004yT-BZ for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 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: Mon, 01 Jul 2024 17:09: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.171985371618982 (code B ref 70880); Mon, 01 Jul 2024 17:09:02 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:36 +0000 Received: from localhost ([127.0.0.1]:34343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW4-0004w6-CR for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:36 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:60728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW2-0004vw-Ix for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:35 -0400 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52ce6c8db7bso4870457e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853653; x=1720458453; 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=9lwmqNGasvk7wwxlnxUrJ3M6Nr5BohUT2D7rI09Fgwk=; b=Ase560hjl2PPAaeyxrCTKTADwqxxHDnjq68fZZnCfioBLNJvFGOFc2JOvBgOGcO4KS D/NrSSUXJf3VWgRfuEZCaUD6OPKeVe/fcDh78GNb/XQiPT0oPaW4bKv1+rc0bBOSdQ9q /MoIHP0rRqyAcPvr63rTpdu5DXkFmAafpIJ+TWtvYqXoTwB/8NtKvhXDpMfCPHLVyiUg ims3B014LoP+/cKDxyehL4/ggBGyxNN44pWpyW8Ue6CF+E3c+YAwye7DPF6/LkCwVCXq XBF1k+YeBinZIcgfk9KZ4XrgmPB/xZgykaDf3oab6glVbbEXrAjeUYZQiyZgQBGkSMmr z8Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853653; x=1720458453; 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=9lwmqNGasvk7wwxlnxUrJ3M6Nr5BohUT2D7rI09Fgwk=; b=EgfFteNXtMUXs1lI+uk/dPdLebWjuZ4vQ8qFlBxwIgUkiYPpMAbxx7aXUu63LbK+0S JQlzzsa2oMpR6FgVvYCB79yHwHdUWw5hgzFIyxlPG+veun9QIjJDhVT0p3XeOV20Hjbe inZ3b2Jry1OiPjdzXfJBu4yO4PvaeWV50pHJaj5D/TDAf5c12Qa4NCvXl5ZrAKPksHTx 0cntqQLTTYdu81yuWRunJEhiHyIBe0EPQtVIUHM58yAu7YCInEpVYaoBPEwQHMW4sGFZ BYGUB+zUxXr0Wi1zzFrRZNLaUXTbkdN19uG/eUU0sq3VEt05TnU9SUGph7BxUL4GEWU5 Z+2A== X-Gm-Message-State: AOJu0Yw/nmPWgXSmLGjvzN8wOdSXWue6dVxdmZVG7vm5dXpHAYdSruLD vIkMCYhaVGB/FRhOU/lOntdU0hbiPxlyXaXkDQXMwNNMHketLJp618joCg== X-Google-Smtp-Source: AGHT+IGOzttKXyBG9RWPAve0SJL0qb9+f9leAazDOTpdtc+d4mwiqR7zBndHoOpCHQGOZBXJRfnlpA== X-Received: by 2002:a05:6512:2213:b0:52c:db28:4d92 with SMTP id 2adb3069b0e04-52e82651a59mr4530230e87.11.1719853652231; Mon, 01 Jul 2024 10:07:32 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:31 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:05 +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..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 Mon Jul 1 17:07:06 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: 65816 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 82FB527BBEA; Mon, 1 Jul 2024 18:09:50 +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=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 1AE8E27BBE2 for ; Mon, 1 Jul 2024 18:09:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWW-0002vE-Gl; Mon, 01 Jul 2024 13:09:04 -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 1sOKWV-0002tJ-8n for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWV-0007f9-0m for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWV-0004yu-Jn for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 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: Mon, 01 Jul 2024 17:09: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.171985372519045 (code B ref 70880); Mon, 01 Jul 2024 17:09:03 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:45 +0000 Received: from localhost ([127.0.0.1]:34354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWB-0004x4-KL for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:44 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:51330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW8-0004vy-KM for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-52cdcd26d61so3589958e87.2 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853654; x=1720458454; 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=7u7kFIeSqQza0LSdt1reuoeJIpYJKVy6p9ZeF5lWdwk=; b=GdE7AK+SRRkjLFro1nEyuoEsAAJ06dJUaqGESn6fajqOFqw+u1tFPrcElxEOyz19bQ vXcFO6yRrlyAEAa84I0WvT8MGfshAT18w/n/2yD+PGVUwJltCGK14jhQwYnX7iRX1AAE M6j6oX2rLdJD0+DI9Dh/MB4AUjjKeWBtnce1S4KRqsKzxLAky3EjG/cyNeKvD/O0CJfM HjUO9X2bzx2PV+eJODSlsCk2SZHFuo49e/c2u6yj1WWq+72RJbZYkIZdmjGKVep5kaTL sbrhhvyS+YT6cVJApkHC1ihX8xWpmYe7ZBlT1DCCTtSJBpEXP+goaPPHQD4H3ModWGtf G+ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853654; x=1720458454; 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=7u7kFIeSqQza0LSdt1reuoeJIpYJKVy6p9ZeF5lWdwk=; b=rpGgWdsnTVtpDoTb7Cz00n9qa45T7eVk14JDTfH53ckgbau7jtA20qkf4Ems8Vjd8q Rd7+O4puTuBNu3F1YyDhJftHQie3k/od5OvSK/nkYGG9H1agO0uUJF/mEg7kZ8s1Q3Aa uDzSeEa1RuZH8VuyXR0blXnp18SD+LzhiG5zUVLK+r84n/MoMtk6vmyiUp4MOejyDiW7 7M/v8gOfaQbjcGJ0cMU9/OEie1BKGAORbIkRG9nXOdz9fT0bt9D+gRKYbbTHaxkIXpky b7MOXijgnZl0Ib0X3OFH0ywjzypjJvz7AccbWnF1TPkVLReGBv3CBfDIJigFw2ED48WX 7M9w== X-Gm-Message-State: AOJu0YzwRptt/aYRtNWTOO/8xg/TjXXi9CKax6Ma/LcIh6vkptMFeVBa vMbSmi4pH22dHFFfYLZeXxuttTdu6veSn5ogVwDaEV3/QTjEZU3sXah/PA== X-Google-Smtp-Source: AGHT+IEIx5XYueGejWBkZVSl+5BsoJFHm1DHt3Vvl1AU7LcxSQ78ZI9K6QPxzyUnn5nLamrkCsqRXw== X-Received: by 2002:a05:6512:3194:b0:52c:e101:1ae7 with SMTP id 2adb3069b0e04-52e826865c4mr4510363e87.31.1719853653241; Mon, 01 Jul 2024 10:07:33 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:32 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:06 +0300 Message-ID: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.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 | 258 ++++++++++++++++++++++++----------- 1 file changed, 179 insertions(+), 79 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fcb73eab12..7f29e2c365 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) @@ -3510,7 +3511,7 @@ (define-public xfoil (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3520,90 +3521,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" @@ -3615,13 +3677,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) @@ -3631,22 +3696,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 Mon Jul 1 17:07:07 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: 65814 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 EA1B527BBEA; Mon, 1 Jul 2024 18:09:40 +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=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 9AF4F27BBE2 for ; Mon, 1 Jul 2024 18:09:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWY-0002xD-8L; Mon, 01 Jul 2024 13:09: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 1sOKWV-0002uV-W2 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWV-0007fG-N2 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWW-0004z1-26 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 5/8] gnu: Add heatshrink. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jul 2024 17:09: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.171985372619062 (code B ref 70880); Mon, 01 Jul 2024 17:09:04 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:46 +0000 Received: from localhost ([127.0.0.1]:34358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWC-0004x7-Uk for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:45 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:54687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKW9-0004w5-IU for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-52cdfb69724so4099640e87.1 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853655; x=1720458455; 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=lj+wUu7b2paQBw2jHeY694G4Zx2J+MECWZIv2KVCVM4=; b=PtzlEwe4ssXu1/Jce0Ej8shOfsynvUMrkmAMx9+4R3D5Gop78DgCtwx4H53bhN32X9 2ctuyvSfTQ9GpsndY0YS4LP6iNmlkvhwjHAGWsQC2L66ROg4BtTUVxvpgL9iP5nC1gYe xtK4Yga68OMw2eq2f+kXXrHOghHOVwdJm1rug+S/NfgJQyoENx1iTdeZDTQZy/3opQa4 sSwCYO6xdx1TWfwSiBJmBqmpB70RgKdG7JRLnZpYj97la71Ca/kIIX7QZC5+VJJQaSDB 2Ln1bX6klcMbi9Z+ONWu+bHUwEDkzdMrvR5eKJ5T0sUef24Fbs/D2TrxHrjCND6/mvM3 /dpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853655; x=1720458455; 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=lj+wUu7b2paQBw2jHeY694G4Zx2J+MECWZIv2KVCVM4=; b=jXVpJ841MeoxNWXvvOyU6DBaGCYGF2vTHzq16urYCj/yfUk4J44MCgb1MWRZI9k0OJ SIQOAHsJMuSwlrgEolE2KvisgkDEAzYOIClcNndyfjZ89RGHGJiLbQOwt7k6VhHHGiiz DAVz2miN5c0TnZG6Re6T+NKkUphZ5muKgGyTTxIqfpWYXIkwGZdL17xq+IB73iHE23vZ 2scBcCm4EqXyeBFPzMXRYpEleIpXSmE54jLkgvID6r+V4g9GOzXH127y86hr/Y7IV2rQ 8VhtGLTHvhQB58j1r1himdcVFtfQEoZ6mSTE1cjJpkGDWc7fmrDuF7Npf/G/LTUnlLhv o2gg== X-Gm-Message-State: AOJu0YyrPqK9+m8o5kDg8kdPlqlxYBtRHU09f7O2GUVmrmPzFRn8C55E JK6AeWs0rTlt7mxP0xaqtRg37rStHXFf1ilFFzzDpq+0Fga8HcG4b3OKvA== X-Google-Smtp-Source: AGHT+IELZX7+j2NvGABA/J94bfJvvSJkLm+JE4R98FYgLowmofRFhvtewwUNGPGT7sEyILj2FUGQQg== X-Received: by 2002:a19:c50f:0:b0:52c:de9e:194 with SMTP id 2adb3069b0e04-52e826736a5mr3398509e87.28.1719853654325; Mon, 01 Jul 2024 10:07:34 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:33 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:07 +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 | 42 +++++++ .../patches/heatshrink-add-cmake.patch | 111 ++++++++++++++++++ 3 files changed, 154 insertions(+) create mode 100644 gnu/packages/patches/heatshrink-add-cmake.patch diff --git a/gnu/local.mk b/gnu/local.mk index e20ed2be7e..e263261986 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1474,6 +1474,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..0a028f1490 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,47 @@ (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 Mon Jul 1 17:07:08 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: 65817 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 BABEB27BBE2; Mon, 1 Jul 2024 18:09:54 +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 E7FE527BBE2 for ; Mon, 1 Jul 2024 18:09:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWW-0002w2-WE; Mon, 01 Jul 2024 13:09: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 1sOKWW-0002v3-7o for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWV-0007fL-W3 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWW-0004z8-HO for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 6/8] gnu: Add prusa-libbgcode. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jul 2024 17:09: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.171985372619073 (code B ref 70880); Mon, 01 Jul 2024 17:09:04 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:46 +0000 Received: from localhost ([127.0.0.1]:34360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWD-0004xO-W0 for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:46 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:58448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWA-0004wE-H8 for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:42 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52e743307a2so3716136e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853655; x=1720458455; 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=mSNHZjNwhp32sxiWq1HK3+sBUtao9DktGjDSbybn5g0=; b=Hjw9FxzAW1PSDNK3Ma4sx8TI7aVsAhZ6ZosMWEv0OaY0OCrJWMEVt7V5iTHhxuojGB YsSJn1NfiiTkwu8Bs1J2Ob3hlJAMmpOALI9OpB3qtPj4v303rNrw/hzhY1nTTSl9SaNe jDqTlqW5iCVtD7xQ33i1GdaTn4MqKjiNOXLGddACwD5kPMIdZC+mABwZEMovVWEEHYzY 1ttKyxsH/iEZHvt917Kvqgz3POwBZqLO73QpqnPsVO2x6hFGszN3IQmHzxBiQwiD9tnF +3djM3nBKJz00/uRSJLB6aaGYRZdBB32gmMInvS+kpsueCYAyvrWRZoeEejpkNweoiuU EzbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853655; x=1720458455; 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=mSNHZjNwhp32sxiWq1HK3+sBUtao9DktGjDSbybn5g0=; b=fJUNvMpliRj40GTho5YikKuUFv4XntILo26PGB+GSbZOIGFJRNbvDdJOTj2hDlADF5 ITTnGF0ov1vwva6CgzOU7DOZP9M2yj6IMRcX7BuZf1x3BG+iALgwsVF+EeEYFbjC7a9/ qpVltedj84aWSLWFRUkcKEq+8XSCU04SQq2KUFjAWE+FCbh/Q9a/s/2O6bM8LvPQQTWI ObG/NTZ+iBq3syjmrKzS6mozbYtsJnGsUKyWE2zg73TtEfpYANF9OdT/zX/9tEU0+MxV /s6glVdAytMV7NxifwFcoI3l4iwEF+jKka+BOZrr9ekHTUm3cH4YqbqP0ZgXPN6c8Y83 zmKg== X-Gm-Message-State: AOJu0YyDogTDWtLKiQO5QPf5ng9k3TDOYilciDBu16MAtg8OpLqlKYtN z8TnlcHDoP7GwJ8rlWOncyozdBzUnoTMmpUtsvti354+wgjeEPNmEDrE4Q== X-Google-Smtp-Source: AGHT+IEWmsmoOE5ZmGGOp1OA0ufXB4LUXUT/asaZhb3WmoLJHNbW4Nx1YdSIyPYMTXeYrEGpV4cMaQ== X-Received: by 2002:a05:6512:308f:b0:52e:76bb:c906 with SMTP id 2adb3069b0e04-52e8274a36bmr5302711e87.61.1719853655297; Mon, 01 Jul 2024 10:07:35 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:34 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:08 +0300 Message-ID: <2cdedc4189efac291f16e099b91605a8f8f4aca9.1719853592.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 (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 7f29e2c365..de4b4a5825 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3753,6 +3753,52 @@ (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 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. The library is written in C++ and the repository +includes bindings for Python.") + ;; See + ;; + (license license:agpl3+)))) + (define-public prusa-slicer (package (name "prusa-slicer") From patchwork Mon Jul 1 17:07:09 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: 65812 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 3016027BBEA; Mon, 1 Jul 2024 18:09:22 +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=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 E9B1A27BBE2 for ; Mon, 1 Jul 2024 18:09:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWY-0002xR-DQ; Mon, 01 Jul 2024 13:09: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 1sOKWW-0002vr-OQ for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWW-0007fS-GC for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWX-0004zK-0l for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 7/8] gnu: Add prusa-wxwidgets. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Jul 2024 17:09: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.171985372719082 (code B ref 70880); Mon, 01 Jul 2024 17:09:04 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:47 +0000 Received: from localhost ([127.0.0.1]:34362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWE-0004xb-JM for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:47 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:52414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWB-0004wL-Py for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:44 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52cd80e55efso5665700e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853657; x=1720458457; 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=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=FNUJfiuzgEeSAb5LeQQMCpagPAcQ0HAuLz1XYRNfFwde7wQWBbzrdvtL8RAWLEohXY o7kwohqgAdQQNill9nM9USmBu8v/4PvosZyCu3jhiuJ4QBFljv8wlTttc05p2/TN9/gQ NX1IccWuvamhTZgOTsPmVKuezhcOXGAnB5276dnCWMa5/Hw65PDqIyJ+2WyMW91DH82y Gnf+jHiWXCYVxCAtkKNQCq4f6c3WRtwUWCN0OktZ40fLEfnK4K6rOC869KdIAXRK8JU4 Glf9Au2bzJOaT1HQIX1l+xwnnuMEO2Lm8chp/lX5nuO5ODAxaVLNdOmybIR1tzVkJa0U TgCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853657; x=1720458457; 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=Ot7p/nJprPFcVjFf3MfkEfUCkxeX64QFMSOoMeIq3nE=; b=whke5BhhLdS2V/ZpcC5PmKclT5abiqCv+xHqMTHh28S281U3HHGFGG4KXljA17nTkJ TKVDdiwWt0ppO4T+GFY/iQ7ghK00f7uhzBacddirxBLx1gjtkVlCrc6XYcQNpdn993Cj UjW+XGC08k5au6KsF9T+SPJoP2HpnCU4Hq+cwpFpWSY2upp/Kq6ppiZSUlQbrMTyWNK7 /KVvKu6diC+o77mwrMqUhGQIlX8icEijrzE5l049vq0IFIQQnxYUJfvvYSXFfws1JHTy ekjYguAZ43cKLbKLdI272ex++GwpHNB6q/E6hIca+AGFpHfwW6Nh7HHeT6+UNcgaYSX+ YXlg== X-Gm-Message-State: AOJu0YzD3+Qh8840MyRCRo+YXAExUk6njUHvPowcFiQdhDjEMonTiXDI SfU9Q6hQvIVT4oOBhZSX2iKRRvMtJE96a7mXtsQIzaXYqvHanKF2Eq/xKA== X-Google-Smtp-Source: AGHT+IHXujTtjFmsrgmG0bZzxnw5Kray7xRMnsQt5FkXvZ1aPpuawCQYzmTnlTs1BkDQ/Z/cJDRU/g== X-Received: by 2002:a05:6512:3da1:b0:52e:76f6:aa5b with SMTP id 2adb3069b0e04-52e8266640dmr5017703e87.17.1719853656281; Mon, 01 Jul 2024 10:07:36 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:35 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:09 +0300 Message-ID: <9f39081f248d8efe78b8234a9642a367a3e05827.1719853592.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 (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 | 29 +++++ 3 files changed, 142 insertions(+) create mode 100644 gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e263261986..29107a618b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,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..2cf2ceba56 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -265,6 +265,35 @@ (define-public wxwidgets-2 (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(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))) + (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) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag. + ;; + ;; See + #~(cons "--disable-glcanvasegl" #$flags))))))) + (define-public python-wxpython (package (name "python-wxpython") From patchwork Mon Jul 1 17:07: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: 65815 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 3224727BBEA; Mon, 1 Jul 2024 18:09:46 +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=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 7BA6F27BBE2 for ; Mon, 1 Jul 2024 18:09:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOKWZ-0002xn-Cw; Mon, 01 Jul 2024 13:09: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 1sOKWX-0002wO-6P for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09: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 1sOKWW-0007fY-U0 for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOKWX-0004zR-Fm for guix-patches@gnu.org; Mon, 01 Jul 2024 13:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 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: Mon, 01 Jul 2024 17:09: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: moreinfo patch To: 70880@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.171985372919093 (code B ref 70880); Mon, 01 Jul 2024 17:09:05 +0000 Received: (at 70880) by debbugs.gnu.org; 1 Jul 2024 17:08:49 +0000 Received: from localhost ([127.0.0.1]:34364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWG-0004xq-8h for submit@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:49 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:44206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOKWC-0004wP-M4 for 70880@debbugs.gnu.org; Mon, 01 Jul 2024 13:08:45 -0400 Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-52db11b1d31so4641035e87.0 for <70880@debbugs.gnu.org>; Mon, 01 Jul 2024 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719853658; x=1720458458; 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=bvDQJk7u5ehmBj8sXyXUL27Uw3Bq+9/pQq3sc41nPBY=; b=ivrnjAwO8WRJclrFPEB9nTpU3ej7WvVyjZYYSlm41L63sJIxO7mbmRH+uu+VIW4CVU TZZ2i7jd3n/NwQ1QqnqF8C8sph3YiBFXzYLGyZHSYXE1uep18MPWP5MdWRtLl1qcS4MO Y9EWBM6NF9/w9PABHEKaQKnyATC/k60LDk+X3tXVO5LEUcHQGDp5p4bqVgXjE278qddU oZXRnXWjYlLx73angjSrbYcnSbnzpVMcZTl/KTz8tPEz7iRJ1ASsbzd0zMeo6MKWYAKZ bR03YOwNQRKcwCwR7tLhnuL/VWflxjV112kctB27eYcqs9lcxKhsXzo3AaucCJYr1FMq 7gBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719853658; x=1720458458; 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=bvDQJk7u5ehmBj8sXyXUL27Uw3Bq+9/pQq3sc41nPBY=; b=I+gOmCW/Su2q96H506bwqRNunhLY4VFcUYCqu76mI9X7BMwf7GTrvZxJmfB/mKoYP/ N2ph1avsLqK7dxFV5chqgXAwbu+zOy3vo4GIR9ul6XnEprOQnzDggefvEqz1gON938um 37PsSq3RFvoReI7rmo02DcnOps9tabXFpQ6qS3anyX8Lix3m28KW0rUWPeY+WXowwAg5 rnYBGxwLL6jpErrqqg4OdPsaMS8WQJdZ2XRWQpXbu44si1A396caIjxv+0RoaQ7GCBYT 9E7q14jVZIvfyf6nR2wWMw2ttPOd4rAeAv1ILzZcNlm1PylJuflTKsc+40dYy5xwws5o jdQA== X-Gm-Message-State: AOJu0YzMLVuF70/+5SDc+hIfwFb1HvDwpNw2E2t69qIrOeEZQRpzIWUT gy4zeZcZpHZe+jTJy4wfe+77qPibZhgVFyhChfm4NI+s/fw2Y+S9xw9vDw== X-Google-Smtp-Source: AGHT+IFYt8ibqlpa4nVPR8rL4R+3K2MMyhN7pYooK1t0eMORNnZoTYP723yBOiGabueCWGiP5JjXrw== X-Received: by 2002:a05:6512:acc:b0:52c:812b:6e72 with SMTP id 2adb3069b0e04-52e8264cbf4mr4149516e87.1.1719853657342; Mon, 01 Jul 2024 10:07:37 -0700 (PDT) Received: from elephant.. ([95.79.4.1]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e7ab2793fsm1497282e87.123.2024.07.01.10.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 10:07:36 -0700 (PDT) From: "Artyom V. Poptsov" Date: Mon, 1 Jul 2024 20:07:10 +0300 Message-ID: <6ad909cee24b19c9d2e834ddbe1de8f7d8b76979.1719853592.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 (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]: 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): 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 | 53 ++++++---- .../patches/prusa-slicer-boost-fixes.patch | 97 ------------------- .../prusa-slicer-with-cereal-1.3.1.patch | 52 ---------- 4 files changed, 35 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 29107a618b..d9760557df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1839,9 +1839,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 de4b4a5825..2a3671b01d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3802,7 +3802,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) @@ -3811,13 +3811,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. @@ -3825,10 +3823,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\\)") @@ -3841,13 +3841,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 @@ -3873,9 +3886,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")