diff options
Diffstat (limited to 'dev-libs/libsavitar')
| -rw-r--r-- | dev-libs/libsavitar/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch | 60 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-4.6.1.ebuild | 53 | ||||
| -rw-r--r-- | dev-libs/libsavitar/libsavitar-4.8.0.ebuild | 76 |
4 files changed, 78 insertions, 116 deletions
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 8b1791fab200..90c095f23218 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,7 +1,6 @@ -AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72 -DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2 DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d -EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c +DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c EBUILD libsavitar-4.7.0.ebuild 1753 BLAKE2B 83e91f17eacb614bdfc25f75bfc3bf25fb79e5bf332aa3246c161beaf0894feb9d8990ffd4a5361b7f1b1a359351d2321f2f90a31fe982a6f6bcd0f8ac5297b2 SHA512 313398f3ee57a42ed7e572d6befe1f5b7da862ae8b51b88cf95cbda95f00b8bdb10609f7c507fda8a8a7198c16138489cbc4b59166d578f6c8b35d1bc70ed493 +EBUILD libsavitar-4.8.0.ebuild 1753 BLAKE2B 83e91f17eacb614bdfc25f75bfc3bf25fb79e5bf332aa3246c161beaf0894feb9d8990ffd4a5361b7f1b1a359351d2321f2f90a31fe982a6f6bcd0f8ac5297b2 SHA512 313398f3ee57a42ed7e572d6befe1f5b7da862ae8b51b88cf95cbda95f00b8bdb10609f7c507fda8a8a7198c16138489cbc4b59166d578f6c8b35d1bc70ed493 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304 diff --git a/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch deleted file mode 100644 index b1b77469d740..000000000000 --- a/dev-libs/libsavitar/files/libsavitar-4.6.1-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 -@@ -18,7 +18,7 @@ - - #include "SceneNode.h" - #include "Namespace.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-4.6.1.ebuild b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild deleted file mode 100644 index 8c07045e9b5f..000000000000 --- a/dev-libs/libsavitar/libsavitar-4.6.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -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.6.1-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 -} diff --git a/dev-libs/libsavitar/libsavitar-4.8.0.ebuild b/dev-libs/libsavitar/libsavitar-4.8.0.ebuild new file mode 100644 index 000000000000..3afa1673bb74 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.8.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) + +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 ~arm64 ~x86" + +IUSE="+python static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/pugixml + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" + +DEPEND="${RDEPEND} + test? ( + dev-cpp/gtest + dev-cpp/tbb + )" + +S="${WORKDIR}/${MY_PN}-${PV}" +BUILD_DIR="${S}/build" + +PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # remove bundled pugixml + rm -r "${S}"/pugixml || die + + find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \ + -e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die + + if use test; then + find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \ + -e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die + fi + + # find SIP for current python version, not the latest installed + sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \ + CMakeLists.txt cmake/FindSIP.cmake || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PYTHON=$(usex python ON OFF) + -DBUILD_STATIC=$(usex static-libs ON OFF) + -DBUILD_TESTS=$(usex test ON OFF) + ) + + cmake_src_configure +} + +src_test() { + cmake_src_test +} |