[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 75d5d8ef587c6cd27d010ea00d538d8c53d82758 Author: Matthew Smith gentoo org> AuthorDate: Sat Jul 9 10:50:22 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sat Jul 9 10:52:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d5d8ef dev-libs/libsavitar: update maintainers Remove inactive proxy-maintainer and 3dprint project member. Signed-off-by: Matthew Smith gentoo.org> dev-libs/libsavitar/metadata.xml | 8 1 file changed, 8 deletions(-) diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml index aae28f3e766e..7e62fc47fc34 100644 --- a/dev-libs/libsavitar/metadata.xml +++ b/dev-libs/libsavitar/metadata.xml @@ -5,10 +5,6 @@ 3dpr...@gentoo.org Gentoo 3D Printer Project - - ale...@gentoo.org - Alexey Shvetsov - proxy-ma...@gentoo.org Proxy Maintainers @@ -17,10 +13,6 @@ ma...@vanvoorden.be Mathy Vanvoorden - - perlo...@gmail.com - Michael Perlov - soname major version number
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 075338fbbc65bb8a8168ff42858cacbf7983698d Author: Michał Górny gentoo org> AuthorDate: Mon May 9 06:59:13 2022 + Commit: Michał Górny gentoo org> CommitDate: Mon May 9 07:00:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075338fb dev-libs/libsavitar: Remove old Signed-off-by: Michał Górny gentoo.org> dev-libs/libsavitar/Manifest | 2 - dev-libs/libsavitar/libsavitar-4.12.1.ebuild | 76 dev-libs/libsavitar/libsavitar-4.9.1.ebuild | 76 3 files changed, 154 deletions(-) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 6555c1203b66..0d74511ddfbb 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,3 +1 @@ -DIST libsavitar-4.12.1.tar.gz 100730 BLAKE2B cb9dd3ed6802e88235769f70092dbd50113d107b3d2ec17851120338ad6b6ee809c1243f406ee0c96358e5e618d883640e2c3ff9c7f3b41fa6e3a4993939c044 SHA512 c848730cca44b942cd0aba343880a68b23f1bfe95b3348cf1d9d490d9a99be3db9d1940ae473a74ad695823404fab86b728327783c8cc3cfb04ebff8cc6a1b3c DIST libsavitar-4.13.0.tar.gz 100723 BLAKE2B d631c572e20fcf92cb2053959fad7c806b18981eaad7a0ad1efb52870a7f5874459d4012a7583be8bcdd7cbfad863dea9c4f8c13579269db3ea3a3cf92383b4f SHA512 a446131c0bbcc34e55c093032af823b9750797f06297bea9fd4d64838e793811e71679a1f6ae99be9fc9382a23e8763140147c7a6eea0a310f6f2d40b53be3bf -DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44 diff --git a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild deleted file mode 100644 index dc295a503afe.. --- a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -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 ' -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" 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 -} diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild deleted file mode 100644 index 263cdd5d1947.. --- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -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 ' -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" 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=( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: fb23f551e4eb201d68b20b9504a4da13ab1e4b25 Author: Sam James gentoo org> AuthorDate: Sun May 8 19:59:02 2022 + Commit: Sam James gentoo org> CommitDate: Sun May 8 19:59:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb23f551 dev-libs/libsavitar: Stabilize 4.13.0 amd64, #837179 Signed-off-by: Sam James gentoo.org> dev-libs/libsavitar/libsavitar-4.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild index 6d2bdda023f0..dc295a503afe 100644 --- a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-3" SLOT="0/3" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+python static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 83cac257e712e2583e6fd427ac60cdde51729625 Author: Jakov Smolić gentoo org> AuthorDate: Thu Mar 10 21:20:42 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Mar 10 21:20:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cac257 dev-libs/libsavitar: Stabilize 4.12.1 amd64, #834389 Signed-off-by: Jakov Smolić gentoo.org> dev-libs/libsavitar/libsavitar-4.12.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild index 6d2bdda023f0..dc295a503afe 100644 --- a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-3" SLOT="0/3" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+python static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 36b9de35119da3e030f403f92e645c6d05615cf4 Author: Matthew Smith gentoo org> AuthorDate: Mon Feb 28 19:15:27 2022 + Commit: Matthew Smith gentoo org> CommitDate: Mon Feb 28 19:43:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b9de35 dev-libs/libsavitar: add 4.13.0 Signed-off-by: Matthew Smith gentoo.org> dev-libs/libsavitar/Manifest | 1 + dev-libs/libsavitar/libsavitar-4.13.0.ebuild | 76 2 files changed, 77 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 5552ae1dd08e..6555c1203b66 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,2 +1,3 @@ DIST libsavitar-4.12.1.tar.gz 100730 BLAKE2B cb9dd3ed6802e88235769f70092dbd50113d107b3d2ec17851120338ad6b6ee809c1243f406ee0c96358e5e618d883640e2c3ff9c7f3b41fa6e3a4993939c044 SHA512 c848730cca44b942cd0aba343880a68b23f1bfe95b3348cf1d9d490d9a99be3db9d1940ae473a74ad695823404fab86b728327783c8cc3cfb04ebff8cc6a1b3c +DIST libsavitar-4.13.0.tar.gz 100723 BLAKE2B d631c572e20fcf92cb2053959fad7c806b18981eaad7a0ad1efb52870a7f5874459d4012a7583be8bcdd7cbfad863dea9c4f8c13579269db3ea3a3cf92383b4f SHA512 a446131c0bbcc34e55c093032af823b9750797f06297bea9fd4d64838e793811e71679a1f6ae99be9fc9382a23e8763140147c7a6eea0a310f6f2d40b53be3bf DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44 diff --git a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild new file mode 100644 index ..6d2bdda023f0 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +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 ' +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" 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 63f570332c1d3f5cafaa76a3fb3304749f38d4b3 Author: Marek Szuba gentoo org> AuthorDate: Thu Feb 10 13:15:03 2022 + Commit: Marek Szuba gentoo org> CommitDate: Thu Feb 10 17:35:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f57033 dev-libs/libsavitar: add 4.12.1 Signed-off-by: Marek Szuba gentoo.org> dev-libs/libsavitar/Manifest | 1 + dev-libs/libsavitar/libsavitar-4.12.1.ebuild | 76 2 files changed, 77 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index ed39d1abd712..5552ae1dd08e 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1 +1,2 @@ +DIST libsavitar-4.12.1.tar.gz 100730 BLAKE2B cb9dd3ed6802e88235769f70092dbd50113d107b3d2ec17851120338ad6b6ee809c1243f406ee0c96358e5e618d883640e2c3ff9c7f3b41fa6e3a4993939c044 SHA512 c848730cca44b942cd0aba343880a68b23f1bfe95b3348cf1d9d490d9a99be3db9d1940ae473a74ad695823404fab86b728327783c8cc3cfb04ebff8cc6a1b3c DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44 diff --git a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild new file mode 100644 index ..6d2bdda023f0 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +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 ' +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" 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: b5a603385d321f5ee64faeb97843f3f78f062e5e Author: Arthur Zamarin gentoo org> AuthorDate: Tue Nov 2 07:11:31 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Nov 2 08:38:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a60338 dev-libs/libsavitar: enable py3.10 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/libsavitar/libsavitar-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild index c2659976510..263cdd5d194 100644 --- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 7346c0ab432a2777bd255580eabcd4debead13ef Author: Mathy Vanvoorden vanvoorden be> AuthorDate: Mon Jun 7 15:48:55 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Thu Jun 10 17:40:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7346c0ab dev-libs/libsavitar: Version bump to 4.9.1 Closes: https://bugs.gentoo.org/793803 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Mathy Vanvoorden vanvoorden.be> Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-4.9.1.ebuild | 76 + 2 files changed, 77 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index fa69039eb88..9f6888baa8a 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1 +1,2 @@ DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c +DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44 diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild new file mode 100644 index 000..999341bf1c3 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +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 ' +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" 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 29c522744907dcf681a553a26b5ea5f2c4b5f01d Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Jun 1 18:11:03 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Jun 1 18:28:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c52274 dev-libs/libsavitar: restrict to gentoo.org> dev-libs/libsavitar/libsavitar-4.8.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libsavitar/libsavitar-4.8.0.ebuild b/dev-libs/libsavitar/libsavitar-4.8.0.ebuild index e1b8a3b218f..88ae7dac640 100644 --- a/dev-libs/libsavitar/libsavitar-4.8.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: fb1d7ff481eee3d461fda1092db71e85f03f5c48 Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 18:58:48 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 21:30:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1d7ff4 dev-libs/libsavitar: drop old Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libsavitar/Manifest| 1 - dev-libs/libsavitar/libsavitar-4.7.0.ebuild | 76 - 2 files changed, 77 deletions(-) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index bae2e51e170..fa69039eb88 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,2 +1 @@ -DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild deleted file mode 100644 index e1b8a3b218f..000 --- a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{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 ~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" 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" 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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/, media-gfx/cura/, media-gfx/fdm-materials/, ...
commit: fff03732e39bdd6b5f471108de3078ad0e781990 Author: Dennis Lamm gentoo org> AuthorDate: Sun Nov 29 20:35:51 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Mon Nov 30 18:37:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff03732 media-gfx/cura: drop old with dependencies Signed-off-by: Dennis Lamm gentoo.org> Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libarcus/Manifest | 1 - dev-libs/libarcus/libarcus-4.6.1.ebuild| 56 dev-libs/libcharon/Manifest| 1 - dev-libs/libcharon/libcharon-4.6.1.ebuild | 36 -- dev-libs/libsavitar/Manifest | 1 - .../libsavitar-4.6.1-remove-packaged-pugixml.patch | 60 - dev-libs/libsavitar/libsavitar-4.6.1.ebuild| 53 --- dev-python/uranium/Manifest| 1 - .../files/uranium-4.6.1-fix-install-paths.patch| 32 - dev-python/uranium/uranium-4.6.1.ebuild| 76 -- media-gfx/cura/Manifest| 1 - media-gfx/cura/cura-4.6.1-r1.ebuild| 57 media-gfx/cura/cura-4.7.0.ebuild | 57 media-gfx/curaengine/Manifest | 1 - media-gfx/curaengine/curaengine-4.6.1.ebuild | 45 - media-gfx/fdm-materials/Manifest | 1 - .../fdm-materials/fdm-materials-4.6.1-r1.ebuild| 26 17 files changed, 505 deletions(-) diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest index 9bba1d63eee..0034e25089c 100644 --- a/dev-libs/libarcus/Manifest +++ b/dev-libs/libarcus/Manifest @@ -1,3 +1,2 @@ -DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250 DIST libarcus-4.7.0.tar.gz 31944 BLAKE2B 93cd7e8dab674b1e145c0fd15bcc8901982e9c26f82fa5b6b9582568701b70edeb1a589e1e1c94f9e14100d08b12580e58aa1724917b88f9c099f12ca47e4e57 SHA512 5eb8e84ff8e87966fc3ff1d71ec69f8fece493e25e022f7f1ba7ef218e75b5be86cededc28faf57634b09617990f62247e6cd6f373f940cf145ee6d8e8635374 DIST libarcus-4.8.0.tar.gz 31906 BLAKE2B 677fafa3875834c7602bc85b7246f50ed0dc49e886814c4562ce41a1a7baecfb4fb0bac42aada5339fe73cbd3fc5ac3b28076bf72a1e24591a947d747c6eb794 SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 diff --git a/dev-libs/libarcus/libarcus-4.6.1.ebuild b/dev-libs/libarcus/libarcus-4.6.1.ebuild deleted file mode 100644 index a1481fb098b..000 --- a/dev-libs/libarcus/libarcus-4.6.1.ebuild +++ /dev/null @@ -1,56 +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="libArcus" - -DESCRIPTION="This library facilitates communication between Cura and its backend" -HOMEPAGE="https://github.com/Ultimaker/libArcus; -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="examples +python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - dev-libs/protobuf:= - $(python_gen_cond_dep ' - dev-python/sip[${PYTHON_MULTI_USEDEP}] - python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] ) - ')" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # 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_EXAMPLES=$(usex examples ON OFF) - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_STATIC=$(usex static-libs ON OFF) - ) - - cmake_src_configure -} diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest index 4a508101123..d3b41bfd4d5 100644 --- a/dev-libs/libcharon/Manifest +++ b/dev-libs/libcharon/Manifest @@ -1,3 +1,2 @@ -DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B 43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3 SHA512
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: de524be6a9e3e4c69dda24d5c3d00e273cd0a729 Author: Dennis Lamm gentoo org> AuthorDate: Sun Nov 29 08:58:25 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Mon Nov 30 18:37:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de524be6 dev-libs/libsavitar: bump to 4.8.0 Signed-off-by: Dennis Lamm gentoo.org> Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-4.8.0.ebuild | 76 + 2 files changed, 77 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 4ffc1c2f7db..393650d2b34 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,2 +1,3 @@ DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2 DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d +DIST libsavitar-4.8.0.tar.gz 99030 BLAKE2B a1c1e252aa942114a1d7112d2e661b5e63403502642826c6b92c408c8eabd3d9fb12b44dc286f9a0dce3d42f473adae2441d357f237c903c8a0df936c41f9f37 SHA512 65d31986b120c9e717b10d0bac420f2582d9f1b44051d88f89475408d1f7997e144001c61f180eac554de33f1f8c1ec9555a6c23bdd797315624f57030f7ec8c 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 000..3afa1673bb7 --- /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" 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" 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/, dev-libs/libsavitar/files/
commit: 5690217f2d1d752d54046e21cfdddc902d6256b3 Author: Dennis Lamm gentoo org> AuthorDate: Sun Oct 11 11:08:30 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Oct 11 11:25:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5690217f dev-libs/libsavitar: drop old Signed-off-by: Dennis Lamm gentoo.org> Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libsavitar/Manifest | 4 - .../libsavitar-3.3.0-remove-packaged-pugixml.patch | 119 - .../libsavitar-4.2.0-remove-packaged-pugixml.patch | 60 --- dev-libs/libsavitar/libsavitar-3.4.1.ebuild| 44 dev-libs/libsavitar/libsavitar-3.6.0.ebuild| 44 dev-libs/libsavitar/libsavitar-4.2.0.ebuild| 44 dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild | 52 - 7 files changed, 367 deletions(-) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 43cd7300b99..4ffc1c2f7db 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 bfb4e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 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 629e8edb51a..000 --- 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 -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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: ac29722c546e435904dc208ad0f5ae837732500f Author: Sam James gentoo org> AuthorDate: Sat Sep 19 16:31:50 2020 + Commit: Sam James gentoo org> CommitDate: Sat Sep 19 16:31:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac29722c dev-libs/libsavitar: Keyword 4.7.0 arm64, #734826 Signed-off-by: Sam James gentoo.org> dev-libs/libsavitar/libsavitar-4.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild index 485ab1b9b93..3afa1673bb7 100644 --- a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-3" SLOT="0/3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="+python static-libs test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/, dev-libs/libsavitar/files/
commit: 15fa3b89ddced40cae0ca6025ba214a96ba634ae Author: Dennis Lamm gentoo org> AuthorDate: Sun Aug 30 14:52:54 2020 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Aug 30 18:37:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fa3b89 dev-libs/libsavitar: version bump 4.7.0 Signed-off-by: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/17336 Signed-off-by: Dennis Lamm gentoo.org> dev-libs/libsavitar/Manifest | 1 + .../libsavitar-4.7.0-use-system-pugixml.patch | 8 +++ dev-libs/libsavitar/libsavitar-4.7.0.ebuild| 76 ++ 3 files changed, 85 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index a4c6a4380d0..43cd7300b99 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -3,3 +3,4 @@ DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b6 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb4e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 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-4.7.0-use-system-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch new file mode 100644 index 000..cd9406da928 --- /dev/null +++ b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -15,7 +15,7 @@ + find_package(Threads QUIET) + endif() + +-add_subdirectory(pugixml) ++find_package(pugixml REQUIRED) diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild new file mode 100644 index 000..485ab1b9b93 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.7.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 ~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" 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" 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/files/, dev-libs/libsavitar/
commit: 52eda6c286c51c206fc8e17c86243e0e73f156e6 Author: Michael Perlov gmail com> AuthorDate: Fri May 22 00:50:06 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Mon May 25 19:41:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52eda6c2 dev-libs/libsavitar: version bump to 4.6.1 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Perlov gmail.com> Signed-off-by: Alexey Shvetsov gentoo.org> dev-libs/libsavitar/Manifest | 1 + .../libsavitar-4.6.1-remove-packaged-pugixml.patch | 60 ++ dev-libs/libsavitar/libsavitar-4.6.1.ebuild| 53 +++ 3 files changed, 114 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index de4dfc57d70..a4c6a4380d0 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -2,3 +2,4 @@ DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb4e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 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 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 000..b1b77469d74 --- /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.txt2019-07-30 09:03:53.0 +0300 libSavitar-4.2.0/CMakeLists.txt2019-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.0 +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.0 +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.0 +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.0 +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 000..8c07045e9b5 --- /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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 45bfede2de14b807917756292b7d8de67fa4daa2 Author: Michał Górny gentoo org> AuthorDate: Fri Feb 7 12:55:44 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 16:17:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bfede2 dev-libs/libsavitar: Switch to PYTHON_MULTI_USEDEP API Signed-off-by: Michał Górny gentoo.org> dev-libs/libsavitar/libsavitar-3.4.1.ebuild | 4 +++- dev-libs/libsavitar/libsavitar-3.6.0.ebuild | 4 +++- dev-libs/libsavitar/libsavitar-4.2.0.ebuild | 4 +++- .../{libsavitar-4.3.0.ebuild => libsavitar-4.3.0-r1.ebuild} | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild index d9ecc72540b..1ee1e2a5084 100644 --- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild index d9ecc72540b..1ee1e2a5084 100644 --- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild index 26c10c69fca..55f2b677a7e 100644 --- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}" diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild similarity index 94% rename from dev-libs/libsavitar/libsavitar-4.3.0.ebuild rename to dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild index 1b2ed0ae3c2..599349de9ad 100644 --- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild @@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} dev-libs/pugixml - dev-python/sip[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + dev-python/sip[${PYTHON_MULTI_USEDEP}] + ')" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 79c8cc57487541ba7ff75ce2b5c50df5266014c6 Author: Michael Perlov gmail com> AuthorDate: Sat Sep 28 10:28:38 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 16 05:21:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c8cc57 dev-libs/libsavitar: version bump to 4.3.0 Closes: https://bugs.gentoo.org/692862 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Michael Perlov gmail.com> Signed-off-by: Joonas Niilola gentoo.org> dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-4.3.0.ebuild | 50 + 2 files changed, 51 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 5fb817cd709..de4dfc57d70 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,3 +1,4 @@ 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 bfb4e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d +DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6 diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild new file mode 100644 index 000..7673c5d7e05 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,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 + dev-python/sip[${PYTHON_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-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PYTHON=$(usex python ON OFF) + -DBUILD_STATIC=$(usex static-libs ON OFF) + ) + + cmake-utils_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/files/, dev-libs/libsavitar/
commit: eb80aea53d46e8519e1c6707bc0db27d94596607 Author: Michael Perlov gmail com> AuthorDate: Sun Aug 4 16:06:11 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Aug 25 17:59:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb80aea5 dev-libs/libsavitar: version bump to 4.2.0 Package-Manager: Portage-2.3.70, Repoman-2.3.16 Signed-off-by: Michael Perlov gmail.com> Signed-off-by: Joonas Niilola gentoo.org> dev-libs/libsavitar/Manifest | 1 + .../libsavitar-4.2.0-remove-packaged-pugixml.patch | 60 ++ dev-libs/libsavitar/libsavitar-4.2.0.ebuild| 42 +++ 3 files changed, 103 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index e0e19f26961..5fb817cd709 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,2 +1,3 @@ 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 bfb4e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d 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 new file mode 100644 index 000..1d5744aebf0 --- /dev/null +++ b/dev-libs/libsavitar/files/libsavitar-4.2.0-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.txt2019-07-30 09:03:53.0 +0300 libSavitar-4.2.0/CMakeLists.txt2019-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.0 +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.0 +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.0 +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 + #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.0 +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.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild new file mode 100644 index 000..d29e528448e --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,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"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: b59fc0ae61c6ed02d293d2030d190a9d7f1cfe5b Author: Amy Liffey gentoo org> AuthorDate: Wed Jan 2 22:01:37 2019 + Commit: Amy Liffey gentoo org> CommitDate: Wed Jan 2 22:04:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59fc0ae dev-libs/libsavitar: remove old 3.3.0, 3.5.1 Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-libs/libsavitar/Manifest | 2 -- dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild | 42 -- dev-libs/libsavitar/libsavitar-3.5.1.ebuild| 42 -- 3 files changed, 86 deletions(-) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index b71b831f314..e0e19f26961 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,4 +1,2 @@ -DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 -DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f diff --git a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild deleted file mode 100644 index 4b686c7e432..000 --- a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_5,3_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 - dev-python/sip[${PYTHON_USEDEP}]" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( "${FILESDIR}"/${P}-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.5.1.ebuild b/dev-libs/libsavitar/libsavitar-3.5.1.ebuild deleted file mode 100644 index 939a582d09b..000 --- a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{5,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 - dev-python/sip[${PYTHON_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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 496b36b53f88fc634bdcdf751824cbd75a282949 Author: Mathy Vanvoorden vanvoorden be> AuthorDate: Sat Dec 8 22:43:26 2018 + Commit: Amy Liffey gentoo org> CommitDate: Wed Jan 2 21:48:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496b36b5 dev-libs/libsavitar: version bump to 3.6.0 Signed-off-by: Mathy Vanvoorden vanvoorden.be> Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage[mgorny]-2.3.51.1 dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-3.6.0.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index 88e825a6433..b71b831f314 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,3 +1,4 @@ DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524 +DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild new file mode 100644 index 000..939a582d09b --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,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 + dev-python/sip[${PYTHON_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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: e5c6d60f2f31f71064e5b313f72720e9e3234bba Author: Amy Liffey gentoo org> AuthorDate: Sun Nov 18 17:09:58 2018 + Commit: Amy Liffey gentoo org> CommitDate: Sun Nov 18 17:09:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c6d60f dev-libs/libsavitar: version bump 3.5.1 Bug: https://bugs.gentoo.org/669264 Submitted-by: qwertyqwertyq protonmail.com Signed-off-by: Amy Liffey gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-3.5.1.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index d12ef4cb5f5..88e825a6433 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1,2 +1,3 @@ DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 +DIST libsavitar-3.5.1.tar.gz 92456 BLAKE2B 6b7b533af744d3e9c59aae2338cb050cc44240969f07184d311fc1778487e230459cee4684d863a582c52ced34aa5e42bc6b7816ad5d8560f107ae6373f2aebb SHA512 740c3df1a0ae5bc406d1ac555d5952f9d1d49089d8b0eda9c4fafdf3c902f44b7a137906aa5a00ef0ea46d9f76409baf62a26c269d8401abcc642d36a2f7b524 diff --git a/dev-libs/libsavitar/libsavitar-3.5.1.ebuild b/dev-libs/libsavitar/libsavitar-3.5.1.ebuild new file mode 100644 index 000..939a582d09b --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-3.5.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,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 + dev-python/sip[${PYTHON_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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: f0a734e109a743eab528a01efe06f23a04a3905f Author: Michael Perlov gmail com> AuthorDate: Thu Jul 12 10:21:12 2018 + Commit: Amy Liffey gentoo org> CommitDate: Mon Jul 16 17:02:21 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a734e1 dev-libs/libsavitar: version bump to 3.4.1 Bug: https://bugs.gentoo.org/660884 Package-Manager: Portage-2.3.42, Repoman-2.3.9 dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-3.4.1.ebuild | 42 + 2 files changed, 43 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest index f7b6846a7b5..d12ef4cb5f5 100644 --- a/dev-libs/libsavitar/Manifest +++ b/dev-libs/libsavitar/Manifest @@ -1 +1,2 @@ DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba +DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35 diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild new file mode 100644 index 000..19171d1a74e --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{5,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 + dev-python/sip[${PYTHON_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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: 56a1f4dae7e513a6772e37dd8849afbe064a97eb Author: Michael Perlov gmail com> AuthorDate: Sat Jun 16 08:08:03 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Jun 17 21:24:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a1f4da dev-libs/libsavitar: use system pugixml Closes: https://bugs.gentoo.org/658204 Closes: https://github.com/gentoo/gentoo/pull/8851 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild index 3aca6609e16..4b686c7e432 100644 --- a/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild @@ -19,6 +19,7 @@ IUSE="+python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} + dev-libs/pugixml dev-python/sip[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/, dev-libs/libsavitar/files/
commit: 7855f572f7b201eebe1476a9dc01ec2726f8ce88 Author: Mathy Vanvoorden vanvoorden be> AuthorDate: Thu Jun 14 21:15:04 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Fri Jun 15 11:09:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7855f572 dev-libs/libsavitar: use pugixml from system resolving file collision Upstream put pugixml inside the distribution and it is built and installed alongside with the library. This results in file collisions when pugixml is already installed on the system. Existing upstream pull request: https://github.com/Ultimaker/libSavitar/pull/8 This commit applies that pull request as a patch. I modified the patch slightly to not include the actual deletion of the library and only apply the needed changes to the rest of the library. I did this because otherwise the filesize was bigger than the portage limit. Closes: https://bugs.gentoo.org/658112 Closes: https://github.com/gentoo/gentoo/pull/8846 Package-Manager: Portage[mgorny]-2.3.36.1 .../libsavitar-3.3.0-remove-packaged-pugixml.patch | 119 + ...tar-3.3.0.ebuild => libsavitar-3.3.0-r1.ebuild} | 2 + 2 files changed, 121 insertions(+) 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 new file mode 100644 index 000..629e8edb51a --- /dev/null +++ b/dev-libs/libsavitar/files/libsavitar-3.3.0-remove-packaged-pugixml.patch @@ -0,0 +1,119 @@ +From 91aa70c6320461ae65600dce954b5ffb905b7039 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +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 + #include + + 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 + #include + #include + 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 + #include + 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 + + #include + 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/libsavitar-3.3.0.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0-r1.ebuild similarity index 93% rename from
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: da5d8e20d171c5998a8f3703c42193ab8f7e3856 Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Jun 14 19:58:22 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Jun 14 20:13:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5d8e20 dev-libs/libsavitar: metadata update Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libsavitar/libsavitar-3.3.0.ebuild | 2 +- dev-libs/libsavitar/metadata.xml| 40 +++-- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dev-libs/libsavitar/libsavitar-3.3.0.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0.ebuild index 8506fac4bb7..7a46bfd8a4a 100644 --- a/dev-libs/libsavitar/libsavitar-3.3.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-3.3.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="LGPL-3" SLOT="0/3" KEYWORDS="~amd64 ~x86" -IUSE="python static-libs" +IUSE="+python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} diff --git a/dev-libs/libsavitar/metadata.xml b/dev-libs/libsavitar/metadata.xml index fe13ca85a30..3ed5b1ace79 100644 --- a/dev-libs/libsavitar/metadata.xml +++ b/dev-libs/libsavitar/metadata.xml @@ -1,18 +1,30 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -proxy-ma...@gentoo.org -Gentoo Proxy Maintainers Project - - -3dpr...@gentoo.org -Gentoo 3D Printer Project - - -soname major version number - - -Ultimaker/libSavitar - + + 3dpr...@gentoo.org + Gentoo 3D Printer Project + + + ale...@gentoo.org + Alexey Shvetsov + + + proxy-ma...@gentoo.org + Proxy Maintainers + + + ma...@vanvoorden.be + Mathy Vanvoorden + + + perlo...@gmail.com + Michael Perlov + + + soname major version number + + + Ultimaker/libSavitar +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsavitar/
commit: ebb409252ad317aa2a1dc45a5b4ae59faaf4e6d9 Author: Alexey Shvetsov omrb pnpi spb ru> AuthorDate: Thu Jun 14 12:58:46 2018 + Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Jun 14 12:58:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb40925 dev-libs/libsavitar: New package Closes: https://bugs.gentoo.org/630620 Closes: https://bugs.gentoo.org/648130 Closes: https://github.com/gentoo/gentoo/pull/8258 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-libs/libsavitar/Manifest| 1 + dev-libs/libsavitar/libsavitar-3.3.0.ebuild | 39 + dev-libs/libsavitar/metadata.xml| 18 + 3 files changed, 58 insertions(+) diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest new file mode 100644 index 000..f7b6846a7b5 --- /dev/null +++ b/dev-libs/libsavitar/Manifest @@ -0,0 +1 @@ +DIST libsavitar-3.3.0.tar.gz 92460 BLAKE2B 7b68e42b41092986452684f5778873a2636741fcd5659d2ff543b3a81fbe1e9fc7a216b77506873e08e9a1c76dfa8d365d7524a83b974db864ca60727a6a8d4e SHA512 9b64e18496dac00f521294ae2401002b0cca1249a80426ac0c1a1edb0d41984aba957a0c2e9acbd1ac1678307f2778617dab3c88db5d244bd746314d1a991eba diff --git a/dev-libs/libsavitar/libsavitar-3.3.0.ebuild b/dev-libs/libsavitar/libsavitar-3.3.0.ebuild new file mode 100644 index 000..8506fac4bb7 --- /dev/null +++ b/dev-libs/libsavitar/libsavitar-3.3.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_5,3_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-python/sip[${PYTHON_USEDEP}]" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +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/metadata.xml b/dev-libs/libsavitar/metadata.xml new file mode 100644 index 000..fe13ca85a30 --- /dev/null +++ b/dev-libs/libsavitar/metadata.xml @@ -0,0 +1,18 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +proxy-ma...@gentoo.org +Gentoo Proxy Maintainers Project + + +3dpr...@gentoo.org +Gentoo 3D Printer Project + + +soname major version number + + +Ultimaker/libSavitar + +