From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 May 2020 11:44:06 +0100 Subject: gentoo resync : 30.05.2020 --- dev-libs/libsavitar/Manifest | 3 ++ .../libsavitar-4.6.1-remove-packaged-pugixml.patch | 60 ++++++++++++++++++++++ dev-libs/libsavitar/libsavitar-4.6.1.ebuild | 53 +++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch create mode 100644 dev-libs/libsavitar/libsavitar-4.6.1.ebuild (limited to 'dev-libs/libsavitar') diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 9bf7c16d6e94..00fc61628655 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,11 +1,14 @@ AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459 +AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441 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 EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9 EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9 EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6 EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78 +EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c 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 new file mode 100644 index 000000000000..b1b77469d740 --- /dev/null +++ b/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch @@ -0,0 +1,60 @@ +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 + #include + #include + #include //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 + #include + #include + 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 + #include + 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 + + #include + namespace Savitar diff --git a/dev-libs/libsavitar/libsavitar-4.6.1.ebuild b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild new file mode 100644 index 000000000000..8c07045e9b5f --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild @@ -0,0 +1,53 @@ +# 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 +} -- cgit v1.2.3