1 |
commit: 8e309394d3d23a7958022942c30d00992ead3441 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 6 03:36:42 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 6 04:12:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e309394 |
7 |
|
8 |
sci-libs/proj: add 8.1.0 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sci-libs/proj/Manifest | 1 + |
13 |
.../files/proj-8.1.0-test_factory-include.patch | 29 +++++++++ |
14 |
sci-libs/proj/proj-8.1.0.ebuild | 72 ++++++++++++++++++++++ |
15 |
3 files changed, 102 insertions(+) |
16 |
|
17 |
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest |
18 |
index c5bca2ca5e7..6e3fbe16ce7 100644 |
19 |
--- a/sci-libs/proj/Manifest |
20 |
+++ b/sci-libs/proj/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324 |
23 |
DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9 |
24 |
+DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f |
25 |
DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5 |
26 |
DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8 |
27 |
|
28 |
diff --git a/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..c88fe83cb50 |
31 |
--- /dev/null |
32 |
+++ b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch |
33 |
@@ -0,0 +1,29 @@ |
34 |
+https://patch-diff.githubusercontent.com/raw/OSGeo/PROJ/pull/2760.patch |
35 |
+ |
36 |
+From fc983b6e3343ba4d52fd0a889bb6bbf6f143f417 Mon Sep 17 00:00:00 2001 |
37 |
+From: Even Rouault <even.rouault@×××××××××.com> |
38 |
+Date: Thu, 1 Jul 2021 21:24:26 +0200 |
39 |
+Subject: [PATCH] =?UTF-8?q?test=5Ffactory.cpp:=20fix=20build,=20in=20parti?= |
40 |
+ =?UTF-8?q?cular=20on=20Alpine=20Edge=20(fixes=C2=A0#2759)?= |
41 |
+MIME-Version: 1.0 |
42 |
+Content-Type: text/plain; charset=UTF-8 |
43 |
+Content-Transfer-Encoding: 8bit |
44 |
+ |
45 |
+--- |
46 |
+ test/unit/test_factory.cpp | 2 ++ |
47 |
+ 1 file changed, 2 insertions(+) |
48 |
+ |
49 |
+diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp |
50 |
+index 985499150e..a60296d10a 100644 |
51 |
+--- a/test/unit/test_factory.cpp |
52 |
++++ b/test/unit/test_factory.cpp |
53 |
+@@ -39,6 +39,8 @@ |
54 |
+ #include "proj/metadata.hpp" |
55 |
+ #include "proj/util.hpp" |
56 |
+ |
57 |
++#include <algorithm> |
58 |
++ |
59 |
+ #include <sqlite3.h> |
60 |
+ |
61 |
+ #ifdef _MSC_VER |
62 |
+ |
63 |
|
64 |
diff --git a/sci-libs/proj/proj-8.1.0.ebuild b/sci-libs/proj/proj-8.1.0.ebuild |
65 |
new file mode 100644 |
66 |
index 00000000000..0a2c53bf18f |
67 |
--- /dev/null |
68 |
+++ b/sci-libs/proj/proj-8.1.0.ebuild |
69 |
@@ -0,0 +1,72 @@ |
70 |
+# Copyright 1999-2021 Gentoo Authors |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+ |
73 |
+EAPI=7 |
74 |
+ |
75 |
+inherit cmake |
76 |
+ |
77 |
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz" |
78 |
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz" |
79 |
+ |
80 |
+DESCRIPTION="PROJ coordinate transformation software" |
81 |
+HOMEPAGE="https://proj4.org/" |
82 |
+SRC_URI=" |
83 |
+ https://download.osgeo.org/proj/${P}.tar.gz |
84 |
+ https://download.osgeo.org/proj/${DATUMGRID} |
85 |
+ europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} ) |
86 |
+" |
87 |
+ |
88 |
+LICENSE="MIT" |
89 |
+SLOT="0/22" |
90 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
91 |
+IUSE="curl europe test +tiff" |
92 |
+REQUIRED_USE="test? ( !europe )" |
93 |
+ |
94 |
+RESTRICT="!test? ( test )" |
95 |
+ |
96 |
+RDEPEND=" |
97 |
+ dev-db/sqlite:3 |
98 |
+ curl? ( net-misc/curl ) |
99 |
+ tiff? ( media-libs/tiff ) |
100 |
+" |
101 |
+DEPEND=" |
102 |
+ ${RDEPEND} |
103 |
+ test? ( dev-cpp/gtest ) |
104 |
+" |
105 |
+ |
106 |
+PATCHES=( |
107 |
+ "${FILESDIR}"/${P}-test_factory-include.patch |
108 |
+) |
109 |
+ |
110 |
+src_unpack() { |
111 |
+ unpack ${P}.tar.gz |
112 |
+ |
113 |
+ cd "${S}"/data || die |
114 |
+ mv README README.DATA || die |
115 |
+ |
116 |
+ unpack ${DATUMGRID} |
117 |
+ use europe && unpack ${EUROPE_DATUMGRID} |
118 |
+} |
119 |
+ |
120 |
+src_configure() { |
121 |
+ local mycmakeargs=( |
122 |
+ -DDOCDIR="${EPREFIX}"/usr/share/${PF} |
123 |
+ -DBUILD_TESTING=$(usex test) |
124 |
+ -DENABLE_CURL=$(usex curl) |
125 |
+ -DBUILD_PROJSYNC=$(usex curl) |
126 |
+ -DENABLE_TIFF=$(usex tiff) |
127 |
+ ) |
128 |
+ |
129 |
+ use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) |
130 |
+ |
131 |
+ cmake_src_configure |
132 |
+} |
133 |
+ |
134 |
+src_install() { |
135 |
+ cmake_src_install |
136 |
+ |
137 |
+ cd data || die |
138 |
+ dodoc README.{DATA,DATUMGRID} |
139 |
+ use europe && dodoc README.EUROPE |
140 |
+ find "${ED}" -name '*.la' -type f -delete || die |
141 |
+} |