1 |
commit: 15fa3b89ddced40cae0ca6025ba214a96ba634ae |
2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 14:52:54 2020 +0000 |
4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 18:37:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fa3b89 |
7 |
|
8 |
dev-libs/libsavitar: version bump 4.7.0 |
9 |
|
10 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/17336 |
12 |
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> |
13 |
|
14 |
dev-libs/libsavitar/Manifest | 1 + |
15 |
.../libsavitar-4.7.0-use-system-pugixml.patch | 8 +++ |
16 |
dev-libs/libsavitar/libsavitar-4.7.0.ebuild | 76 ++++++++++++++++++++++ |
17 |
3 files changed, 85 insertions(+) |
18 |
|
19 |
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest |
20 |
index a4c6a4380d0..43cd7300b99 100644 |
21 |
--- a/dev-libs/libsavitar/Manifest |
22 |
+++ b/dev-libs/libsavitar/Manifest |
23 |
@@ -3,3 +3,4 @@ DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b6 |
24 |
DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d |
25 |
DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6 |
26 |
DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2 |
27 |
+DIST libsavitar-4.7.0.tar.gz 99070 BLAKE2B 3e27624a62568b8d45ddf8fde60a0377faa81eb9e031e32e935d992304b7249d4f3fa7d9bc45b370882e203368a90ad48347faa600f339d096c67432e23d8ddc SHA512 bd19d3ee8be570791bf4f3d5be5eb44d5bba3181a693633d5703ba91c78d3725dbe051c888ec60cea057790a561beeb98b96c41e6584f630f2410bdb97e0cb4d |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000000..cd9406da928 |
32 |
--- /dev/null |
33 |
+++ b/dev-libs/libsavitar/files/libsavitar-4.7.0-use-system-pugixml.patch |
34 |
@@ -0,0 +1,8 @@ |
35 |
+--- a/CMakeLists.txt |
36 |
++++ b/CMakeLists.txt |
37 |
+@@ -15,7 +15,7 @@ |
38 |
+ find_package(Threads QUIET) |
39 |
+ endif() |
40 |
+ |
41 |
+-add_subdirectory(pugixml) |
42 |
++find_package(pugixml REQUIRED) |
43 |
|
44 |
diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild |
45 |
new file mode 100644 |
46 |
index 00000000000..485ab1b9b93 |
47 |
--- /dev/null |
48 |
+++ b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild |
49 |
@@ -0,0 +1,76 @@ |
50 |
+# Copyright 1999-2020 Gentoo Authors |
51 |
+# Distributed under the terms of the GNU General Public License v2 |
52 |
+ |
53 |
+EAPI=7 |
54 |
+ |
55 |
+PYTHON_COMPAT=( python3_{6..8} ) |
56 |
+ |
57 |
+inherit cmake python-single-r1 |
58 |
+ |
59 |
+MY_PN="libSavitar" |
60 |
+ |
61 |
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings" |
62 |
+HOMEPAGE="https://github.com/Ultimaker/libSavitar" |
63 |
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
64 |
+ |
65 |
+LICENSE="LGPL-3" |
66 |
+SLOT="0/3" |
67 |
+KEYWORDS="~amd64 ~x86" |
68 |
+ |
69 |
+IUSE="+python static-libs test" |
70 |
+RESTRICT="!test? ( test )" |
71 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
72 |
+ |
73 |
+RDEPEND="${PYTHON_DEPS} |
74 |
+ dev-libs/pugixml |
75 |
+ $(python_gen_cond_dep ' |
76 |
+ dev-python/sip[${PYTHON_MULTI_USEDEP}] |
77 |
+ ')" |
78 |
+ |
79 |
+DEPEND="${RDEPEND} |
80 |
+ test? ( |
81 |
+ dev-cpp/gtest |
82 |
+ dev-cpp/tbb |
83 |
+ )" |
84 |
+ |
85 |
+S="${WORKDIR}/${MY_PN}-${PV}" |
86 |
+BUILD_DIR="${S}/build" |
87 |
+ |
88 |
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" ) |
89 |
+ |
90 |
+pkg_setup() { |
91 |
+ use python && python-single-r1_pkg_setup |
92 |
+} |
93 |
+ |
94 |
+src_prepare() { |
95 |
+ # remove bundled pugixml |
96 |
+ rm -r "${S}"/pugixml || die |
97 |
+ |
98 |
+ find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \ |
99 |
+ -e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die |
100 |
+ |
101 |
+ if use test; then |
102 |
+ find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \ |
103 |
+ -e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die |
104 |
+ fi |
105 |
+ |
106 |
+ # find SIP for current python version, not the latest installed |
107 |
+ sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \ |
108 |
+ CMakeLists.txt cmake/FindSIP.cmake || die |
109 |
+ |
110 |
+ cmake_src_prepare |
111 |
+} |
112 |
+ |
113 |
+src_configure() { |
114 |
+ local mycmakeargs=( |
115 |
+ -DBUILD_PYTHON=$(usex python ON OFF) |
116 |
+ -DBUILD_STATIC=$(usex static-libs ON OFF) |
117 |
+ -DBUILD_TESTS=$(usex test ON OFF) |
118 |
+ ) |
119 |
+ |
120 |
+ cmake_src_configure |
121 |
+} |
122 |
+ |
123 |
+src_test() { |
124 |
+ cmake_src_test |
125 |
+} |