diff options
| -rw-r--r-- | dev-libs/libsavitar/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch | 119 | ||||
| -rw-r--r-- | dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch | 60 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-3.4.1.ebuild | 44 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-3.6.0.ebuild | 44 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-4.2.0.ebuild | 44 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild | 52 |
7 files changed, 0 insertions, 367 deletions
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 43cd7300b997..4ffc1c2f7db4 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,6 +1,2 @@ -DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 -DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f -DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d -DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6 DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2 DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d diff --git a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch deleted file mode 100644 index 629e8edb51a2..000000000000 --- a/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 91aa70c6320461ae65600dce954b5ffb905b7039 Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Mon, 9 Apr 2018 12:36:35 -0400 -Subject: [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 | 3 +- - pugixml/CMakeLists.txt | 80 - - pugixml/src/pugiconfig.hpp | 74 - - pugixml/src/pugixml.cpp | 12622 ------------------------------------------- - pugixml/src/pugixml.hpp | 1434 ----- - src/MeshData.cpp | 7 +- - src/Scene.cpp | 2 +- - src/SceneNode.cpp | 3 +- - src/ThreeMFParser.h | 4 +- - 9 files changed, 7 insertions(+), 14222 deletions(-) - delete mode 100644 pugixml/CMakeLists.txt - delete mode 100644 pugixml/src/pugiconfig.hpp - delete mode 100644 pugixml/src/pugixml.cpp - delete mode 100644 pugixml/src/pugixml.hpp - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5e991a7..1077c7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,8 +7,7 @@ include(CMakePackageConfigHelpers) - option(BUILD_PYTHON "Build " ON) - option(BUILD_STATIC "Build as a static library" OFF) - -- --add_subdirectory(pugixml) -+find_package(pugixml REQUIRED) - - if(BUILD_PYTHON) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -diff --git a/src/MeshData.cpp b/src/MeshData.cpp -index 03e5089..701122d 100644 ---- a/src/MeshData.cpp -+++ b/src/MeshData.cpp -@@ -17,7 +17,7 @@ - */ - - #include "MeshData.h" --#include "../pugixml/src/pugixml.hpp" -+#include <pugixml.hpp> - #include <iostream> - - using namespace Savitar; -@@ -85,7 +85,7 @@ bytearray MeshData::getFlatVerticesAsBytes() - int v1 = faces.at(i).getV1(); - int v2 = faces.at(i).getV2(); - int v3 = faces.at(i).getV3(); -- -+ - // Add vertices for face 1 - float x = vertices.at(v1).getX(); - float y = vertices.at(v1).getY(); -@@ -188,6 +188,3 @@ std::vector< Vertex > MeshData::getVertices() - { - return vertices; - } -- -- -- -diff --git a/src/Scene.cpp b/src/Scene.cpp -index 4612f78..f218b71 100644 ---- a/src/Scene.cpp -+++ b/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/src/SceneNode.cpp b/src/SceneNode.cpp -index 5c95b6f..c4782bc 100644 ---- a/src/SceneNode.cpp -+++ b/src/SceneNode.cpp -@@ -17,7 +17,7 @@ - */ - - #include "SceneNode.h" --#include "../pugixml/src/pugixml.hpp" -+#include <pugixml.hpp> - #include <iostream> - using namespace Savitar; - -@@ -121,4 +121,3 @@ std::vector< SceneNode*> SceneNode::getAllChildren() - } - return all_children; - } -- -diff --git a/src/ThreeMFParser.h b/src/ThreeMFParser.h -index 3394683..89da659 100644 ---- a/src/ThreeMFParser.h -+++ b/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 diff --git a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch deleted file mode 100644 index 1d5744aebf06..000000000000 --- a/dev-libs/libsavitar/files/libsavitar-4.2.0-remove-packaged-pugixml.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt ---- libSavitar-4.2.0_old/CMakeLists.txt 2019-07-30 09:03:53.000000000 +0300 -+++ libSavitar-4.2.0/CMakeLists.txt 2019-08-04 17:23:27.099395645 +0300 -@@ -15,7 +15,7 @@ - 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 -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp ---- libSavitar-4.2.0_old/src/MeshData.cpp 2019-07-30 09:03:53.000000000 +0300 -+++ libSavitar-4.2.0/src/MeshData.cpp 2019-08-04 17:23:59.891051757 +0300 -@@ -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. -diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp ---- libSavitar-4.2.0_old/src/Scene.cpp 2019-07-30 09:03:53.000000000 +0300 -+++ libSavitar-4.2.0/src/Scene.cpp 2019-08-04 17:24:10.425265944 +0300 -@@ -17,7 +17,7 @@ - */ - - #include "Scene.h" --#include "../pugixml/src/pugixml.hpp" -+#include <pugixml.hpp> - #include <iostream> - #include <string> - using namespace Savitar; -diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp ---- libSavitar-4.2.0_old/src/SceneNode.cpp 2019-07-30 09:03:53.000000000 +0300 -+++ libSavitar-4.2.0/src/SceneNode.cpp 2019-08-04 17:24:31.617696840 +0300 -@@ -17,7 +17,7 @@ - */ - - #include "SceneNode.h" --#include "../pugixml/src/pugixml.hpp" -+#include <pugixml.hpp> - #include <iostream> - using namespace Savitar; - -diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h ---- libSavitar-4.2.0_old/src/ThreeMFParser.h 2019-07-30 09:03:53.000000000 +0300 -+++ libSavitar-4.2.0/src/ThreeMFParser.h 2019-08-04 17:24:53.996151843 +0300 -@@ -21,7 +21,7 @@ - - #include "SavitarExport.h" - #include "SceneNode.h" --#include "../pugixml/src/pugixml.hpp" -+#include <pugixml.hpp> - - #include <string> - namespace Savitar diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild deleted file mode 100644 index 1ee1e2a50841..000000000000 --- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 - -MY_PN="libSavitar" - -DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" -HOMEPAGE="https://github.com/Ultimaker/libSavitar" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="+python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure -} diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild deleted file mode 100644 index 1ee1e2a50841..000000000000 --- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 - -MY_PN="libSavitar" - -DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" -HOMEPAGE="https://github.com/Ultimaker/libSavitar" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="+python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-3.3.0-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - use python && mycmakeargs+=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure -} diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild deleted file mode 100644 index 55f2b677a7ef..000000000000 --- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit cmake python-single-r1 - -MY_PN="libSavitar" - -DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" -HOMEPAGE="https://github.com/Ultimaker/libSavitar" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="+python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - - cmake_src_configure -} diff --git a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild deleted file mode 100644 index 599349de9add..000000000000 --- a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit cmake python-single-r1 - -MY_PN="libSavitar" - -DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" -HOMEPAGE="https://github.com/Ultimaker/libSavitar" -SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/3" -KEYWORDS="~amd64 ~x86" -IUSE="+python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/pugixml - $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ')" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Find SIP for current python version, not the latest installed - sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die - sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - - cmake_src_configure -} |