From: enderger <enderger@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Package lib3mf
Date: Thu, 03 Nov 2022 01:48:42 +0100 [thread overview]
Message-ID: <20221103004842.UMHgI2BB9f-LcIzjfiNeYxVy8pmyPqoJVAAiWMp3Ybw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40307@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
There is an updated pull request by enderger against master on the void-packages repository
https://github.com/enderger/void-packages pkg/pkg-lib3mf
https://github.com/void-linux/void-packages/pull/40307
Package lib3mf
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
A patch file from https://github.com/void-linux/void-packages/pull/40307.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/pkg-lib3mf-40307.patch --]
[-- Type: text/x-diff, Size: 3799 bytes --]
From 8418849473a999a56685df8e944b678cebc0061e 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 | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 40 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..396932bfe53a
--- /dev/null
+++ b/srcpkgs/lib3mf/template
@@ -0,0 +1,38 @@
+# 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
+ INCDIR="$DESTDIR/usr/include/lib3mf/"
+ BINDDIR="$INCDIR/Bindings"
+ ln -rst "$INCDIR" "$BINDDIR"/C/* "$BINDDIR"/Cpp/*
+}
+
+lib3mf-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} $makedepends"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 6b6d69abb1f0396e23f9126f6eb1ff1cf06b52d1 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
+}
next prev parent reply other threads:[~2022-11-03 0:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 22:13 [PR PATCH] " enderger
2022-11-02 22:49 ` enderger
2022-11-02 22:59 ` [PR REVIEW] " paper42
2022-11-02 23:10 ` [PR PATCH] [Updated] " enderger
2022-11-02 23:10 ` [PR REVIEW] " enderger
2022-11-02 23:15 ` [PR PATCH] [Updated] " enderger
2022-11-02 23:17 ` enderger
2022-11-02 23:23 ` enderger
2022-11-02 23:46 ` enderger
2022-11-03 0:16 ` [PR REVIEW] " classabbyamp
2022-11-03 0:16 ` classabbyamp
2022-11-03 0:16 ` classabbyamp
2022-11-03 0:16 ` classabbyamp
2022-11-03 0:23 ` enderger
2022-11-03 0:23 ` enderger
2022-11-03 0:23 ` enderger
2022-11-03 0:29 ` enderger
2022-11-03 0:32 ` classabbyamp
2022-11-03 0:48 ` enderger [this message]
2022-11-03 0:58 ` enderger
2022-11-03 0:59 ` enderger
2022-11-03 1:12 ` [PR PATCH] [Updated] " enderger
2022-11-03 1:16 ` enderger
2022-11-03 1:32 ` [PR REVIEW] " enderger
2023-02-01 2:07 ` github-actions
2023-02-16 2:01 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221103004842.UMHgI2BB9f-LcIzjfiNeYxVy8pmyPqoJVAAiWMp3Ybw@z \
--to=enderger@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).