From 054c9ec04d0c9ea1cbb33ad1319e193da9bd1128 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Wed, 20 Jan 2021 18:45:42 +0100 Subject: openscad: Add optional dep on lib3mf --- science/openscad/DEPENDS | 6 +++++- science/openscad/HISTORY | 1 + science/openscad/PRE_BUILD | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'science') diff --git a/science/openscad/DEPENDS b/science/openscad/DEPENDS index c4dc2361b7..1b05c3b044 100755 --- a/science/openscad/DEPENDS +++ b/science/openscad/DEPENDS @@ -24,4 +24,8 @@ depends libzip && depends bison && depends flex && depends pkgconfig && -depends double-conversion +depends double-conversion && +optional_depends lib3mf \ + '' \ + -DCMAKE_DISABLE_FIND_PACKAGE_LIB3MF=TRUE \ + 'for 3D Manufacturing Format support' diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY index fe091dfd19..bb43425e90 100644 --- a/science/openscad/HISTORY +++ b/science/openscad/HISTORY @@ -1,4 +1,5 @@ 2021-01-20 Ismael Luceno + * DEPENDS, PRE_BUILD: added dependency on lib3mf * DEPENDS: added missing dependency on qtmultimedia 2020-10-31 Florian Franzmann diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD index b471a4021e..7c3e6d32c8 100755 --- a/science/openscad/PRE_BUILD +++ b/science/openscad/PRE_BUILD @@ -1,6 +1,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && - patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch" && -patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch" - +patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch" && +# Fix .pc name for lib3mf +sedit '/^ *find_package/s/Lib3MF/lib3mf/' CMakeLists.txt -- cgit v1.2.3