Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (054c9ec04d0c9ea1cbb33ad1319e193da9bd1128)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (054c9ec04d0c9ea1cbb33ad1319e193da9bd1128)
  • Date: Wed, 20 Jan 2021 23:49:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 3 +
archive-libs/libzip/HISTORY | 4 ++
archive-libs/libzip/PRE_BUILD | 3 +
archive-libs/libzip/patches/0001-portability-fixes.patch | 17 ++++++++++
science-libs/lib3mf/BUILD | 2 +
science-libs/lib3mf/CONFIGURE | 1
science-libs/lib3mf/DEPENDS | 3 +
science-libs/lib3mf/DETAILS | 25
+++++++++++++++
science-libs/lib3mf/HISTORY | 2 +
science/openscad/DEPENDS | 7 +++-
science/openscad/HISTORY | 4 ++
science/openscad/PRE_BUILD | 6 +--
12 files changed, 73 insertions(+), 4 deletions(-)

New commits:
commit 054c9ec04d0c9ea1cbb33ad1319e193da9bd1128
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openscad: Add optional dep on lib3mf

commit f8205a9431a5d754642182d417b9c64c83a814bd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openscad: Add missing dependency on qtmultimedia

commit 5d46e45ba666caf9fb15d875e7247c77a21bb486
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

lib3mf: new spell, Implementation of the 3D Manufacturing Format standard

commit bd2e82657a05f27b9e2ba7427c28e09367a1d708
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libzip: Fix build against musl

diff --git a/ChangeLog b/ChangeLog
index 69e927c..737bfb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-01-20 Ismael Luceno <ismael AT sourcemage.org>
+ * science-libs/lib3mf: new spell, Implementation of the 3D
Manufacturing Format standard
+
2021-01-17 Ismael Luceno <ismael AT sourcemage.org>
* utils/kvmtool: new spell, Stand-alone Native Linux KVM Tool

diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 68c4a67..2ee6a56 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,7 @@
+2021-01-20 Ismael Luceno <ismael AT iodev.co.uk>
+ * PRE_BUILD, patches/0001-portability-fixes.patch:
+ fixed build against musl
+
2020-07-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.3

diff --git a/archive-libs/libzip/PRE_BUILD b/archive-libs/libzip/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/archive-libs/libzip/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/archive-libs/libzip/patches/0001-portability-fixes.patch
b/archive-libs/libzip/patches/0001-portability-fixes.patch
new file mode 100644
index 0000000..d4848ec
--- /dev/null
+++ b/archive-libs/libzip/patches/0001-portability-fixes.patch
@@ -0,0 +1,17 @@
+Fix missing header inclusion
+
+INT_MAX is defined in <limits.h>; which isn't necessarily included by other
of
+the used headers, so in some libc implementations this causes a build error.
+
+diff --git a/lib/zip_crypto_openssl.c.orig b/lib/zip_crypto_openssl.c
+index 1cb004798b1c..74c1d87bc36c 100644
+--- a/lib/zip_crypto_openssl.c
++++ b/lib/zip_crypto_openssl.c
+@@ -31,6 +31,7 @@
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <limits.h>
+ #include <stdlib.h>
+
+ #include "zipint.h"
diff --git a/science-libs/lib3mf/BUILD b/science-libs/lib3mf/BUILD
new file mode 100755
index 0000000..4bdea8f
--- /dev/null
+++ b/science-libs/lib3mf/BUILD
@@ -0,0 +1,2 @@
+OPTS+=' -DLIB3MF_TESTS=OFF' &&
+default_build
diff --git a/science-libs/lib3mf/CONFIGURE b/science-libs/lib3mf/CONFIGURE
new file mode 100755
index 0000000..b1e2770
--- /dev/null
+++ b/science-libs/lib3mf/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/science-libs/lib3mf/DEPENDS b/science-libs/lib3mf/DEPENDS
new file mode 100755
index 0000000..97555a8
--- /dev/null
+++ b/science-libs/lib3mf/DEPENDS
@@ -0,0 +1,3 @@
+depends zlib -DUSE_INCLUDED_ZLIB=OFF &&
+depends libzip -DUSE_INCLUDED_LIBZIP=OFF &&
+depends SSL -DUSE_INCLUDED_SSL=OFF
diff --git a/science-libs/lib3mf/DETAILS b/science-libs/lib3mf/DETAILS
new file mode 100755
index 0000000..74ae0b7
--- /dev/null
+++ b/science-libs/lib3mf/DETAILS
@@ -0,0 +1,25 @@
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
+ SPELL=lib3mf
+ VERSION=2.1.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]=https://github.com/3MFConsortium/$SPELL/archive/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://3mf.io/";
+ LICENSE[0]="BSD-2-Clause"
+ ENTERED=20210120
+ KEYWORDS=""
+ SHORT="Implementation of the 3D Manufacturing Format standard"
+cat << EOF
+lib3mf is a C++ implementation of the 3D Manufacturing Format file standard.
+
+It provides 3MF reading and writing capabilities, as well as conversion and
+validation tools for input and output data. lib3mf runs on Windows, Linux
+and MacOS and offers a clean and easy-to-use API in various programming
+languages to speed up the development and keep integration costs at a
minimum.
+
+As 3MF shall become an universal 3D Printing standard, its quick adoption
+is very important. This library shall lower all barriers of adoption to any
+possible user, let it be software providers, hardware providers, service
+providers or middleware tools.
+EOF
diff --git a/science-libs/lib3mf/HISTORY b/science-libs/lib3mf/HISTORY
new file mode 100644
index 0000000..8593427
--- /dev/null
+++ b/science-libs/lib3mf/HISTORY
@@ -0,0 +1,2 @@
+2021-01-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: spell created
diff --git a/science/openscad/DEPENDS b/science/openscad/DEPENDS
index 9b1143d..1b05c3b 100755
--- a/science/openscad/DEPENDS
+++ b/science/openscad/DEPENDS
@@ -1,5 +1,6 @@
depends gcc &&
depends qtbase &&
+depends qtmultimedia &&
depends qscintilla &&
depends cgal &&
depends gmp &&
@@ -23,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 ca440f6..bb43425 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,7 @@
+2021-01-20 Ismael Luceno <ismael AT iodev.co.uk>
+ * DEPENDS, PRE_BUILD: added dependency on lib3mf
+ * DEPENDS: added missing dependency on qtmultimedia
+
2020-10-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, openscad-2019.05-0001-Fix-build-with-boost-1.73.patch:
add patch from gentoo to fix build against boost 1.74
diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD
index b471a40..7c3e6d3 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



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (054c9ec04d0c9ea1cbb33ad1319e193da9bd1128), Ismael Luceno, 01/20/2021

Archive powered by MHonArc 2.6.24.

Top of Page