From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 21:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16270743698699 (code B ref -1); Fri, 23 Jul 2021 21:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2021 21:06:09 +0000 Received: from localhost ([127.0.0.1]:44745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mz-0002GF-Ci for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:51690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mu-0002G3-Hz for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m72Mu-0002qQ-D9 for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:04 -0400 Received: from mail.spbu.ru ([195.70.197.23]:53875 helo=cgp2.pu.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1m72Mq-0004Ce-Hs for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=l7PEzWKWn7BXxNOeU4ElVYGq6UzXh8FvAxV2yU4/yK0=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=qrlZdxiXCwUDdRGCVJHvzVaJjMnsqQmRz9mPNNDtm0EQc79lqf7gT+Oy1uiCmWlGAfdnRT4zNc qOS9L4S/+/adIiPIhtuX/vtMw87q3YM1bLjD9n7ceI0wazS1fkgSykt3uQXHZ+gXBtaEoMJ73mAVT Gl5XI7Oitf+eWMeuJgdG6gPP/PAX+P2SKsyNPrPF4HlujskJW0vO/3EG/D9Ru0vOwvevv7/HaqxwC fuOKkKU0z+NoVTDvmR3RJTva4DTT1KmcZdUwYehryuy/ddbvuy8UK82Bpndd4d5mx1gk25qTmJeEs Aa61bQ+ljfeCnkzhSCBgA50kdu1/lZmD+66YA== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173785486; Sat, 24 Jul 2021 00:05:22 +0300 From: Ivan Gankevich Date: Sat, 24 Jul 2021 00:00:39 +0300 Message-Id: <20210723210037.28150-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.70.197.23; envelope-from=i.gankevich@spbu.ru; helo=cgp2.pu.ru X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, this series of patches adds Prusa Slicer. I had to change "cereal" package definition to use cmake, otherwise "prusa-slicer" failed to find the library. Also, I added "libigl" that is a dependency of "prusa-slicer". gnu/packages/serialization.scm (cereal): Use cmake. * Replace manual build and installation with standard cmake. The main reason to do that is to get "cereal-config.cmake" file that is used to find the library in other projects. --- gnu/packages/serialization.scm | 39 ++++++++++++---------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8f292ae408..9c34da62af 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -141,32 +141,19 @@ implement RPC protocols.") "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) (build-system cmake-build-system) (arguments - `(;; The only included tests are portability tests requiring - ;; cross-compilation and boost. Since we are building cereal on more - ;; platforms anyway, there is no compelling reason to build the tests. - #:tests? #f - #:out-of-source? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (substitute* "doc/doxygen.in" - (("@CMAKE_CURRENT_BINARY_DIR@") ".") - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (with-directory-excursion "doc" - (invoke "doxygen" "doxygen.in")))) - ;; There is no "install" target, so we have to provide our own - ;; "install" phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/cereal/docs")) - (include (string-append out "/include/cereal"))) - (mkdir-p doc) - (mkdir-p include) - (copy-recursively "include/cereal" include) - (copy-recursively "doc/html" doc))))))) + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))) + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append %output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs `(("doxygen" ,doxygen))) (home-page "https://uscilab.github.io/cereal/") -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 2/3] gnu: Add libigl. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 21:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16270744818892 (code B ref 49713); Fri, 23 Jul 2021 21:08:02 +0000 Received: (at 49713) by debbugs.gnu.org; 23 Jul 2021 21:08:01 +0000 Received: from localhost ([127.0.0.1]:44757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72On-0002JI-5h for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:08:01 -0400 Received: from mail.spbu.ru ([195.70.197.23]:41319 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Ok-0002J4-D0 for 49713@debbugs.gnu.org; Fri, 23 Jul 2021 17:07:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=L3j88pCBRNgBiO7q1PICge1JZCl/QvXD3TA5U/Ih6n0=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=LrVCvvQSk+DKGszQILVaOH+fE7OHSAO+urL2SnyoX/Yp+4GfAIOW+2+nuE2Rtb/KIxETnEb3Y+ Gc4OFYeIHMdDRJPTtouv3swUMJ7Gtf7dBLPoim9qQO8BVQNHf+EJa9C09Muhl0aNXPMaURnxpTylU 1ln/CYmJbK4WrXAv+ntQyuP2quyV5cSFJduMtZQKQ8QluYzZBb6LttqY1meK5uwZMzBGHcmj+cLs/ gMZPh0oMP/IHE7XuglZKe1XigTDb0GMTsNaJ+jIBmF/tWJyBoE0WX0B1mZtkwFOkR8RrSAX5GIovf bfcTLlgt+WNBUW+x/ri8MC7iTbt5ojga/9yfw== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173785815; Sat, 24 Jul 2021 00:07:52 +0300 From: Ivan Gankevich Date: Sat, 24 Jul 2021 00:07:32 +0300 Message-Id: <20210723210731.9246-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): New variable. --- gnu/packages/engineering.scm | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fc932ddb28..eec12814ff 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2862,3 +2862,65 @@ for hooking Linux system calls in user space. This is achieved by hot-patching the machine code of the standard C library in the memory of a process.") (license license:bsd-2)))) + +(define-public libigl + (package + (name "libigl") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=OFF" ;; tests need to download test data + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_EXPORT_TARGETS=ON" + "-DLIBIGL_WITH_CGAL=ON" + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_WITH_EMBREE=OFF" + "-DLIBIGL_WITH_MATLAB=OFF" + "-DLIBIGL_WITH_MOSEK=OFF" + "-DLIBIGL_WITH_OPENGL=OFF" + "-DLIBIGL_WITH_OPENGL_GLFW=OFF" + "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF" + "-DLIBIGL_WITH_PNG=OFF" + "-DLIBIGL_WITH_TETGEN=OFF" + "-DLIBIGL_WITH_TRIANGLE=OFF" + "-DLIBIGL_WITH_PREDICATES=OFF" + "-DLIBIGL_WITH_XML=OFF") + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'do-not-download-dependencies + (lambda _ + (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))))) + (add-after 'install 'install-all-subdirs + (lambda _ + (copy-recursively + "../source/include" + (string-append (assoc-ref %outputs "out") "/include"))))))) + (inputs + `(("eigen" ,eigen) + ("cgal" ,cgal) + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("boost" ,boost))) + (home-page "https://libigl.github.io/") + (synopsis "Simple C++ geometry processing library") + (description "The library provides functionality for shape modelling, +visualization, matrix manipulation.") + (license (list license:gpl3 license:mpl2.0)))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 21:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16270745208980 (code B ref 49713); Fri, 23 Jul 2021 21:09:01 +0000 Received: (at 49713) by debbugs.gnu.org; 23 Jul 2021 21:08:40 +0000 Received: from localhost ([127.0.0.1]:44764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72PP-0002Km-Ha for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:08:39 -0400 Received: from mail.spbu.ru ([195.70.197.23]:51645 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72PN-0002KT-Ly for 49713@debbugs.gnu.org; Fri, 23 Jul 2021 17:08:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=Wu//NtjuH2edyFZFUfMMwq9wmhrcSu+wMoaNGnEIsTU=; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject :Cc:To:From; b=sOTK9qzYEuTBszHlQELTh1G2tyTaHOpby4zymEdQ05d3WADkIN5forzlsrhLZn dPH46ULe9vMzWouQFFMZn2QM5GM1BT18p6irXAHPG1MR6cbGNlJcDuTQJA7mA5I7OZtRZdvBYby+9 Tj7LQGk18HLihBMbfgc9gZkiY/yzqLyOi+ftMXOqd9JkE4Lw8nwrI7+VOxCAa5Lo1YC07BDHGNofc PaD8ON/x8RiChMOBo/YzYf5NPyAa6Y1bJioU9xS3q96R1GdyzlOQNNJ4uDNBAmGJsiJOL8baPgvJM m5d5kTKO1YgPjydrmKooh5Zp/N4GsqRrxvzHZX6ptVKniSjBg== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173785896; Sat, 24 Jul 2021 00:08:31 +0300 From: Ivan Gankevich Date: Sat, 24 Jul 2021 00:08:03 +0300 Message-Id: <20210723210801.9458-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): New variable. --- gnu/packages/engineering.scm | 97 ++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index eec12814ff..d88520a306 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Ivan Gankevich ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages libevent) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages lisp) #:use-module (gnu packages m4) @@ -2924,3 +2926,98 @@ a process.") (description "The library provides functionality for shape modelling, visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) + +(define-public prusa-slicer + (package + (name "prusa-slicer") + (version "2.3.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/prusa3d/PrusaSlicer") + (commit (string-append "version_" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_WX_STABLE=1") ;; Use wxWidgets 3.0.x.x to prevent GUI crashes. + #:phases + (modify-phases %standard-phases + ;; CMake is unable to find headers from glib, pango and gtk+ + ;; when compiling src/slic3r. Here we add them via environment variables. + (add-before 'configure 'add-glib-pango-gtk+ + (lambda _ + (use-modules + (ice-9 popen) + (ice-9 textual-ports)) + (define (append-flags name flags) + (define old-value (getenv name)) + (setenv name (if old-value (string-append old-value " " flags) flags))) + (define (pkg-config args) + (let* ((port (open-input-pipe (string-join (cons "pkg-config" args) " "))) + (content (string-trim-both (get-string-all port)))) + (close-pipe port) + content)) + (define deps '("glib-2.0" "pango" "gtk+-2.0" "hidapi-hidraw")) + (define cflags (pkg-config (cons "--cflags" deps))) + (define ld-flags (pkg-config (cons "--libs" deps))) + (define libigl (assoc-ref %build-inputs "libigl")) + (append-flags "CXXFLAGS" cflags) + (append-flags "CFLAGS" cflags) + (append-flags "LDFLAGS" ld-flags) + (append-flags "CFLAGS" (string-append "-I" libigl "/include")) + (append-flags "LDFLAGS" (string-append "-L" libigl "/lib")))) + (add-before 'configure 'unbundle-3d-party-libraries + ;; 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. + (lambda _ + (delete-file-recursively "src/hidapi") + (delete-file-recursively "src/eigen") + (delete-file-recursively "src/libigl/igl") + (substitute* "src/CMakeLists.txt" + (("add_subdirectory\\(libigl\\)" all) + (string-append + all "\ninclude_directories(libigl INTERFACE libigl::core)")) + (("add_subdirectory\\(hidapi\\)") "") + (("include_directories\\(hidapi/include\\)") "")) + ;; Do not link with bundled hidapi library. + (substitute* "src/slic3r/CMakeLists.txt" + (("\\bhidapi\\b") ""))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("libigl" ,libigl) + ("tbb" ,tbb) + ("curl" ,curl) + ("zlib" ,zlib) + ("eigen" ,eigen) + ("expat" ,expat) + ("mesa" ,mesa) + ("cereal" ,cereal) + ("nlopt" ,nlopt) + ("openvdb" ,openvdb) + ("ilmbase" ,ilmbase) + ("cgal" ,cgal) + ("hidapi" ,hidapi) + ;;("wxwidgets" ,wxwidgets-gtk2-3.1) ;; crashes when adding support enforcers + ("wxwidgets" ,wxwidgets-gtk2) + ("glew" ,glew) + ("udev" ,eudev) + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("libpng" ,libpng) + ("dbus" ,dbus) + ("glib" ,glib) + ("pango" ,pango) + ("gtk" ,gtk+-2))) + (home-page "https://www.prusa3d.com/prusaslicer/") + (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") + (description "PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into +G-code instructions for FFF printers or PNG layers for mSLA 3D printers.") + (license license:agpl3))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] Patches work, how to upstream them References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 15:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "49713@debbugs.gnu.org" <49713@debbugs.gnu.org> Reply-To: phodina Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163198042514372 (code B ref 49713); Sat, 18 Sep 2021 15:54:01 +0000 Received: (at 49713) by debbugs.gnu.org; 18 Sep 2021 15:53:45 +0000 Received: from localhost ([127.0.0.1]:36486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRcev-0003jk-EK for submit@debbugs.gnu.org; Sat, 18 Sep 2021 11:53:45 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:33067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRces-0003jV-Nj for 49713@debbugs.gnu.org; Sat, 18 Sep 2021 11:53:44 -0400 Date: Sat, 18 Sep 2021 15:53:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1631980412; bh=VlvV6J4h57Qj2iEvubYj6NR6ejytfbcxA6/qK6czzvQ=; h=Date:To:From:Reply-To:Subject:From; b=MUHWa5D15d9SzRZvyyqraUOBcKCAFchr9xsstFu6WP8My+zNj3lYTWYTPBVYtWm6C SdzR8D5ShVQ4XVAsTrKomeGRw2H/L11Zjpr3vITJrx30SvDkGimFFm0G0kbEpL/bsa lmeYJ7zIki4XdTqlA4uDHOftiEaEaBjW0NEDrDiU= From: phodina Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Ivan, the patches you created work. Is there something else neccessary to upstrea= m them? Thanks very much! Regards Petr From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ivan Gankevich , 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163198520731496 (code B ref 49713); Sat, 18 Sep 2021 17:14:02 +0000 Received: (at 49713) by debbugs.gnu.org; 18 Sep 2021 17:13:27 +0000 Received: from localhost ([127.0.0.1]:36770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdu2-0008Bw-Kq for submit@debbugs.gnu.org; Sat, 18 Sep 2021 13:13:26 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:47092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdtv-0008Bc-3W for 49713@debbugs.gnu.org; Sat, 18 Sep 2021 13:13:25 -0400 Received: by mail-wr1-f66.google.com with SMTP id x6so20528385wrv.13 for <49713@debbugs.gnu.org>; Sat, 18 Sep 2021 10:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=arAJNM/imIpfKjgmjBRR/Gh34jf66MQJxlAKLEQNEto=; b=T4vFQlP9HQlEdnDMh9VfW8Gz5j9wY6inxXBU0nhZlFwC5W8yQKUEuVOxBxH+2sNmmO 3Zpt004kXh1KrcS6rynbK5454R78Vf/VIfgB/oEdIOravmCxqW9CKVyzeA5GaAAB8h8Q mdyxDH5vk1NRBM5PYyGrvWhDFshcPw8dD3epVs181eLitHQc43hYcZ9zajQ4WvcuNJHd rZjkfTUGO3SnDK9cWi/5UUeZl5VvV1xuM/sfsm94BQcJryuUlhyG9R1ZUwzo+//HTg5c djEiYOM3QRmowZRz55gjMrt6b7iShK1MkBOnHHZGRG8Jz+toD2XKy4h5Sqc49WGC+63e 18Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=arAJNM/imIpfKjgmjBRR/Gh34jf66MQJxlAKLEQNEto=; b=e+EZV91HWuQDxB6gBkMR9404b/tBEOy+4FGLiEFks44r2ybKbC8nfm1CePCreikfLW 58yuP2qBt4wfOYx571EJZxf683391vnlzKPReXxPYO6Y/KrmCGWByoY/+F/Fh5VagOdD gWaU+smrgN75SS+lyDYtb7OxZ8txzv9Pg0MOucjZwyfHOHfEH08IHZPREPhbpbfnxYYk RBsC2n4DeUeagSBCqBqBMEUCnmS75iN8Gmw2hw1EZEzesEHbwn+niIgZIJBMaM5eHXcJ +qKWA6+l0+mCesbz/KrvUKDT9HNEtancNlmzF5Qi/eJ2Y9ahQWd9gDKOk6/29R+OydYK 1YOg== X-Gm-Message-State: AOAM532ApWiU9ZRfzV2/jz807WS/3bLVDaKBZiHh3G0r+spTqYXcuaZq l53hy5Cz/sTUjlf3NZAkFHI= X-Google-Smtp-Source: ABdhPJwQ7FT1aaF6eNgLDhQFlg3TLt++yugrgXdMExXP50ujcYSqMJ3uOXYNDsNhTnHVJe/RnLi6bA== X-Received: by 2002:a5d:688f:: with SMTP id h15mr18709954wru.410.1631985193308; Sat, 18 Sep 2021 10:13:13 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id o8sm12193595wrm.9.2021.09.18.10.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 10:13:12 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sat, 18 Sep 2021 19:13:12 +0200 In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> References: <20210723210037.28150-1-i.gankevich@spbu.ru> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Samstag, den 24.07.2021, 00:00 +0300 schrieb Ivan Gankevich: > Hello, > > this series of patches adds Prusa Slicer. I had to change "cereal" > package definition to use cmake, otherwise "prusa-slicer" failed > to find the library. Also, I added "libigl" that is a dependency > of "prusa-slicer". > > gnu/packages/serialization.scm (cereal): Use cmake. > > * Replace manual build and installation with standard cmake. > The main reason to do that is to get "cereal-config.cmake" > file that is used to find the library in other projects. > --- There are already two direct dependents of cereal. Do those still build? > > gnu/packages/serialization.scm | 39 ++++++++++++------------------ > ---- > 1 file changed, 13 insertions(+), 26 deletions(-) > > diff --git a/gnu/packages/serialization.scm > b/gnu/packages/serialization.scm > index 8f292ae408..9c34da62af 100644 > --- a/gnu/packages/serialization.scm > +++ b/gnu/packages/serialization.scm > @@ -141,32 +141,19 @@ implement RPC protocols.") > "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) > (build-system cmake-build-system) > (arguments > - `(;; The only included tests are portability tests requiring > - ;; cross-compilation and boost. Since we are building cereal > on more > - ;; platforms anyway, there is no compelling reason to build > the tests. > - #:tests? #f > - #:out-of-source? #f > - #:phases > - (modify-phases %standard-phases > - (delete 'configure) > - (replace 'build > - (lambda _ > - (substitute* "doc/doxygen.in" > - (("@CMAKE_CURRENT_BINARY_DIR@") ".") > - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) > - (with-directory-excursion "doc" > - (invoke "doxygen" "doxygen.in")))) > - ;; There is no "install" target, so we have to provide our > own > - ;; "install" phase. > - (replace 'install > - (lambda* (#:key outputs #:allow-other-keys) > - (let* ((out (assoc-ref outputs "out")) > - (doc (string-append out > "/share/cereal/docs")) > - (include (string-append out "/include/cereal"))) > - (mkdir-p doc) > - (mkdir-p include) > - (copy-recursively "include/cereal" include) > - (copy-recursively "doc/html" doc))))))) > + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") > + #:tests? #f Never ever leave #:tests? #f uncommented. > + #:phases (modify-phases %standard-phases > + (add-before 'configure 'skip-sandbox > + (lambda _ > + (substitute* "CMakeLists.txt" > + (("add_subdirectory\\(sandbox\\)") "")))) > + (add-after 'install 'install-doc > + (lambda _ > + (let ((doc (string-append %output > "/share/doc/html"))) > + (invoke "make" "doc") > + (mkdir-p doc) > + (copy-recursively "doc/html" doc))))))) > (native-inputs > `(("doxygen" ,doxygen))) > (home-page "https://uscilab.github.io/cereal/") From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 2/3] gnu: Add libigl. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ivan Gankevich , 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163198545931955 (code B ref 49713); Sat, 18 Sep 2021 17:18:02 +0000 Received: (at 49713) by debbugs.gnu.org; 18 Sep 2021 17:17:39 +0000 Received: from localhost ([127.0.0.1]:36779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdy6-0008JL-MN for submit@debbugs.gnu.org; Sat, 18 Sep 2021 13:17:38 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRdy4-0008J7-3o for 49713@debbugs.gnu.org; Sat, 18 Sep 2021 13:17:36 -0400 Received: by mail-wr1-f65.google.com with SMTP id w29so20589961wra.8 for <49713@debbugs.gnu.org>; Sat, 18 Sep 2021 10:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=ilLD9OYQXvBXO5UETE4sl5EDu9rRsS8trE3z42BquhE=; b=LbqoNX6obs6/AEjGrrOkOu0rEHgoP21cNEwCBjLxq7Zy4jt/iYhiu0oP35QJ+VvTHL LpSDrPVoTPaSPLxfFyuqbCfHYNtXrUVwEbU9+wwcAk7bElpuW4kmEUV0sdNmymA+1mx1 tpoirtDicAzHbEQ1q6xyYRhS4Ck8hBWzizFbXi6Nbc2TDFBjm4k/2FasO29n145yF8q8 ckMqrng7xToQRdM7XCi8WcuHn4R2Ix3wezj1NgFdnJwHrIGtGzQv5t/A5bMyJFOvnMzp rIyQkY3otvg7IgjtMNGVV8FVgoGn49zU5y6cWT8mr2LiyVLmMHqO7/CZ3RtHD9BvPybQ BV+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=ilLD9OYQXvBXO5UETE4sl5EDu9rRsS8trE3z42BquhE=; b=a//dIyoZv95he5jmLr4e4fJFSqMV/9lxz9nfviGExNQFW6NZexPTvrvc5Kv8m2fV6Y mJd4o6FUkB92/2wgkwIy8wcjqbMMLVqj8ssp+wYAihKr53b9JaYRF4f8visuSW9l0yUF lX8SLOGKc101j2Wir241V7/Q8n9k8fyd1Yxldv/bbcmS+VQPZlftFb0N23dFlXJZXYTE 24zQ6ro//YGXKZ86zW5zu3CCdhDKRU2KaKeJRItcyB8lsYa/VILDmpnHA7DPQaaClXMF YX3UNwmmj3BI/kMymT/84ZegZIcokvieVJgkyPGSCcQgghS/jdMTCUbf1fRWwcg1rmgI 2Qcw== X-Gm-Message-State: AOAM532yZnXqQOb06ASsUxITpCIEGn/mbGPBOd8BoYrt78U9ydSQ9xc1 Qgx+LGNuFAtE0/r8m5bEX64E3KsEhFM= X-Google-Smtp-Source: ABdhPJzuxdn7OmYG4bZNukKYav8GS7Uzvt4JMJaBzqeTKRokL1I18X4A19ReD8G8+RaxOGVJFbOjJg== X-Received: by 2002:a5d:5258:: with SMTP id k24mr19032516wrc.390.1631985450450; Sat, 18 Sep 2021 10:17:30 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k17sm15567009wmj.0.2021.09.18.10.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 10:17:30 -0700 (PDT) Message-ID: <60123c258c4a361fec28fb13fed0cde7efa09fa0.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 18 Sep 2021 19:17:29 +0200 In-Reply-To: <20210723210731.9246-1-i.gankevich@spbu.ru> References: <20210723210731.9246-1-i.gankevich@spbu.ru> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Samstag, den 24.07.2021, 00:07 +0300 schrieb Ivan Gankevich: > * gnu/packages/engineering.scm (libigl): New variable. > --- > gnu/packages/engineering.scm | 62 > ++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > > diff --git a/gnu/packages/engineering.scm > b/gnu/packages/engineering.scm > index fc932ddb28..eec12814ff 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -2862,3 +2862,65 @@ for hooking Linux system calls in user > space. This is achieved by > hot-patching the machine code of the standard C library in the > memory of > a process.") > (license license:bsd-2)))) > + > +(define-public libigl > + (package > + (name "libigl") > + (version "2.3.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/libigl") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")) > )) > + (build-system cmake-build-system) > + (arguments > + `(#:configure-flags > + (list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" > + "-DLIBIGL_BUILD_TESTS=OFF" ;; tests need to download > test data Can we provide test data as input? > + "-DLIBIGL_BUILD_TUTORIALS=OFF" > + "-DLIBIGL_EXPORT_TARGETS=ON" > + "-DLIBIGL_WITH_CGAL=ON" > + "-DLIBIGL_WITH_COMISO=OFF" > + "-DLIBIGL_WITH_CORK=OFF" > + "-DLIBIGL_WITH_EMBREE=OFF" > + "-DLIBIGL_WITH_MATLAB=OFF" > + "-DLIBIGL_WITH_MOSEK=OFF" > + "-DLIBIGL_WITH_OPENGL=OFF" > + "-DLIBIGL_WITH_OPENGL_GLFW=OFF" > + "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF" > + "-DLIBIGL_WITH_PNG=OFF" > + "-DLIBIGL_WITH_TETGEN=OFF" > + "-DLIBIGL_WITH_TRIANGLE=OFF" > + "-DLIBIGL_WITH_PREDICATES=OFF" > + "-DLIBIGL_WITH_XML=OFF") In Guix we prefer to build packages as feature-complete as possible. Obviously MATLAB won't work unless they also accept octave, but you might want to at least enable some of the low-hanging fruits such as XML or OpenGL. If it's about having a minimal package, simply provide a -minimal variant as well. > + #:tests? #f Don't leave #:tests? #f uncommented. > + #:phases > + (modify-phases %standard-phases > + (add-before 'configure 'do-not-download-dependencies > + (lambda _ > + (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))))) > + (add-after 'install 'install-all-subdirs > + (lambda _ > + (copy-recursively > + "../source/include" > + (string-append (assoc-ref %outputs "out") > "/include"))))))) > + (inputs > + `(("eigen" ,eigen) > + ("cgal" ,cgal) > + ("gmp" ,gmp) > + ("mpfr" ,mpfr) > + ("boost" ,boost))) > + (home-page "https://libigl.github.io/") > + (synopsis "Simple C++ geometry processing library") > + (description "The library provides functionality for shape > modelling, > +visualization, matrix manipulation.") s/The/This/ ? > + (license (list license:gpl3 license:mpl2.0)))) Regards From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Sep 2021 17:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ivan Gankevich , 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.1631986001335 (code B ref 49713); Sat, 18 Sep 2021 17:27:02 +0000 Received: (at 49713) by debbugs.gnu.org; 18 Sep 2021 17:26:41 +0000 Received: from localhost ([127.0.0.1]:36783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRe6q-00005K-Mm for submit@debbugs.gnu.org; Sat, 18 Sep 2021 13:26:41 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mRe6p-000052-CT for 49713@debbugs.gnu.org; Sat, 18 Sep 2021 13:26:40 -0400 Received: by mail-wr1-f66.google.com with SMTP id t8so13619695wri.1 for <49713@debbugs.gnu.org>; Sat, 18 Sep 2021 10:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=bDDhBPrwXPgDt7biVH1kSSLyLXCyC8LgI3bShZmkeWc=; b=Q0PlotUBRBoBRrY42IhSTVFzVXcrKZAwBUkgsYVeM1zbhI6fHlE+hlKmrqJvbSoJme R/p0aTFG6JmMsz4cGjy/HVr3eCFNc8Vh93QveB47EMO68h4nxrsGF9EnVvgD/2nn7BNX BqRbDPVZa3y1XYpY1f6OOCyPVm/mSkBH6IhSDcYuGiajK99mabSUy4KSYi61gSMzxheU uE4qgUM71a2vAJuAV96ppV4G+6sl7eh/QOqOsY789+/pCbz9a+IAQeFNYD6EB5mVyJOo bpDGWP+jEoIxXbWkKxLZApcqjY8gEJPojWuNmWzhi4q5u3OySsBnfrMq/l58scOsOeWY qDrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=bDDhBPrwXPgDt7biVH1kSSLyLXCyC8LgI3bShZmkeWc=; b=koy2QeB80X5qIBD+3lyKlRoopXMw3MgN2HriEIb3S8szbCv5BaAUiN/0ANZTh/IAXt oaqfgVaZuIKWqPRUHnQ1Pc2FBRYhpLrVfo03vnfrWzYQ9T1Zi8ywWpfWQk7PiaUBHOew nVmzHPEbX71z6ZMX6bNK2sMLqPIfh+fE2Q6Ib/L1asgxojK8wwZSIwQ8/tIuOK5WH2c2 q7z2ji6j+5U8xveXj4aheA4/wzMC1gCjJoYnNPJ0FFzEp6U6kIfSTCPZtKJaR5CrTy22 2GmxJ1qn61U+IoTzJOfbXBreTcp9Ry3xsA9FijydvvN/adQr0K2BJm1N/7XYQojKkgwp AlUw== X-Gm-Message-State: AOAM532XkEHFcgnspapf53tAqmNO/6RP2icCHLcKHpHrMreGFNhNdsNo Ig063Fbd7gut9rXxj9W6wOw= X-Google-Smtp-Source: ABdhPJwTrmMSP2GGfWiYFreabQPdG0rjlqJmkCC+2AHbXW2hwXk/q7CT9D8na/9NNEZjjLNyjBIbfg== X-Received: by 2002:adf:e74b:: with SMTP id c11mr19189507wrn.101.1631985993391; Sat, 18 Sep 2021 10:26:33 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k1sm10551003wrz.61.2021.09.18.10.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Sep 2021 10:26:32 -0700 (PDT) Message-ID: <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 18 Sep 2021 19:26:31 +0200 In-Reply-To: <20210723210801.9458-1-i.gankevich@spbu.ru> References: <20210723210801.9458-1-i.gankevich@spbu.ru> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Samstag, den 24.07.2021, 00:08 +0300 schrieb Ivan Gankevich: > * gnu/packages/engineering.scm (prusa-slicer): New variable. > --- > gnu/packages/engineering.scm | 97 > ++++++++++++++++++++++++++++++++++++ > 1 file changed, 97 insertions(+) > > diff --git a/gnu/packages/engineering.scm > b/gnu/packages/engineering.scm > index eec12814ff..d88520a306 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -24,6 +24,7 @@ > ;;; Copyright © 2021 qblade > ;;; Copyright © 2021 Gerd Heber > ;;; Copyright © 2021 Guillaume Le Vaillant > +;;; Copyright © 2021 Ivan Gankevich > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -95,6 +96,7 @@ > #:use-module (gnu packages image-processing) > #:use-module (gnu packages imagemagick) > #:use-module (gnu packages libevent) > + #:use-module (gnu packages libusb) > #:use-module (gnu packages linux) ;FIXME: for pcb > #:use-module (gnu packages lisp) > #:use-module (gnu packages m4) > @@ -2924,3 +2926,98 @@ a process.") > (description "The library provides functionality for shape > modelling, > visualization, matrix manipulation.") > (license (list license:gpl3 license:mpl2.0)))) > + > +(define-public prusa-slicer > + (package > + (name "prusa-slicer") > + (version "2.3.3") > + (source > + (origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://github.com/prusa3d/PrusaSlicer") > + (commit (string-append "version_" version)))) > + (file-name (git-file-name name version)) > + (sha256 (base32 > "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm")))) > + (build-system cmake-build-system) > + (arguments > + `(#:configure-flags > + '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. > + "-DSLIC3R_WX_STABLE=1") ;; Use wxWidgets 3.0.x.x to > prevent GUI crashes. > + #:phases > + (modify-phases %standard-phases > + ;; CMake is unable to find headers from glib, pango and > gtk+ > + ;; when compiling src/slic3r. Here we add them via > environment variables. > + (add-before 'configure 'add-glib-pango-gtk+ > + (lambda _ > + (use-modules > + (ice-9 popen) > + (ice-9 textual-ports)) > + (define (append-flags name flags) > + (define old-value (getenv name)) > + (setenv name (if old-value (string-append old-value > " " flags) flags))) > + (define (pkg-config args) > + (let* ((port (open-input-pipe (string-join (cons > "pkg-config" args) " "))) > + (content (string-trim-both (get-string-all > port)))) > + (close-pipe port) > + content)) > + (define deps '("glib-2.0" "pango" "gtk+-2.0" "hidapi- > hidraw")) > + (define cflags (pkg-config (cons "--cflags" deps))) > + (define ld-flags (pkg-config (cons "--libs" deps))) > + (define libigl (assoc-ref %build-inputs "libigl")) > + (append-flags "CXXFLAGS" cflags) > + (append-flags "CFLAGS" cflags) > + (append-flags "LDFLAGS" ld-flags) > + (append-flags "CFLAGS" (string-append "-I" libigl > "/include")) > + (append-flags "LDFLAGS" (string-append "-L" libigl > "/lib")))) Upstream already appears to search for GTK+3 with their CMake setup. Perhaps that's why it doesn't find GTK+2? > + (add-before 'configure 'unbundle-3d-party-libraries > + ;; 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. > + (lambda _ > + (delete-file-recursively "src/hidapi") > + (delete-file-recursively "src/eigen") > + (delete-file-recursively "src/libigl/igl") > + (substitute* "src/CMakeLists.txt" > + (("add_subdirectory\\(libigl\\)" all) > + (string-append > + all "\ninclude_directories(libigl INTERFACE > libigl::core)")) > + (("add_subdirectory\\(hidapi\\)") "") > + (("include_directories\\(hidapi/include\\)") "")) > + ;; Do not link with bundled hidapi library. > + (substitute* "src/slic3r/CMakeLists.txt" > + (("\\bhidapi\\b") ""))))))) Unbundling should be done in the snippet rather than at build time. > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("boost" ,boost) > + ("libigl" ,libigl) > + ("tbb" ,tbb) > + ("curl" ,curl) > + ("zlib" ,zlib) > + ("eigen" ,eigen) > + ("expat" ,expat) > + ("mesa" ,mesa) > + ("cereal" ,cereal) > + ("nlopt" ,nlopt) > + ("openvdb" ,openvdb) > + ("ilmbase" ,ilmbase) > + ("cgal" ,cgal) > + ("hidapi" ,hidapi) > + ;;("wxwidgets" ,wxwidgets-gtk2-3.1) ;; crashes when adding > support enforcers > + ("wxwidgets" ,wxwidgets-gtk2) > + ("glew" ,glew) > + ("udev" ,eudev) > + ("gmp" ,gmp) > + ("mpfr" ,mpfr) > + ("libpng" ,libpng) > + ("dbus" ,dbus) > + ("glib" ,glib) > + ("pango" ,pango) > + ("gtk" ,gtk+-2))) Try sorting the inputs alphabetically, also w.r.t. gtk+-2, see above. > + (home-page "https://www.prusa3d.com/prusaslicer/") > + (synopsis "G-code generator for 3D printers (RepRap, Makerbot, > Ultimaker etc.)") > + (description "PrusaSlicer takes 3D models (STL, OBJ, AMF) and > converts them into > +G-code instructions for FFF printers or PNG layers for mSLA 3D > printers.") > + (license license:agpl3))) Regards From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 1/3 v2] gnu: cereal: Use cmake to build and install the library. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 18:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163207605822759 (code B ref 49713); Sun, 19 Sep 2021 18:28:02 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 18:27:38 +0000 Received: from localhost ([127.0.0.1]:39927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS1XN-0005v0-VL for submit@debbugs.gnu.org; Sun, 19 Sep 2021 14:27:38 -0400 Received: from mail.spbu.ru ([195.70.197.23]:43374 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS1XK-0005uj-GE for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 14:27:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=E7HgJdZXi97A/F9kh7Qu8ZSJ7pgyl4+uB9lsxmBkD4I=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=rNlWX5f7pDdTW7oaHBcsLdJOGNTs10MRAE6GOVrLW+ryVVUBX+pL7aLbwgURRdpQ22/yhrYYTJ /TnednPQS+JZfZxtEnvixnHFeOcFBYIeIUdZ0ikMuivXpagzvSGqi6n6OPV5Jkl3J/0w2ujro49RM AfbCZNwroZjfXoLGI0CCMO1BjJTR/QeNI59UQeUb+eyszCMFy598rHsDPys05R4kDrQ8aJuN/F9Zc gRgOZRPrPKLjPb41UtB4zVVkfetCfsV/lwNKeGGWmC+Use403/iX5+19lUDlZgS+pG5E/D4VbAP8y CB+8ATYmsIj1v3ye4Q5mJCQaVYGZsZw4nAhbg== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186719382; Sun, 19 Sep 2021 21:27:26 +0300 From: Ivan Gankevich Date: Sun, 19 Sep 2021 21:26:47 +0300 Message-Id: <20210919182646.20188-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/serialization.scm (cereal): Use cmake to build and install the library. --- gnu/packages/serialization.scm | 38 +++++++++++----------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0e79b7c89c..3263805c68 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -142,32 +142,18 @@ implement RPC protocols.") "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) (build-system cmake-build-system) (arguments - `(;; The only included tests are portability tests requiring - ;; cross-compilation and boost. Since we are building cereal on more - ;; platforms anyway, there is no compelling reason to build the tests. - #:tests? #f - #:out-of-source? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (substitute* "doc/doxygen.in" - (("@CMAKE_CURRENT_BINARY_DIR@") ".") - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (with-directory-excursion "doc" - (invoke "doxygen" "doxygen.in")))) - ;; There is no "install" target, so we have to provide our own - ;; "install" phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/cereal/docs")) - (include (string-append out "/include/cereal"))) - (mkdir-p doc) - (mkdir-p include) - (copy-recursively "include/cereal" include) - (copy-recursively "doc/html" doc))))))) + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") + #:phases (modify-phases %standard-phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))) + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append %output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs `(("doxygen" ,doxygen))) (home-page "https://uscilab.github.io/cereal/") -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 18:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163207608722828 (code B ref 49713); Sun, 19 Sep 2021 18:29:01 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 18:28:07 +0000 Received: from localhost ([127.0.0.1]:39932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS1Xr-0005w8-Au for submit@debbugs.gnu.org; Sun, 19 Sep 2021 14:28:07 -0400 Received: from mail.spbu.ru ([195.70.197.23]:55391 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS1Xo-0005vW-U0 for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 14:28:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=J7UMCYbekRHcxt/cYCLSlaF9M2frda6qX8yxuEkD6Fs=; h=In-Reply-To:Content-Transfer-Encoding:Content-Disposition:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; b=kMXL+TWS5lXcXvf 93wEQdtjwn0W2H6tUVMpvvEO8X9hw5SeFjHL/HlTz3l64SyVejofJRICGhdhpB7QnrjjOa/SBAwD5 qGbVa04la1xBD4zWjsNYMOsRG4hKORl+XwVSTiGNbaky5KoHDDOY5vh1eV/+5zNYtblqDPykP7biy DL2NpwN7NaACNZVjCcB+qiAjmZpn4cgZVpdQCGpjKg4I6C474v0FMHnHXMyQKiWkvLf3g1PgTqqSi bFqq1gjXQsvMhaByxMiJKss3Z7XbCKfT0ELK9lnWc/I5C/NVXA+4CnvMHK6CmRfIATZH06KUloRSR lFb5jyURrWgA7cGLfNQ== Received: from [91.122.31.171] (account st018947@spbu.ru HELO localhost) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186719452; Sun, 19 Sep 2021 21:27:58 +0300 Date: Sun, 19 Sep 2021 21:27:58 +0300 From: Ivan Gankevich Message-ID: References: <20210723210037.28150-1-i.gankevich@spbu.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >There are already two direct dependents of cereal. Do those still >build? Hello. I’ve successfully built “salmon” and “seqan” with this patch. >Never ever leave #:tests? #f uncommented. Removed this line. The tests work fine. I’ve submitted new version of this patch with tests. Thanks for the corrections! Regards, Ivan From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 2/3 v2] gnu: Add libigl. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 20:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163208274217308 (code B ref 49713); Sun, 19 Sep 2021 20:20:01 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 20:19:02 +0000 Received: from localhost ([127.0.0.1]:40045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3HB-0004V6-TY for submit@debbugs.gnu.org; Sun, 19 Sep 2021 16:19:02 -0400 Received: from mail.spbu.ru ([195.70.197.23]:44861 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3H8-0004UW-NF for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 16:19:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=tz4grjFihi0X5B/VTU2Izc/i1Rp4Gye/dMQMjRQGFgg=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=CaISzP+qiJOshgoMVBFh14ZHtpDp9B391vAgAFew6DlzSjVdse0JinN3mJzLcH/R4mwOcX96y4 OacKSaWHLprAFTgNzYrmHyLYNO000m8brdxunDUUWqm6SBwW6XxnG6pe9kKpRT7vS1vnABImr8udu 4n4xLctgSi/xh8EhMOK9cM1iaN6iw/3Dh9ol2/UawfumeQm+B6028V7YrCENarq+XX8YCsbs9IWzm W29h/U0rhDNBRI7N48Glt7XVhpeggfXkopQ8X5Y3AycFWXAE2MKn9nWDiHT2tSlJC1PRTPZzq/LYM +R6GA9cghC5FG8QUFXEZAjUnxMFJdv/gitudA== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186734929; Sun, 19 Sep 2021 23:18:50 +0300 From: Ivan Gankevich Date: Sun, 19 Sep 2021 23:18:32 +0300 Message-Id: <20210919201831.30414-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): New variable. --- gnu/packages/engineering.scm | 88 ++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 46622f3a1f..2c22cc3278 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2863,3 +2863,91 @@ for hooking Linux system calls in user space. This is achieved by hot-patching the machine code of the standard C library in the memory of a process.") (license license:bsd-2)))) + +(define-public libigl + (package + (name "libigl") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_EXPORT_TARGETS=ON" + "-DLIBIGL_WITH_CGAL=ON" + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_WITH_EMBREE=OFF" + "-DLIBIGL_WITH_MATLAB=OFF" + "-DLIBIGL_WITH_MOSEK=OFF" + "-DLIBIGL_WITH_OPENGL=OFF" + "-DLIBIGL_WITH_OPENGL_GLFW=OFF" + "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF" + "-DLIBIGL_WITH_PNG=OFF" + "-DLIBIGL_WITH_TETGEN=OFF" + "-DLIBIGL_WITH_TRIANGLE=OFF" + "-DLIBIGL_WITH_PREDICATES=OFF" + "-DLIBIGL_WITH_XML=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'do-not-download-dependencies + (lambda _ + (setenv "HOME" (getcwd)) ;; cmake needs this to export modules + (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)")) + ) + (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\\)") "")))) + (add-after 'install 'install-all-subdirs + (lambda _ + (copy-recursively + "../source/include" + (string-append (assoc-ref %outputs "out") "/include"))))))) + (inputs + `(("eigen" ,eigen) + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("boost" ,boost))) + (native-inputs + `(("cgal" ,cgal) + ("tinyxml2" ,tinyxml2) + ("catch2" ,catch-framework2) + ("libigl-test-data" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-tests-data") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) + (file-name (git-file-name "libigl-test-data" version)) + (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))))) + (home-page "https://libigl.github.io/") + (synopsis "Simple C++ geometry processing library") + (description "This library provides functionality for shape modelling, +visualization, matrix manipulation.") + (license (list license:gpl3 license:mpl2.0)))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 2/3] gnu: Add libigl. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 20:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163208274617324 (code B ref 49713); Sun, 19 Sep 2021 20:20:01 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 20:19:06 +0000 Received: from localhost ([127.0.0.1]:40049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3HF-0004VM-F6 for submit@debbugs.gnu.org; Sun, 19 Sep 2021 16:19:05 -0400 Received: from mail.spbu.ru ([195.70.197.23]:44861 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS3HB-0004UW-7x for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 16:19:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=qJ+VddGlatL8TSAcrd++ci0r0Li+dbQY7oA61yS4hYE=; h=In-Reply-To:Content-Transfer-Encoding:Content-Disposition:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; b=ZxlRY83TuqQpD7K p7awuYHQKXUI+I/ojXalvBu061wqK5xqSkcPvm2u0hIxFrsSZ9neAAyWOpWA+DM4xaj+WSyq25P4q 6Rs9iX3kHecFwOsYCQ1kZrzmvpGnU26uPrdi64kwulLLZ5//fBsluGuqwIu1p2bBMmNZef7ms7sis MhBS9NR6gAqOeQXZaGUtBDonMzI4w6PBpNrFmeGAtGmMn/45DjloJoTpav6dIHluoZmLpWOxYDCyW JkoVUKFk8v1gQRYphcuLMVFWjVBTcUyna+EzRSQZp7AEwvh3VfcD+zRQqzo9aWZlgCNdqDCmTKya7 GC77a7s9v4v2maYcKGg== Received: from [91.122.31.171] (account st018947@spbu.ru HELO localhost) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186734934; Sun, 19 Sep 2021 23:18:54 +0300 Date: Sun, 19 Sep 2021 23:18:54 +0300 From: Ivan Gankevich Message-ID: References: <20210723210731.9246-1-i.gankevich@spbu.ru> <60123c258c4a361fec28fb13fed0cde7efa09fa0.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <60123c258c4a361fec28fb13fed0cde7efa09fa0.camel@gmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >Can we provide test data as input? I’ve added test data and enabled tests. >> + "-DLIBIGL_BUILD_TUTORIALS=OFF" >> + "-DLIBIGL_EXPORT_TARGETS=ON" >> + "-DLIBIGL_WITH_CGAL=ON" >> + "-DLIBIGL_WITH_COMISO=OFF" >> + "-DLIBIGL_WITH_CORK=OFF" >> + "-DLIBIGL_WITH_EMBREE=OFF" >> + "-DLIBIGL_WITH_MATLAB=OFF" >> + "-DLIBIGL_WITH_MOSEK=OFF" >> + "-DLIBIGL_WITH_OPENGL=OFF" >> + "-DLIBIGL_WITH_OPENGL_GLFW=OFF" >> + "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF" >> + "-DLIBIGL_WITH_PNG=OFF" >> + "-DLIBIGL_WITH_TETGEN=OFF" >> + "-DLIBIGL_WITH_TRIANGLE=OFF" >> + "-DLIBIGL_WITH_PREDICATES=OFF" >> + "-DLIBIGL_WITH_XML=OFF") >In Guix we prefer to build packages as feature-complete as possible. >Obviously MATLAB won't work unless they also accept octave, but you >might want to at least enable some of the low-hanging fruits such as >XML or OpenGL. If it's about having a minimal package, simply provide >a -minimal variant as well. This library is header-only. All the dependencies from this list are used in the tests. Headers that use these dependencies are installed no matter which dependenies are “ON” in this list. I’ve added XML. Adding other dependencies would require rewriting most of “cmake/libigl.cmake” file, because the authors of the package like to download and build all the dependencies manually. >> + #:tests? #f >Don't leave #:tests? #f uncommented. Enabled tests. >> + (description "The library provides functionality for shape >> modelling, >> +visualization, matrix manipulation.") >s/The/This/ ? Fixed! Thanks for your corrections. I’ve sent the updated version of this patch via “git send-email”. Regards, Ivan From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3 v2] gnu: Add prusa-slicer. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 21:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16320875839075 (code B ref 49713); Sun, 19 Sep 2021 21:40:01 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 21:39:43 +0000 Received: from localhost ([127.0.0.1]:40161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XG-0002ME-JP for submit@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:43 -0400 Received: from mail.spbu.ru ([195.70.197.23]:35692 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XD-0002Lx-7q for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=oUBSh4FMzC6GFm+BlEbWEKyAWPSEHdkaURXevaIIYfw=; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject :Cc:To:From; b=r4+ODasrZcGEo6Zllr8TEAq/adlC0y4DiQkt94EbGiL1RDS/EkqHuFNUyXJjmv 3MTN5QrbIZF4O/ZqrAhIBNmmxfArzXGHNuPXIn+ACAYyrS75w73BmXqBire4xPQWtjP3Fls9l2kO+ Y9wul4U5gKsuDcoZddc3I1k1V4LuTYPSnvGyQTDbRat7RrLA38GzL/+n9ZFoCPWHIoas7MS33h45y +Ouxi+nOm7RFrr6UnA5wKdXu0ulAAfWmlQn9t0X+Tkwn4Vr5h836XXSU8km1LW9LKPx4mbxi80MBy Z6LJqjfL6/Fo2bOXE0VxgTGpUTnw1YliXVDWYZHbm/F7HT42g== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186751375; Mon, 20 Sep 2021 00:39:31 +0300 From: Ivan Gankevich Date: Mon, 20 Sep 2021 00:38:40 +0300 Message-Id: <20210919213838.2343-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): New variable. --- gnu/packages/engineering.scm | 83 ++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2c22cc3278..3f7d087269 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Ivan Gankevich ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages libevent) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages lisp) #:use-module (gnu packages m4) @@ -2951,3 +2953,84 @@ a process.") (description "This library provides functionality for shape modelling, visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) + +(define-public prusa-slicer + (package + (name "prusa-slicer") + (version "2.3.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/prusa3d/PrusaSlicer") + (commit (string-append "version_" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled libraries that were not modified by Prusa Slicer developers. + (delete-file-recursively "src/hidapi") + (delete-file-recursively "src/eigen") + (delete-file-recursively "src/libigl/igl"))))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + "-DSLIC3R_WX_STABLE=1") ;; Use wxWidgets 3.0.x.x to prevent GUI crashes. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'unbundle-3d-party-libraries + ;; 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. + (lambda _ + (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\\)") + "include_directories()")) + ;; Do not link with bundled hidapi library. + (substitute* "src/slic3r/CMakeLists.txt" + (("add_library\\(libslic3r_gui.*" all) + (string-append + all + "\ntarget_include_directories(libslic3r_gui PUBLIC ${HIDAPI_INCLUDE_DIRS})\n")) + (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}"))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("cereal" ,cereal) + ("cgal" ,cgal) + ("curl" ,curl) + ("dbus" ,dbus) + ("eigen" ,eigen) + ("expat" ,expat) + ("glew" ,glew) + ("glib" ,glib) + ("gmp" ,gmp) + ("gtk" ,gtk+) + ("hidapi" ,hidapi) + ("ilmbase" ,ilmbase) + ("libigl" ,libigl) + ("libpng" ,libpng) + ("mesa" ,mesa) + ("mpfr" ,mpfr) + ("nlopt" ,nlopt) + ("openvdb" ,openvdb) + ("pango" ,pango) + ("tbb" ,tbb) + ("udev" ,eudev) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib))) + (home-page "https://www.prusa3d.com/prusaslicer/") + (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") + (description "PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into +G-code instructions for FFF printers or PNG layers for mSLA 3D printers.") + (license license:agpl3))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 21:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16320875869086 (code B ref 49713); Sun, 19 Sep 2021 21:40:02 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 21:39:46 +0000 Received: from localhost ([127.0.0.1]:40163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XK-0002MU-2r for submit@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:46 -0400 Received: from mail.spbu.ru ([195.70.197.23]:35692 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4XF-0002Lx-Qo for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 17:39:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=lymUxuD384bZRxKbqlpb6oZ/Yn60DOTB+D6FLImlxYk=; h=In-Reply-To:Content-Transfer-Encoding:Content-Disposition:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; b=wBr7v0DEsQQitlM vrWug+14QtepumNDyRXTmFL449q84LFm1Gl+oqvvhlga1nxNuNo4oMqKj3LZifhbHSZEBb61rzw9p jKuaviKSSuhmDe7cXHBPKoLqL3WKrL7yd0n/UNKiYQ+E7eRus2YLdnf402d4w5W7/0ZrsNT7hMXgM dfnWyG6fnCQlsz1EGxXkkS+802bDCPV/gtr5EqY8CyQmUidNcinvf9MwBLNVWWa1rXTaMYrfdGIlU lpk3gaA/DqxADWwYuzSeFJApGD/742AqEC5MxLuOhSetBwt3zBz2MZPkKrZzRuEDc+4JzgAgDWysw SVEt5cWVp4+ztZ9xtaA== Received: from [91.122.31.171] (account st018947@spbu.ru HELO localhost) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 186751377; Mon, 20 Sep 2021 00:39:36 +0300 Date: Mon, 20 Sep 2021 00:39:36 +0300 From: Ivan Gankevich Message-ID: References: <20210723210801.9458-1-i.gankevich@spbu.ru> <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >> + ;; CMake is unable to find headers from glib, pango and >> gtk+ >> + ;; when compiling src/slic3r. Here we add them via >> environment variables. >> + (add-before 'configure 'add-glib-pango-gtk+ >Upstream already appears to search for GTK+3 with their CMake setup. >Perhaps that's why it doesn't find GTK+2? I changed GTK+2 to GTK+3 and removed the whole “add-glib-pango-gtk+” phase. >> + (add-before 'configure 'unbundle-3d-party-libraries >> + ;; 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. >> + (lambda _ >> + (delete-file-recursively "src/hidapi") >> + (delete-file-recursively "src/eigen") >> + (delete-file-recursively "src/libigl/igl") >> + (substitute* "src/CMakeLists.txt" >> + (("add_subdirectory\\(libigl\\)" all) >> + (string-append >> + all "\ninclude_directories(libigl INTERFACE >> libigl::core)")) >> + (("add_subdirectory\\(hidapi\\)") "") >> + (("include_directories\\(hidapi/include\\)") "")) >> + ;; Do not link with bundled hidapi library. >> + (substitute* "src/slic3r/CMakeLists.txt" >> + (("\\bhidapi\\b") ""))))))) >Unbundling should be done in the snippet rather than at build time. Moved deletion of directories to the snippet. >Try sorting the inputs alphabetically, also w.r.t. gtk+-2, see above. Now its is sorted and no more GTK+2. Thanks for your corrections. I’ve sent the updated version of this patch via “git send-email”. Regards, Ivan From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 21:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ivan Gankevich Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.163208840510379 (code B ref 49713); Sun, 19 Sep 2021 21:54:01 +0000 Received: (at 49713) by debbugs.gnu.org; 19 Sep 2021 21:53:25 +0000 Received: from localhost ([127.0.0.1]:40168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4kX-0002hL-G7 for submit@debbugs.gnu.org; Sun, 19 Sep 2021 17:53:25 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:38414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS4kV-0002h7-80 for 49713@debbugs.gnu.org; Sun, 19 Sep 2021 17:53:24 -0400 Received: by mail-wm1-f44.google.com with SMTP id j134-20020a1c238c000000b0030b32367649so7765041wmj.3 for <49713@debbugs.gnu.org>; Sun, 19 Sep 2021 14:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=egU/5xa24Pl3Q3F8WdhczaSakYM0gh+jnzKsspTfCPI=; b=F/NSwwL5yDYmNp9e0+yAO2t1SjUz4Ajj7a98Ca7dVusiExL2qc/6V+nTV73zy8Fq+S DWY0YRuVjNyC2XfofhsH8eJrE3H3B3P83LsV3o5qpL7wMh2ln1oBvo3tmJsXeIZLMYcZ BsPVZiBFkYnYOgpcj5DsWfNZnWVt4HxK4PFgIjI7jfFiMIdrvmaWVoQYVrRXGwuXZsSx 75NYjDABbniRUPttVc8Rua+8rpOXHdugutnpktkVjY7rghOIkQ2CiYNaq/foY4wk+27z D6thbPjRDlP6fZW1jnbC2dnNqkRvag/FLDfXgVwn4Yg+iSgpgczpZuOwNdlN2eFoy3qD 553w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=egU/5xa24Pl3Q3F8WdhczaSakYM0gh+jnzKsspTfCPI=; b=iibEhD2DlcPH0Lzf3rIbkC0FsaRG8q4EGqj0X9Ob+O0o6pSnL1xN+MDwWSx/Nl70Uy MjOewGMLSe3AfPB02IaN8v7RfihVP3wqO6ZAY5ZxLOzQ5LMzjSyXkgBZ7xOfSLOQfiW9 cXeyRW5Ag980uS6Tyhe0qsSwKBJ3frnPewi158n/0MZdEdLnD/PnG5ySVJqlTNQnn2YO pF2x5WEgxmNDuK2hl/AM6cVNkPQqCUXWvbdjPW4sfm5FCfD9KmIWVsp5HKucWsMDVfSz sc3+TgltjBOOapFwWm4GQpZa7VME291+OpewoZz6g5uALvwxkiYKd9Mi70+c+mE+yiKN ak5w== X-Gm-Message-State: AOAM530V97KVx2U8P+r9HyaZZx67xsO/A+N0r7/SJaFZ/8TdgfOnVl+b mrkhky0ah+oCYB3KiOUSubcyfcXqOeQ= X-Google-Smtp-Source: ABdhPJynJp9bPDfeLOohFazLP7XKB+pt39en7pEHcc0TDofvEJFUMSB23Gtj5fN3dFgrnc4k1obQnQ== X-Received: by 2002:a1c:f00a:: with SMTP id a10mr20940372wmb.112.1632088397259; Sun, 19 Sep 2021 14:53:17 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u13sm14009423wrt.41.2021.09.19.14.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Sep 2021 14:53:16 -0700 (PDT) Message-ID: <55e4a71f3756689728238b05fd063662f79ca3d7.camel@gmail.com> From: Liliana Marie Prikler Date: Sun, 19 Sep 2021 23:53:15 +0200 In-Reply-To: References: <20210723210801.9458-1-i.gankevich@spbu.ru> <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, den 20.09.2021, 00:39 +0300 schrieb Ivan Gankevich: > > Unbundling should be done in the snippet rather than at build time. > > Moved deletion of directories to the snippet. I'd argue that fixing the CMakeLists also falls into snippet territory, as it's directly related to unbundling. Am Sonntag, den 19.09.2021, 23:18 +0300 schrieb Ivan Gankevich: > This library is header-only. All the dependencies from this list are > used in the tests. Headers that use these dependencies are installed > no matter which dependenies are “ON” in this list. I’ve added XML. > Adding other dependencies would require rewriting most of > “cmake/libigl.cmake” file, because the authors of the package like to > download and build all the dependencies manually. Could this be done with substitute* as for the other packages? If not, we should group those options under a sufficiently explanatory comment. Also, there's little need to explicitly enable things that would already be enabled by default, let's keep the list of flags small and understandable :) When you send v3, please do all patches in one go and also specify -- reroll-count, as that's easier on mumi. Thanks From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH v3 1/3] gnu: cereal: Use cmake to build and install the library. References: <20210723210037.28150-1-i.gankevich@spbu.ru> In-Reply-To: <20210723210037.28150-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 22:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16321761941499 (code B ref 49713); Mon, 20 Sep 2021 22:17:01 +0000 Received: (at 49713) by debbugs.gnu.org; 20 Sep 2021 22:16:34 +0000 Received: from localhost ([127.0.0.1]:44211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRaU-0000O7-8N for submit@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:34 -0400 Received: from mail.spbu.ru ([195.70.197.23]:37579 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRaQ-0000Nm-WA for 49713@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=E7HgJdZXi97A/F9kh7Qu8ZSJ7pgyl4+uB9lsxmBkD4I=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=YJqklWLd9QHCxifGoJi04TEpCrsuL4ZVaUQElzfy85VWvvE9JyIW/zujHZI+Rj2QOieTozmfV6 qoSnIxminhVvvmPz4Txo6XfE4G398tTkZc55ZFsZd67x2KUl45bRkyBzmqmtNnFjhhPPxDhfIAtKF eeKiBmPcmOb0xf0EURD04j7KytrhzXdP9reRJ8d5P9lIRZ2FzcbeLBAMyRbjCatkD8nvwCFKQgEHS dAMqNK5kpKqEcrbwPfT7ad6L/+w9IHhhMHLK1OXdnqfwqrW6DnAk949/eGBW+G61mgEwWZo3IkA4C R1kw6j0b3VPby4mZv4+2inBe8se0v/Pm7b01A== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 187015456; Tue, 21 Sep 2021 01:16:23 +0300 From: Ivan Gankevich Date: Tue, 21 Sep 2021 01:15:48 +0300 Message-Id: <20210920221549.14678-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/serialization.scm (cereal): Use cmake to build and install the library. --- gnu/packages/serialization.scm | 38 +++++++++++----------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 0e79b7c89c..3263805c68 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -142,32 +142,18 @@ implement RPC protocols.") "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) (build-system cmake-build-system) (arguments - `(;; The only included tests are portability tests requiring - ;; cross-compilation and boost. Since we are building cereal on more - ;; platforms anyway, there is no compelling reason to build the tests. - #:tests? #f - #:out-of-source? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (substitute* "doc/doxygen.in" - (("@CMAKE_CURRENT_BINARY_DIR@") ".") - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (with-directory-excursion "doc" - (invoke "doxygen" "doxygen.in")))) - ;; There is no "install" target, so we have to provide our own - ;; "install" phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/cereal/docs")) - (include (string-append out "/include/cereal"))) - (mkdir-p doc) - (mkdir-p include) - (copy-recursively "include/cereal" include) - (copy-recursively "doc/html" doc))))))) + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") + #:phases (modify-phases %standard-phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))) + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append %output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs `(("doxygen" ,doxygen))) (home-page "https://uscilab.github.io/cereal/") -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH v3 2/3] gnu: Add libigl. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16321761981516 (code B ref 49713); Mon, 20 Sep 2021 22:17:02 +0000 Received: (at 49713) by debbugs.gnu.org; 20 Sep 2021 22:16:38 +0000 Received: from localhost ([127.0.0.1]:44213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRaX-0000OO-JM for submit@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:38 -0400 Received: from mail.spbu.ru ([195.70.197.23]:37579 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRaT-0000Nm-85 for 49713@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=rEFJpC7eyIxVEIzTrgb6BvigTx1tD6zMD6JqPMmoM9I=; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From; b=jCpz4sp51gjgcBy5oT7BTjzbT9ZS9KXkjysCvy1qJIlImgBu/L 8QNBJMAzdgrpXQQbM3TocirY/sOdRzmqyAECaFyhfYtN86C+aWT+PqIYM4UHxQim7Wu1taHS6pOK/ lKpFQXZaNyvzFSrXqBajRIu/2z4XxE1Kws63wKg4Y5Jf1FNT8159l2p367sEMHyWl2CnBVW7DTRDZ F0cPnfTcJBjb7lPDDWlLqS9rvgoe17LZcZjdJLw6uyPXuCVgAnztvlFju8Ebd+E0dprsFVStK2vwk NzS0VXwETH1L2YrMDPShZ2nnHTGy3h+Qesy/0RzNppslWShGWdjhXhjQofp9Q== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 187015477; Tue, 21 Sep 2021 01:16:31 +0300 From: Ivan Gankevich Date: Tue, 21 Sep 2021 01:15:50 +0300 Message-Id: <20210920221549.14678-2-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210920221549.14678-1-i.gankevich@spbu.ru> References: <20210920221549.14678-1-i.gankevich@spbu.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (libigl): New variable. --- gnu/packages/engineering.scm | 139 +++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 46622f3a1f..421a10292a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2863,3 +2863,142 @@ for hooking Linux system calls in user space. This is achieved by hot-patching the machine code of the standard C library in the memory of a process.") (license license:bsd-2)))) + +(define-public libigl + (package + (name "libigl") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-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") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'do-not-download-dependencies + (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") + (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\\)") "")))) + (add-after 'install 'install-all-subdirs + (lambda _ + (copy-recursively + "../source/include" + (string-append (assoc-ref %outputs "out") "/include"))))))) + (inputs + `(("eigen" ,eigen) + ("gmp" ,gmp) + ("mpfr" ,mpfr) + ("boost" ,boost))) + (native-inputs + `(("catch2" ,catch-framework2) + ("cgal" ,cgal) + ("embree" ,embree) + ("mesa" ,mesa) + ("glfw" ,glfw) + ("tinyxml2" ,tinyxml2) + ("libigl-test-data" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-tests-data") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) + (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") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ("libigl-stb" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-stb.git") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "cd0fa3fcd90325c83be4d697b00214e029f94ca3"))) + (file-name (git-file-name "libigl-stb" version)) + (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) + ("libigl-tetgen" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))) + ("libigl-predicates" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + ;; This commit should be updated for each version + ;; from "cmake/LibiglDownloadExternal.cmake". + (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))))) + (home-page "https://libigl.github.io/") + (synopsis "Simple C++ geometry processing library") + (description "This library provides functionality for shape modelling, +visualization, matrix manipulation.") + (license (list license:gpl3 license:mpl2.0)))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH v3 3/3] gnu: Add prusa-slicer. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49713@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16321762071543 (code B ref 49713); Mon, 20 Sep 2021 22:17:02 +0000 Received: (at 49713) by debbugs.gnu.org; 20 Sep 2021 22:16:47 +0000 Received: from localhost ([127.0.0.1]:44217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRah-0000Oo-36 for submit@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:47 -0400 Received: from mail.spbu.ru ([195.70.197.23]:45067 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRae-0000OW-O0 for 49713@debbugs.gnu.org; Mon, 20 Sep 2021 18:16:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=wZyZepfSVGN3/EMic1ljSdCJCGrfdIEGvk22vbYn/gw=; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From; b=G0dRRQlBjsoYFRGiC3EtbJnc8lfSNm371rd8Y9h be07gvtxcv7P2SKzHVY6+6csUegZTN2LH0W16Wh3HQudkoBLE82E2nZZEfRQmhAlkR18n8kDKKB4O 6KHUuPsYqknXl70c7QJRnZbZ+9EsbVNTFnFAPRDE6P4I1jJA2SmTtCR54xajQ+TziTwhgkVUhfy+W t903rQ7zeaS5BI/YYCs1QL8axk+uaP7TqcWj4SKWNLpOs2tIzmPW3uEpCsW5MrVE5DLsfnCQN1yQ5 JUepZAZkE0wL0ntNf4RaCCecBuLZcGz8h2o1VM1Z6NKVkGEXTgO7kaYfP8Sa8GNZXwiYqtUg== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 187015493; Tue, 21 Sep 2021 01:16:38 +0300 From: Ivan Gankevich Date: Tue, 21 Sep 2021 01:15:52 +0300 Message-Id: <20210920221549.14678-3-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210920221549.14678-1-i.gankevich@spbu.ru> References: <20210920221549.14678-1-i.gankevich@spbu.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/engineering.scm (prusa-slicer): New variable. --- gnu/packages/engineering.scm | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 421a10292a..c4183c0c71 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Ivan Gankevich ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages libevent) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages lisp) #:use-module (gnu packages m4) @@ -3002,3 +3004,80 @@ a process.") (description "This library provides functionality for shape modelling, visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) + +(define-public prusa-slicer + (package + (name "prusa-slicer") + (version "2.3.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/prusa3d/PrusaSlicer") + (commit (string-append "version_" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0w0synqi3iz9aigsgv6x1c6sg123fasbx19h4w3ic1l48r8qmpwm")) + (modules '((guix build utils))) + (snippet + '(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. + ;; Remove bundled libraries that were not modified by Prusa Slicer developers. + (delete-file-recursively "src/hidapi") + (delete-file-recursively "src/eigen") + (delete-file-recursively "src/libigl/igl") + (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\\)") + "include_directories()")) + (substitute* "src/slic3r/CMakeLists.txt" + (("add_library\\(libslic3r_gui.*" all) + (string-append + all + "\ntarget_include_directories(libslic3r_gui PUBLIC ${HIDAPI_INCLUDE_DIRS})\n")) + (("\\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"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("cereal" ,cereal) + ("cgal" ,cgal) + ("curl" ,curl) + ("dbus" ,dbus) + ("eigen" ,eigen) + ("expat" ,expat) + ("glew" ,glew) + ("glib" ,glib) + ("gmp" ,gmp) + ("gtk" ,gtk+) + ("hidapi" ,hidapi) + ("ilmbase" ,ilmbase) + ("libigl" ,libigl) + ("libpng" ,libpng) + ("mesa" ,mesa) + ("mpfr" ,mpfr) + ("nlopt" ,nlopt) + ("openvdb" ,openvdb) + ("pango" ,pango) + ("tbb" ,tbb) + ("udev" ,eudev) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib))) + (home-page "https://www.prusa3d.com/prusaslicer/") + (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") + (description "PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into +G-code instructions for FFF printers or PNG layers for mSLA 3D printers.") + (license license:agpl3))) -- 2.32.0 From unknown Sat Aug 16 14:31:52 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49713] [PATCH 3/3] gnu: Add prusa-slicer. Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Sep 2021 22:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49713 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 49713@debbugs.gnu.org Received: via spool by 49713-submit@debbugs.gnu.org id=B49713.16321762751725 (code B ref 49713); Mon, 20 Sep 2021 22:18:02 +0000 Received: (at 49713) by debbugs.gnu.org; 20 Sep 2021 22:17:55 +0000 Received: from localhost ([127.0.0.1]:44228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRbm-0000Ri-Pm for submit@debbugs.gnu.org; Mon, 20 Sep 2021 18:17:54 -0400 Received: from mail.spbu.ru ([195.70.197.23]:44208 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSRbl-0000RL-84 for 49713@debbugs.gnu.org; Mon, 20 Sep 2021 18:17:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=ppb1ksZ2G+QT23sSWujnuLOaUhF4gSvFSvkSH+Z0k2c=; h=In-Reply-To:Content-Transfer-Encoding:Content-Disposition:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; b=OAp+E4YNUrM4HeM kjCPwPwdGL/O8fd+Aqk1GwUwNGMhGuO3k+ulKmid74bsfzp1IaF6lF9ww23DiyAmLcQ+iAHlwmkWl zX8B2ooWjTznFb2PrM7yw1+7X4HfSOQWcup/18cDJgxBsXZKM9Yn1LAA6pITgAdwZwkdXwK4KgA8a eZ4+PvrIzQjUq2yf4i7aOOFxdqOgF2wcXRwa6cbZ4wxHXdc7tUNIGy6C4Vdv6+d4LYVG9Rswqm/Q7 yoGm71eEiv3wCV+4sWeufrs+w5J2zAt6KRMHJuC5Kwo66G40xtUDoGKEgYvOH+vjTxSIzKeDPN81G nMPgof08E4XxyuZLbZw== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 187015639; Tue, 21 Sep 2021 01:17:47 +0300 Date: Tue, 21 Sep 2021 01:17:46 +0300 From: Ivan Gankevich Message-ID: References: <20210723210801.9458-1-i.gankevich@spbu.ru> <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> <55e4a71f3756689728238b05fd063662f79ca3d7.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <55e4a71f3756689728238b05fd063662f79ca3d7.camel@gmail.com> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >I'd argue that fixing the CMakeLists also falls into snippet territory, >as it's directly related to unbundling. Agreed. Moved the code to the snippet. >Could this be done with substitute* as for the other packages? If not, >we should group those options under a sufficiently explanatory comment. >Also, there's little need to explicitly enable things that would >already be enabled by default, let's keep the list of flags small and >understandable :) Enabled all “low-hanging fruits” and added the comment explaning that these are tests depedencies. >When you send v3, please do all patches in one go and also specify -- >reroll-count, as that's easier on mumi. I hope I did it right :-) Regards, Ivan From unknown Sat Aug 16 14:31:52 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ivan Gankevich Subject: bug#49713: closed (Re: [PATCH 3/3] gnu: Add prusa-slicer.) Message-ID: References: <77b82891ee4dc0bf385e22be0503b793194cb67f.camel@gmail.com> <20210723210037.28150-1-i.gankevich@spbu.ru> X-Gnu-PR-Message: they-closed 49713 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49713@debbugs.gnu.org Date: Tue, 21 Sep 2021 12:13:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1632226382-28378-1" This is a multi-part message in MIME format... ------------=_1632226382-28378-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49713: [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49713@debbugs.gnu.org. --=20 49713: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49713 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1632226382-28378-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49713-done) by debbugs.gnu.org; 21 Sep 2021 12:12:42 +0000 Received: from localhost ([127.0.0.1]:45156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSede-0007N5-Dc for submit@debbugs.gnu.org; Tue, 21 Sep 2021 08:12:42 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:38459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mSedc-0007Mq-SY for 49713-done@debbugs.gnu.org; Tue, 21 Sep 2021 08:12:41 -0400 Received: by mail-wr1-f66.google.com with SMTP id u18so36748144wrg.5 for <49713-done@debbugs.gnu.org>; Tue, 21 Sep 2021 05:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=qBSZ+c6WLqRj/oFZq6g+95P8C/A4hTlsM2MS6E/MiTY=; b=CvvhrrUafhOqzwCPkd0Lf8nKIaiRQ4zgVqgsNpXMVaCpdTE1glqq5PU+2rt7qvH6GG /KNKQaK38gvFwIQVaOOvfadzcjy+krghpF+sdAKzR3DJaB1MTWbQ2tSnhouZEcSfDrWi jo/7Flaxg/Pz1FH73YRvNssKKJuli72ccuhCyWsk9XU5cmLELKpR99MEAf/ukDbPsgfQ 7VaXTww9JI/DzmcRb+5JSdCWoYnHRGBKb0jm/FEoKbN+kz7uauRgwooQVEkkejdorZ9X CjXUOkzNSP4sha+XeN4wImrFQxvrsElQvwBfP6rYUMxdbKn/X/ZRLANyEVcEdneeau02 N30w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=qBSZ+c6WLqRj/oFZq6g+95P8C/A4hTlsM2MS6E/MiTY=; b=nrxBNZhdQTyLdilETEFkQyZ5K2TJXeavA+XQ9v/ZWvtmvnt4gmDmIuQGopfsDosvqC HpH17HYjzPldfqonOGU3qvyIaxlQsOWVfu/r5X9Ia/p/fEaK0HQaCQHE5+E5AGNDuzHz fXERXG1Qwhl+RoB+u8In2CB6jbHuWcEUplXObzmy9f/2w89otzoLT/mNuQk6AIochzZ2 T2yhbmrIIdNR2+SDKCahM3OSZVJ2GVxt7fzXU810S1AXtRx0Qnfp8iBn9cgmYR3PdUYo yHOyTrCYVNbpjsFw3RKNUzMnVA0qzsv8Dfn0CHeMHnXRIRvS8B8po0d9jUnNhNpu31Sj smiw== X-Gm-Message-State: AOAM530hVnSj9om/hxApDjkaGXPLAzEQJJLQrjjTir4hylOl5Tzwp47b LDXkXgi/3+YkcQ1stgEfMgE= X-Google-Smtp-Source: ABdhPJyaBNfhhb99YtYfO0aRbXXyAqitNMArjvreZckI3ezGZnenzFek1iKfno1bn+IXpEcE7NdCyQ== X-Received: by 2002:a05:600c:3b97:: with SMTP id n23mr4265199wms.93.1632226354824; Tue, 21 Sep 2021 05:12:34 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c30sm19399282wrb.74.2021.09.21.05.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 05:12:34 -0700 (PDT) Message-ID: <77b82891ee4dc0bf385e22be0503b793194cb67f.camel@gmail.com> Subject: Re: [PATCH 3/3] gnu: Add prusa-slicer. From: Liliana Marie Prikler To: Ivan Gankevich Date: Tue, 21 Sep 2021 14:12:31 +0200 In-Reply-To: References: <20210723210801.9458-1-i.gankevich@spbu.ru> <1e440c6a0f9e9e328eb83519e1df38f506a3d4b3.camel@gmail.com> <55e4a71f3756689728238b05fd063662f79ca3d7.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49713-done Cc: 49713-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Am Dienstag, den 21.09.2021, 01:17 +0300 schrieb Ivan Gankevich: > I hope I did it right :-) I've pushed this now with some changes. Apart from trivial indentation changes and (list ...) -> '(...), I made all inputs to libigl regular and fixed up the phases as follows: - do-not-download-dependencies split into unpack-external and patch-cmake - install-all-subdirs dropped, instead patched cmake to install relevant headers. Regards ------------=_1632226382-28378-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Jul 2021 21:06:09 +0000 Received: from localhost ([127.0.0.1]:44745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mz-0002GF-Ci for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:51690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m72Mu-0002G3-Hz for submit@debbugs.gnu.org; Fri, 23 Jul 2021 17:06:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m72Mu-0002qQ-D9 for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:04 -0400 Received: from mail.spbu.ru ([195.70.197.23]:53875 helo=cgp2.pu.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1m72Mq-0004Ce-Hs for guix-patches@gnu.org; Fri, 23 Jul 2021 17:06:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=l7PEzWKWn7BXxNOeU4ElVYGq6UzXh8FvAxV2yU4/yK0=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=qrlZdxiXCwUDdRGCVJHvzVaJjMnsqQmRz9mPNNDtm0EQc79lqf7gT+Oy1uiCmWlGAfdnRT4zNc qOS9L4S/+/adIiPIhtuX/vtMw87q3YM1bLjD9n7ceI0wazS1fkgSykt3uQXHZ+gXBtaEoMJ73mAVT Gl5XI7Oitf+eWMeuJgdG6gPP/PAX+P2SKsyNPrPF4HlujskJW0vO/3EG/D9Ru0vOwvevv7/HaqxwC fuOKkKU0z+NoVTDvmR3RJTva4DTT1KmcZdUwYehryuy/ddbvuy8UK82Bpndd4d5mx1gk25qTmJeEs Aa61bQ+ljfeCnkzhSCBgA50kdu1/lZmD+66YA== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173785486; Sat, 24 Jul 2021 00:05:22 +0300 From: Ivan Gankevich To: guix-patches@gnu.org Subject: [PATCH 1/3] gnu: cereal: Use cmake to build and install the library. Date: Sat, 24 Jul 2021 00:00:39 +0300 Message-Id: <20210723210037.28150-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=195.70.197.23; envelope-from=i.gankevich@spbu.ru; helo=cgp2.pu.ru X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Ivan Gankevich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, this series of patches adds Prusa Slicer. I had to change "cereal" package definition to use cmake, otherwise "prusa-slicer" failed to find the library. Also, I added "libigl" that is a dependency of "prusa-slicer". gnu/packages/serialization.scm (cereal): Use cmake. * Replace manual build and installation with standard cmake. The main reason to do that is to get "cereal-config.cmake" file that is used to find the library in other projects. --- gnu/packages/serialization.scm | 39 ++++++++++++---------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 8f292ae408..9c34da62af 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -141,32 +141,19 @@ implement RPC protocols.") "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p")))) (build-system cmake-build-system) (arguments - `(;; The only included tests are portability tests requiring - ;; cross-compilation and boost. Since we are building cereal on more - ;; platforms anyway, there is no compelling reason to build the tests. - #:tests? #f - #:out-of-source? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (substitute* "doc/doxygen.in" - (("@CMAKE_CURRENT_BINARY_DIR@") ".") - (("@CMAKE_CURRENT_SOURCE_DIR@") ".")) - (with-directory-excursion "doc" - (invoke "doxygen" "doxygen.in")))) - ;; There is no "install" target, so we have to provide our own - ;; "install" phase. - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/cereal/docs")) - (include (string-append out "/include/cereal"))) - (mkdir-p doc) - (mkdir-p include) - (copy-recursively "include/cereal" include) - (copy-recursively "doc/html" doc))))))) + `(#:configure-flags (list "-DSKIP_PORTABILITY_TEST=ON") + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'configure 'skip-sandbox + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(sandbox\\)") "")))) + (add-after 'install 'install-doc + (lambda _ + (let ((doc (string-append %output "/share/doc/html"))) + (invoke "make" "doc") + (mkdir-p doc) + (copy-recursively "doc/html" doc))))))) (native-inputs `(("doxygen" ,doxygen))) (home-page "https://uscilab.github.io/cereal/") -- 2.32.0 ------------=_1632226382-28378-1--