pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libSavitar: Import libSavitar-4.11.0 as wip/libSavitar
Module Name: pkgsrc-wip
Committed By: Atsushi Toyokura <asteria.at%gmail.com@localhost>
Pushed By: steleto
Date: Sat Nov 6 16:53:26 2021 +0900
Changeset: 1b128fa135d026b4f1930d0479f9e5d7b252c965
Modified Files:
Makefile
Added Files:
libSavitar/DESCR
libSavitar/Makefile
libSavitar/PLIST
libSavitar/buildlink3.mk
libSavitar/distinfo
libSavitar/patches/patch-CMakeLists.txt
libSavitar/patches/patch-src_MeshData.cpp
libSavitar/patches/patch-src_Namespace.cpp
libSavitar/patches/patch-src_Scene.cpp
libSavitar/patches/patch-src_SceneNode.cpp
libSavitar/patches/patch-src_ThreeMFParser.h
Log Message:
libSavitar: Import libSavitar-4.11.0 as wip/libSavitar
libSavitar is a c++ implementation of 3mf loading with SIP python
bindings.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1b128fa135d026b4f1930d0479f9e5d7b252c965
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 +
libSavitar/DESCR | 2 ++
libSavitar/Makefile | 29 ++++++++++++++++++++++++++++
libSavitar/PLIST | 18 +++++++++++++++++
libSavitar/buildlink3.mk | 14 ++++++++++++++
libSavitar/distinfo | 11 +++++++++++
libSavitar/patches/patch-CMakeLists.txt | 22 +++++++++++++++++++++
libSavitar/patches/patch-src_MeshData.cpp | 29 ++++++++++++++++++++++++++++
libSavitar/patches/patch-src_Namespace.cpp | 22 +++++++++++++++++++++
libSavitar/patches/patch-src_Scene.cpp | 22 +++++++++++++++++++++
libSavitar/patches/patch-src_SceneNode.cpp | 27 ++++++++++++++++++++++++++
libSavitar/patches/patch-src_ThreeMFParser.h | 29 ++++++++++++++++++++++++++++
12 files changed, 226 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 73a5462258..d613f3b802 100644
--- a/Makefile
+++ b/Makefile
@@ -2003,6 +2003,7 @@ SUBDIR+= libArcus
SUBDIR+= libGenome
SUBDIR+= libLLVM
SUBDIR+= libLLVM38
+SUBDIR+= libSavitar
SUBDIR+= libXaw3dXft
SUBDIR+= libaec
SUBDIR+= libaio
diff --git a/libSavitar/DESCR b/libSavitar/DESCR
new file mode 100644
index 0000000000..e743513e0d
--- /dev/null
+++ b/libSavitar/DESCR
@@ -0,0 +1,2 @@
+libSavitar is a c++ implementation of 3mf loading with SIP python
+bindings.
diff --git a/libSavitar/Makefile b/libSavitar/Makefile
new file mode 100644
index 0000000000..742c9420aa
--- /dev/null
+++ b/libSavitar/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD$
+
+GITHUB_PROJECT= libSavitar
+GITHUB_TAG= 4.11.0
+DISTNAME= ${GITHUB_TAG}
+PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GITHUB:=Ultimaker/}
+DIST_SUBDIR= ${GITHUB_PROJECT}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://github.com/Ultimaker/libSavitar/
+COMMENT= C++ implementation of 3mf loading with SIP python bindings
+LICENSE= gnu-lgpl-v3
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+
+SUBST_CLASSES+= sip
+SUBST_STAGE.sip= pre-configure
+SUBST_MESSAGE.sip= Rename py-sip name.
+SUBST_FILES.sip= cmake/FindSIP.cmake
+SUBST_SED.sip= -e 's|\(SIP_EXECUTABLE sip\)|\1${PYVERSSUFFIX}|'
+
+PY_PATCHPLIST=YES
+.include "../../lang/python/extension.mk"
+.include "../../textproc/pugixml/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/libSavitar/PLIST b/libSavitar/PLIST
new file mode 100644
index 0000000000..1df006a498
--- /dev/null
+++ b/libSavitar/PLIST
@@ -0,0 +1,18 @@
+@comment $NetBSD$
+include/Savitar/Face.h
+include/Savitar/MeshData.h
+include/Savitar/Namespace.h
+include/Savitar/SavitarExport.h
+include/Savitar/Scene.h
+include/Savitar/SceneNode.h
+include/Savitar/ThreeMFParser.h
+include/Savitar/Types.h
+include/Savitar/Vertex.h
+lib/cmake/Savitar/Savitar-targets-noconfig.cmake
+lib/cmake/Savitar/Savitar-targets.cmake
+lib/cmake/Savitar/SavitarConfig.cmake
+lib/cmake/Savitar/SavitarConfigVersion.cmake
+lib/libSavitar.so
+lib/libSavitar.so.0
+lib/libSavitar.so.0.1.2
+${PYSITELIB}/Savitar.so
diff --git a/libSavitar/buildlink3.mk b/libSavitar/buildlink3.mk
new file mode 100644
index 0000000000..b8e199b429
--- /dev/null
+++ b/libSavitar/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= libSavitar
+
+.if !defined(LIBSAVITAR_BUILDLINK3_MK)
+LIBSAVITAR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libSavitar+= libSavitar>=4.11.0
+BUILDLINK_PKGSRCDIR.libSavitar?= ../../wip/libSavitar
+
+.include "../../x11/py-sip/buildlink3.mk"
+.endif # LIBSAVITAR_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libSavitar
diff --git a/libSavitar/distinfo b/libSavitar/distinfo
new file mode 100644
index 0000000000..5bccf7acb9
--- /dev/null
+++ b/libSavitar/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+BLAKE2s (libSavitar/4.11.0.tar.gz) = 3fe52bb9d0510087cc7b2494aa8b6c09dc2a64773815066e5589e22436a66abd
+SHA512 (libSavitar/4.11.0.tar.gz) = 4d2775e4d7bd1599a3884c6297918a16f0173726c00b1d9b7a9f91b620ee1bf75eb1ea9b7548be9848c9501ae849098cf3e0054344af2149b09a0465124726ce
+Size (libSavitar/4.11.0.tar.gz) = 100719 bytes
+SHA1 (patch-CMakeLists.txt) = ba38f18ee294393b64959907e004804634ce6d84
+SHA1 (patch-src_MeshData.cpp) = 0569b56d3e7e005bd82e32ceb473db137a482c51
+SHA1 (patch-src_Namespace.cpp) = 60fd4cae95dbbef303fedc9672f3d2f0d653cb90
+SHA1 (patch-src_Scene.cpp) = db8d6407d6b27ed99636a08fdc6d9007194800b7
+SHA1 (patch-src_SceneNode.cpp) = 5516686d6706bc555490b0e4a6b42a44848fa2fb
+SHA1 (patch-src_ThreeMFParser.h) = 2320985a95bff06484864d5196dab3949cee9ce0
diff --git a/libSavitar/patches/patch-CMakeLists.txt b/libSavitar/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..f1bdc0ec5c
--- /dev/null
+++ b/libSavitar/patches/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- CMakeLists.txt.orig 2020-10-09 16:43:31.000000000 +0000
++++ CMakeLists.txt
+@@ -15,7 +15,7 @@ if(BUILD_TESTS)
+ find_package(Threads QUIET)
+ endif()
+
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
+
+ if(BUILD_PYTHON)
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
diff --git a/libSavitar/patches/patch-src_MeshData.cpp b/libSavitar/patches/patch-src_MeshData.cpp
new file mode 100644
index 0000000000..882142d308
--- /dev/null
+++ b/libSavitar/patches/patch-src_MeshData.cpp
@@ -0,0 +1,29 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- src/MeshData.cpp.orig 2021-05-10 11:47:11.000000000 +0000
++++ src/MeshData.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include "MeshData.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <cstring>
+ #include <iostream>
+ #include <stdexcept> //For std::runtime_error.
+@@ -222,6 +222,3 @@ std::vector< Vertex > MeshData::getVerti
+ {
+ return vertices;
+ }
+-
+-
+-
diff --git a/libSavitar/patches/patch-src_Namespace.cpp b/libSavitar/patches/patch-src_Namespace.cpp
new file mode 100644
index 0000000000..d054de8315
--- /dev/null
+++ b/libSavitar/patches/patch-src_Namespace.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- src/Namespace.cpp.orig 2021-02-11 05:48:18.522781994 +0000
++++ src/Namespace.cpp
+@@ -3,7 +3,7 @@
+
+ #include "Namespace.h"
+
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+
+ namespace xml_namespace
+ {
diff --git a/libSavitar/patches/patch-src_Scene.cpp b/libSavitar/patches/patch-src_Scene.cpp
new file mode 100644
index 0000000000..c02b2936fb
--- /dev/null
+++ b/libSavitar/patches/patch-src_Scene.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- src/Scene.cpp.orig 2020-10-09 16:43:31.000000000 +0000
++++ src/Scene.cpp
+@@ -17,7 +17,7 @@
+ */
+
+ #include "Scene.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ #include <string>
+ using namespace Savitar;
diff --git a/libSavitar/patches/patch-src_SceneNode.cpp b/libSavitar/patches/patch-src_SceneNode.cpp
new file mode 100644
index 0000000000..a313c39e67
--- /dev/null
+++ b/libSavitar/patches/patch-src_SceneNode.cpp
@@ -0,0 +1,27 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- src/SceneNode.cpp.orig 2020-10-09 16:43:31.000000000 +0000
++++ src/SceneNode.cpp
+@@ -18,7 +18,7 @@
+
+ #include "SceneNode.h"
+ #include "Namespace.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ using namespace Savitar;
+
+@@ -200,4 +200,3 @@ std::vector< SceneNode*> SceneNode::getA
+ all_children.insert(all_children.end(), children.begin(), children.end());
+ return all_children;
+ }
+-
diff --git a/libSavitar/patches/patch-src_ThreeMFParser.h b/libSavitar/patches/patch-src_ThreeMFParser.h
new file mode 100644
index 0000000000..ab6a1881aa
--- /dev/null
+++ b/libSavitar/patches/patch-src_ThreeMFParser.h
@@ -0,0 +1,29 @@
+$NetBSD$
+
+https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch
+
+Do not vendor the pugixml library
+
+This prevents trying to co-install pugixml with existing system
+libraries, and also fixes the includes for pugixml.hpp to actually use
+the include path added by find_package/add_subdirectory instead of a
+hardcoded relative path.
+
+--- src/ThreeMFParser.h.orig 2020-10-09 16:43:31.000000000 +0000
++++ src/ThreeMFParser.h
+@@ -21,7 +21,7 @@
+
+ #include "SavitarExport.h"
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+
+ #include <string>
+ namespace Savitar
+@@ -44,4 +44,4 @@ namespace Savitar
+ std::string sceneToString(Scene scene);
+ };
+ }
+-#endif
+\ No newline at end of file
++#endif
Home |
Main Index |
Thread Index |
Old Index