From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iPSDGF7wjWacYAAAe85BDQ:P1 (envelope-from ) for ; Wed, 10 Jul 2024 02:22:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iPSDGF7wjWacYAAAe85BDQ (envelope-from ) for ; Wed, 10 Jul 2024 04:22:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ghzKx9DJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720578142; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4i/VERUudwlt1Bx31MCDlrSnaycN7rD86GAu2kF5vOI=; b=j1Q5r2EZ0yKIMXUQUockgX4H46dW+2upOO/7LuLPaqCPcOBIrb06J2yNf7bwz//eRzm9Ia VpkJgGcUcI+2Qva0RgWw13oHUTXBQTU+pmfzx2y9qCcDZi1DV10dV3dklEHgBNHYkL6CEN iHfZtGQAA59kwlLB2SGSfuY0MvjUNGUp2VixkCzW74QCbC3cOWojNrEiIr33fgYP/W0WWG bEgt+XaLzV5rKtaNih77Ib0AhmLbB20G6MMOmBdq/ilDo+Mv8378YBo/Ygh2o5afFQ0peP zSnHtcauVnv6alAKASwhLKSdhA1z4BipHt6XVfBRpA7LZVFp+LY6ZqBKQNCqrA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720578142; a=rsa-sha256; cv=none; b=oDUmerdsejk9gfyZDt1/IBxLSpMKI5VBUG0CeSndIy7XYNMu5PcnfUYZeyKlpQvw1Q3IWV HUB8i5qqqz730uZ9s9Nkr8PnAgg2kO1Hw8KRw0DFK+YtZ5EyfP+xdyKWjrqrEaUKDysq7l zqwLTBzOYwVywBbgycwwvmr8mWhFCYccOe0oiQCZ6WSuDB4GSXIKMMq9GEt575JklgRE0H 1ywnnWFcwG4EOE8TVonfKsnQ8w19m+4MLSMMKblaDqHkAKk5KfaVkIFQyZ7jK3qvQo+AUo /Uix9r2AfZHgzyDXih8RSWZgpjnwkjlaz6glHtAwoQa1Am32MZRm91CTrBhauA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ghzKx9DJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DE69F6B35C for ; Wed, 10 Jul 2024 04:22:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRMxz-0000RF-BV; Tue, 09 Jul 2024 22:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRMxw-0000R2-B4 for guix-patches@gnu.org; Tue, 09 Jul 2024 22:21:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRMxw-0001UD-2e for guix-patches@gnu.org; Tue, 09 Jul 2024 22:21:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sRMy1-0006LQ-QJ for guix-patches@gnu.org; Tue, 09 Jul 2024 22:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70880] [PATCH v2 4/8] gnu: libigl: Update to 2.4.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2024 02:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70880 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: "Artyom V. Poptsov" Cc: 70880@debbugs.gnu.org Received: via spool by 70880-submit@debbugs.gnu.org id=B70880.172057811624376 (code B ref 70880); Wed, 10 Jul 2024 02:22:01 +0000 Received: (at 70880) by debbugs.gnu.org; 10 Jul 2024 02:21:56 +0000 Received: from localhost ([127.0.0.1]:54554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMxv-0006L4-OI for submit@debbugs.gnu.org; Tue, 09 Jul 2024 22:21:56 -0400 Received: from mail-vs1-f48.google.com ([209.85.217.48]:44401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sRMxs-0006Ks-G3 for 70880@debbugs.gnu.org; Tue, 09 Jul 2024 22:21:54 -0400 Received: by mail-vs1-f48.google.com with SMTP id ada2fe7eead31-48fde151f25so1967847137.1 for <70880@debbugs.gnu.org>; Tue, 09 Jul 2024 19:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720578045; x=1721182845; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4i/VERUudwlt1Bx31MCDlrSnaycN7rD86GAu2kF5vOI=; b=ghzKx9DJYJosqvTHMeeyEwJ6I97wO3SpwKmdXTMymEXsKufVX5HL7yax5+ZtgpOotX ApRnFfjherNAqTrMMiJzLqxNei1nHzFBX1yXf3C3Sceer58Z+RwgwMbKERFaqxKRmf68 taZOGCY55yw4NqARgQVfBSc0XT+FL5giIabONcsrhcvliS8Zvgd+4qlTwhUaQxwHol+x sTj9o0tJ3owG3l3g4/kDlRuRPQDNetGxoXskygneneqRv7eVmu4ODFE/K7nKY/PZwgaR W7/klEELmX08JrqvNpum/Ks8/Xgi7xG2R5qnqmn665alo8VtFW+qGSyhOfuTYpt+QnjO f7cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720578045; x=1721182845; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4i/VERUudwlt1Bx31MCDlrSnaycN7rD86GAu2kF5vOI=; b=aNEjtdo+uQaUJWsz5dt6TbPGy20tWqN2xYjT+9VnfGVUuvOMPsMgT/35CXg8Qt7zUN 4bLthwNiOLwhw48p0mQxip3RE8DbgK+4Y3gBqplu65dVnZAFBhy0HLc4ciHhjBRxbG8w 73Dfh+QSct6wE/qerIZlBITJSIcSLTKTTQpHUgd1f06JoXTQqW2y119x+Z5Yad3bu1IO +Fpyj6CuFZol/KDqVuVriPeSSNBRdUUl5MWS6f1saCvoYu1BxHDRLR7k2vH8ZD2Xclgi TEI0tCxWGmI/C6sCNfxuo8dbDTsasz7MpQ6+V6QKpWBLBEw5OP4z4yqCMwxgCcWtl/W4 /8Bg== X-Gm-Message-State: AOJu0YzNVGousT6fTrBzWrvDjflIN23y75F8yctXwTYDtrn46t9u2O5W w1eyrMlJ05oa5n8/vERKTdNUiCPiuOhN8Afx6Z4TWEe1tDd+PqYqmmTQAw== X-Google-Smtp-Source: AGHT+IEVtFuu5SzJJR9P+BDUjlOyASNhm18YyRIV7EfPv6kKWdhxL9heGc0Ji9rAgZZR1AV7HlQM2A== X-Received: by 2002:a05:6102:2c18:b0:48f:49c2:ff77 with SMTP id ada2fe7eead31-49032147578mr4861410137.16.1720578044681; Tue, 09 Jul 2024 19:20:44 -0700 (PDT) Received: from hurd (dsl-205-236-230-124.b2b2c.ca. [205.236.230.124]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-447f9b26ca8sm16132131cf.15.2024.07.09.19.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 19:20:43 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> (Artyom V. Poptsov's message of "Mon, 1 Jul 2024 20:07:06 +0300") References: <09e99660acf1973e62ba21b25e5d3e2cceaa5921.1719853592.git.poptsov.artyom@gmail.com> Date: Tue, 09 Jul 2024 22:20:42 -0400 Message-ID: <875xtevvgl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: DE69F6B35C X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.30 X-Spam-Score: -5.30 X-TUID: 2SaUshe/7Ya+ "Artyom V. Poptsov" writes: > * gnu/packages/engineering.scm (libigl): Update to 2.4.0. > [arguments]: Use Gexps. Update configure flags. Disable GLFW tests as= they > are failing with SEGFAULT errors (see > .) > Update "unpack-external" phase: add new dependencies. > Update "patch-cmake" phase to prevent CMake from trying to download ext= ernal > dependencies. Help CMake to find the package inputs. > Add "fix-assertions" and "install-copyleft-modules" phase. > [native-inputs]: Add catch2. > [inputs]: Use glfw-3.4. Add openblas, imgui and spectra. Add libigl > packages and imguizmo. Remove catch2. Nitpick: no need for hanging indents in GNU ChangeLog messages. > Change-Id: Ib4ac842dc14fe1cbc6b0b87674bae1f261a1a970 > --- > gnu/packages/engineering.scm | 258 ++++++++++++++++++++++++----------- > 1 file changed, 179 insertions(+), 79 deletions(-) > > diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm > index fcb73eab12..7f29e2c365 100644 > --- a/gnu/packages/engineering.scm > +++ b/gnu/packages/engineering.scm > @@ -33,7 +33,7 @@ > ;;; Copyright =C2=A9 2022 Malte Frank Gerdes > ;;; Copyright =C2=A9 2022 Konstantinos Agiannis > ;;; Copyright =C2=A9 2022 Greg Hogan > -;;; Copyright =C2=A9 2022 Artyom V. Poptsov > +;;; Copyright =C2=A9 2022-2024 Artyom V. Poptsov > ;;; Copyright =C2=A9 2022 Maxim Cournoyer > ;;; Copyright =C2=A9 2022, 2023 Felix Gruber > ;;; Copyright =C2=A9 2023 Theofilos Pechlivanis > @@ -162,6 +162,7 @@ (define-module (gnu packages engineering) > #:use-module (gnu packages text-editors) > #:use-module (gnu packages time) > #:use-module (gnu packages tls) > + #:use-module (gnu packages toolkits) > #:use-module (gnu packages tree-sitter) > #:use-module (gnu packages version-control) > #:use-module (gnu packages web) > @@ -3510,7 +3511,7 @@ (define-public xfoil > (define-public libigl > (package > (name "libigl") > - (version "2.3.0") > + (version "2.4.0") > (source > (origin > (method git-fetch) > @@ -3520,90 +3521,151 @@ (define-public libigl > (file-name (git-file-name name version)) > (sha256 > (base32 > - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) > + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) > (build-system cmake-build-system) > (arguments > - `(#:configure-flags > - '("-DLIBIGL_USE_STATIC_LIBRARY=3DOFF" > - "-DLIBIGL_BUILD_TESTS=3DON" > - "-DLIBIGL_BUILD_TUTORIALS=3DOFF" > - "-DLIBIGL_EXPORT_TARGETS=3DON" > - ;; The following options disable tests for the corresponding li= braries. > - ;; The options do not affect whether the libraries are linked to > - ;; libigl or not, they are used for tests. > - "-DLIBIGL_WITH_COMISO=3DOFF" > - "-DLIBIGL_WITH_CORK=3DOFF" > - "-DLIBIGL_WITH_MATLAB=3DOFF" > - "-DLIBIGL_WITH_MOSEK=3DOFF" > - "-DLIBIGL_WITH_TRIANGLE=3DOFF" ;; Undefined reference to "trian= gulate". > - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=3DOFF") > + (list #:configure-flags > + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=3DOFF" > + "-DLIBIGL_BUILD_TESTS=3DON" > + "-DLIBIGL_BUILD_TUTORIALS=3DOFF" > + "-DLIBIGL_INSTALL=3DON" > + "-DFETCHCONTENT_FULLY_DISCONNECTED=3DON" > + (format #f "-DCatch2_DIR=3D~a/lib/cmake/catch2/" > + #$(this-package-input "catch2")) > + (format #f "-DSpectra_DIR=3D~a/share/pectra/cmake/" > + #$(this-package-input "spectra")) > + ;; The following options disable tests for the corres= ponding libraries. > + ;; The options do not affect whether the libraries ar= e linked to > + ;; libigl or not, they are used for tests. > + "-DLIBIGL_WITH_COMISO=3DOFF" > + "-DLIBIGL_WITH_CORK=3DOFF" > + "-DLIBIGL_MATLAB=3DOFF" > + "-DLIBIGL_MOSEK=3DOFF" > + ;; XXX: GLFW tests are failing with SEGFAULT. See > + ;; > + "-DLIBIGL_GLFW_TESTS=3DOFF") > + #:build-type "Release" > #:phases > - (modify-phases %standard-phases > + #~(modify-phases %standard-phases > (add-after 'unpack 'unpack-external > (lambda _ > (setenv "HOME" (getcwd)) ;; cmake needs this to export modu= les > (mkdir "external") > (copy-recursively (assoc-ref %build-inputs "libigl-glad") "= external/glad") > - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "e= xternal/stb") > + (copy-recursively (assoc-ref %build-inputs "libigl-test-dat= a") "external/test-data") > + (copy-recursively (assoc-ref %build-inputs "libigl-comiso")= "external/comiso") > (copy-recursively (assoc-ref %build-inputs "libigl-tetgen")= "external/tetgen") > - (copy-recursively (assoc-ref %build-inputs "libigl-predicat= es") "external/predicates"))) > + (copy-recursively (assoc-ref %build-inputs "libigl-predicat= es") "external/predicates") > + (copy-recursively (assoc-ref %build-inputs "imguizmo") "ext= ernal/imguizmo") > + (copy-recursively (assoc-ref %build-inputs "eigen") "extern= al/eigen"))) You'll want to break these long lines; we aim to limit line width below 80 columns. 'guix lint' should complain. > (add-after 'unpack-external 'patch-cmake > - (lambda _ > + (lambda* (#:key inputs #:allow-other-keys) > + (define (source-dir library-name) > + (format #f "SOURCE_DIR \"~a\"" > + (assoc-ref %build-inputs library-name))) > + (define (fix-external-library cmake source) > + (substitute* (format #f "cmake/recipes/external/~a.cmake" > + cmake) > + (("GIT_REPOSITORY.*") (source-dir source)) > + (("GIT_TAG.*") ""))) > ;; Fix references to external libraries > - (substitute* "cmake/libigl.cmake" > - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) > - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" = all)) > - (("if\\(NOT TARGET CGAL::CGAL\\)" all) > - (string-append "find_package(CGAL CONFIG COMPONENTS Core= )\n" all)) > - (("if\\(NOT TARGET tinyxml2\\)" all) > - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" > - "if (NOT TARGET tinyxml2::tinyxml2)")) > - (("if\\(NOT TARGET embree\\)" all) > - (string-append "find_package(embree 3 CONFIG REQUIRED)\n= " all)) > - (("if\\(NOT TARGET glfw\\)" all) > - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" a= ll)) > - (("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 CONFI= G REQUIRED)") > - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\= \}/catch2/contrib\\)") > - "") > - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 cat= ch2\\)") "")) > - ;; Install otherwise missing headers > - (substitute* "cmake/libigl.cmake" > - (("install_dir_files\\(copyleft\\)" all) > - (string-join (list all > - "install_dir_files(copyleft/cgal)" > - "install_dir_files(copyleft/opengl)" > - "install_dir_files(copyleft/tetgen)" > - "install_dir_files(embree)" > - "install_dir_files(opengl)" > - "install_dir_files(png)" > - "install_dir_files(predicates)" > - "install_dir_files(xml)") > - "\n")))))))) > + (fix-external-library "comiso" "libigl-comiso") > + (fix-external-library "tetgen" "libigl-tetgen") > + (fix-external-library "triangle" "libigl-triangle") > + (fix-external-library "predicates" "libigl-predicates") > + (fix-external-library "glad" "libigl-glad") > + (fix-external-library "libigl_tests_data" "libigl-test-data= ") > + (fix-external-library "stb" "libigl-stb") > + (substitute* "cmake/recipes/external/imguizmo.cmake" > + (("if\\(TARGET imguizmo::imguizmo\\)") > + "if(true)") > + (("target_link_libraries.*") > + (format #f "include_directories(~a/include/imgui/)" > + (assoc-ref inputs "imgui")))) > + > + (substitute* "cmake/igl/igl_add_test.cmake" > + (("include\\(\".*/contrib/Catch.cmake\"\\)") > + (format #f > + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" > + (assoc-ref inputs "catch2")))) > + (substitute* "cmake/recipes/external/cgal.cmake" > + (("FetchContent_Populate\\(cgal\\)") > + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) > + (substitute* "cmake/recipes/external/eigen.cmake" > + (("FetchContent_Populate\\(eigen\\)") > + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) > + (substitute* "cmake/recipes/external/catch2.cmake" > + (("message.*") > + "find_package(Catch2 CONFIG)\nreturn()")) > + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cma= ke" > + (("if\\(TARGET igl::imgui_fonts\\)") > + "if(true)")) > + (substitute* "cmake/recipes/external/tinyxml2.cmake" > + (("FetchContent_Populate\\(tinyxml2\\)") > + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) > + (substitute* "cmake/recipes/external/embree.cmake" > + (("FetchContent_MakeAvailable\\(embree\\)") > + (string-join (list "find_package(Embree 3 CONFIG)" > + "add_library(embree::embree ALIAS emb= ree)" > + "return()") > + "\n"))) > + (substitute* "cmake/recipes/external/glfw.cmake" > + (("FetchContent_MakeAvailable\\(glfw\\)") > + (string-join > + (list "find_package(glfw3 CONFIG REQUIRED)" > + "add_library(glfw::glfw ALIAS glfw)" > + "return()") > + "\n"))) > + (substitute* "cmake/recipes/external/imgui.cmake" > + (("FetchContent_MakeAvailable\\(imgui\\)") > + "return()")))) All these FetchContent substitutions could perhaps be unnecessary if they were referring to the right package name and with the use of the -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=3DALWAYS configure flag, which forces CMake to look at the packages from the system and fail if they aren't found instead of fetching their source and building them. > + (add-after 'unpack-external 'fix-assertions > + (lambda _ > + ;; Current Tetgen version has a bug. > + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetme= sh.cpp" > + (("assert\\(out.numberofpoints =3D=3D out.numberofpointma= rkers\\);") > + ";")) > + ;; CGAL has a bug in assertion as well. > + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" > + (("assert\\(I.size\\(\\) =3D=3D Vr.rows\\(\\)\\);") > + ";")))) > + > + ;; XXX: Install modules as CMake fails to install them. > + (add-after 'install 'install-includes > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (include-dir (string-append out "/include/igl/"))) > + (for-each (lambda (module) > + (copy-recursively (format #f "../source/inclu= de/igl/~a" > + module) > + (format #f "~a/~a" include-= dir module))) > + (list "copyleft/cgal" > + "copyleft/opengl2" > + "copyleft/tetgen" > + "embree" > + "opengl" > + "predicates" > + "xml")))))))) > + > + (native-inputs (list catch2)) > ;; XXX: Inputs are currently only used to build tests. > ;; We would need to patch the CMake recipe to build a shared li= brary > ;; with all of these. > (inputs > `(("boost" ,boost) > - ("catch2" ,catch2) > ("cgal" ,cgal) > ("eigen" ,eigen) > ("embree" ,embree) > - ("glfw" ,glfw) > + ("glfw" ,glfw-3.4) > ("gmp" ,gmp) > ("mesa" ,mesa) > ("mpfr" ,mpfr) > ("tbb" ,tbb) > ("tinyxml2" ,tinyxml2) > + ("openblas" ,openblas) > + ("imgui" ,imgui) > + ("spectra" ,spectra) > ;; When updating this package, update commit fields below accordi= ng to > ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". > ("libigl-test-data" > @@ -3615,13 +3677,16 @@ (define-public libigl > (file-name (git-file-name "libigl-test-data" version)) > (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfix= xxyya4i2")))) > ("libigl-glad" > - ,(origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/libigl/libigl-glad") > - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) > - (file-name (git-file-name "libigl-glad" version)) > - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665= vl53rawk")))) > + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/libigl-glad") > + (commit commit))) > + (file-name (git-file-name "libigl-glad" version)) > + (sha256 (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9g= f43d3220ay"))))) > ("libigl-stb" > ,(origin > (method git-fetch) > @@ -3631,22 +3696,57 @@ (define-public libigl > (file-name (git-file-name "libigl-stb" version)) > (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv7= 9zld28kj")))) > ("libigl-predicates" > + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/libigl-predicates.git= ") > + (commit commit))) > + (file-name (git-file-name "libigl-predicates" version)) > + (sha256 (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafk= c9kc4qy8jz"))))) > + ;; TODO: Package tetgen separately from > + ("libigl-tetgen" > + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/tetgen.git") > + (commit commit))) > + (file-name (git-file-name "libigl-tetgen" version)) > + (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6r= jm91g8qxsg"))))) > + ("libigl-comiso" > + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") > + (revision "0") > + (version (git-version "0.0.0" revision commit))) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/libigl/comiso.git") > + (commit commit))) > + (file-name (git-file-name "libigl-comiso" version)) > + (sha256 (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb= 1iwrqfy6ba"))))) > + ("libigl-triangle" > ,(origin > (method git-fetch) > (uri (git-reference > - (url "https://github.com/libigl/libigl-predicates.git") > - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) > - (file-name (git-file-name "libigl-predicates" version)) > - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn1= 47rp5wyh")))) > - ;; TODO: Package tetgen separately from > - ("libigl-tetgen" > + (url "https://github.com/libigl/triangle.git") > + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) > + (file-name (git-file-name "libigl-triangle" version)) > + (sha256 (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb= 05limxl3")))) > + ;; XXX: This is a source-only library which is currently required= only for > + ;; libigl. > + ("imguizmo" > ,(origin > (method git-fetch) > (uri (git-reference > - (url "https://github.com/libigl/tetgen.git") > - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) > - (file-name (git-file-name "libigl-tetgen" version)) > - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm= 91g8qxsg")))))) > + (url "https://github.com/CedricGuillemet/ImGuizmo") > + (commit "1.83"))) > + (file-name (git-file-name "imguizmo" version)) > + (sha256 (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v= 1sxiy2v0")))))) > (home-page "https://libigl.github.io/") > (synopsis "Simple C++ geometry processing library") > (description "This library provides functionality for shape modellin= g, The rest LGTM, although it'd be nice to modernize the definition to use gexps and remove the input labels. --=20 Thanks, Maxim