From df7eff4131ab49c6d0811a66663f29c01b5b13e8 Mon Sep 17 00:00:00 2001
From: Hutzdog <endergeryt@gmail.com>
Date: Wed, 2 Nov 2022 15:07:59 -0700
Subject: [PATCH 1/2] New package: lib3mf-2.2.0

---
 common/shlibs           |  1 +
 srcpkgs/lib3mf-devel    |  1 +
 srcpkgs/lib3mf/template | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/lib3mf-devel
 create mode 100644 srcpkgs/lib3mf/template

diff --git a/common/shlibs b/common/shlibs
index e48e6f352375..d56df6a68066 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4196,3 +4196,4 @@ libabsl_strings.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_throw_delegate.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_time_zone.so.2206.0.0 abseil-cpp-20220623.1_1
 libabsl_spinlock_wait.so.2206.0.0 abseil-cpp-20220623.1_1
+lib3mf.so.2 lib3mf-2.2.0_1
diff --git a/srcpkgs/lib3mf-devel b/srcpkgs/lib3mf-devel
new file mode 120000
index 000000000000..9352a6a9f9c8
--- /dev/null
+++ b/srcpkgs/lib3mf-devel
@@ -0,0 +1 @@
+lib3mf
\ No newline at end of file
diff --git a/srcpkgs/lib3mf/template b/srcpkgs/lib3mf/template
new file mode 100644
index 000000000000..1ba9f3de4534
--- /dev/null
+++ b/srcpkgs/lib3mf/template
@@ -0,0 +1,40 @@
+# Template file for 'lib3mf'
+pkgname=lib3mf
+version=2.2.0
+revision=1
+build_style=cmake
+configure_args="-DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF
+ -DUSE_INCLUDED_GTEST=OFF -DUSE_INCLUDED_SSL=OFF"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libzip-devel"
+checkdepends="gtest-devel openssl-devel"
+short_desc="Official 3mf format implementation"
+maintainer="Danielle Hutzley <endergeryt@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://3mf.io"
+distfiles="https://github.com/3MFConsortium/lib3mf/archive/refs/tags/v${version}.tar.gz"
+checksum=96e85e278fc5474123e3c47237dd42faaf1fdf8e182541a84af7fe84ddd3cbde
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DLIB3MF_TESTS=OFF"
+fi
+
+post_install() {
+	vdoc README.md
+	vlicense LICENSE
+}
+
+lib3mf-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pre_install() {
+		INCDIR="$DESTDIR/usr/include/lib3mf/"
+		BINDDIR="$INCDIR/Bindings"
+		ln -rst "$INCDIR" "$BINDDIR"/C/* "$BINDDIR"/Cpp/*
+	}
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 3af85cd177a994d1e0426757b6d6f61eab815bf6 Mon Sep 17 00:00:00 2001
From: Hutzdog <endergeryt@gmail.com>
Date: Wed, 2 Nov 2022 15:14:19 -0700
Subject: [PATCH 2/2] openscad: support 3mf

---
 srcpkgs/openscad/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index a3951a1a2201..f5cf9f8f9008 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,14 +1,25 @@
 # Template file for 'openscad'
 pkgname=openscad
 version=2021.01
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
- qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel"
+ qt5-multimedia-devel libxml2-devel libzip-devel double-conversion-devel
+ $(vopt_if 3mf lib3mf-devel)"
 short_desc="Solid 3D CAD modeller"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openscad.org"
 distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
 checksum=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359
+
+build_options="3mf"
+desc_option_png="Enable support for 3MF models"
+build_options_default="3mf"
+
+pre_patch() {
+	if [ "$build_option_3mf" ]; then
+		vsed -i features/lib3mf.prf -e "s/lib3MF/lib3mf/g"
+	fi
+}