* [gentoo-commits] repo/gentoo:master commit in: sci-libs/proj/, sci-libs/proj/files/
@ 2021-07-06 4:12 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-07-06 4:12 UTC (permalink / raw
To: gentoo-commits
commit: 8e309394d3d23a7958022942c30d00992ead3441
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 6 03:36:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 6 04:12:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e309394
sci-libs/proj: add 8.1.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/proj/Manifest | 1 +
.../files/proj-8.1.0-test_factory-include.patch | 29 +++++++++
sci-libs/proj/proj-8.1.0.ebuild | 72 ++++++++++++++++++++++
3 files changed, 102 insertions(+)
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index c5bca2ca5e7..6e3fbe16ce7 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -1,4 +1,5 @@
DIST proj-7.2.1.tar.gz 5714666 BLAKE2B 9379ef758b1221b9487f162a27e7afa737e668ad7a13fc7adbd8e1e2c1c4699263d5d3105d03781b423f284205de3c79fc68850b9fba6aa05f1dc553b77b0842 SHA512 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324
DIST proj-8.0.1.tar.gz 5731452 BLAKE2B d2235f87bead1ec35f62b99e5236d1b6dc1a8f924555d21dec7f5e07b3d341b4b4e797dd5a3843e87d12db392716ec9bb5acae871fa2bb7a78c3404fa9487875 SHA512 cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9
+DIST proj-8.1.0.tar.gz 5786723 BLAKE2B 8960ae70beda502442548542173e3f21705c8213ba5b7b3004beca67aa16b7401db4b9778ea4abd910eae3e224b7efc73e0d67b83a3d75aaab0fead51977c9ba SHA512 0c11d43bcdf97fbb3be9238c77cc111ae6df7948dc5076b1a31350c84a60299964ea1a320edfbee0568a2d9d3c7f80eafa6322adfdf99aea5f06172d7ee53a2f
DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b6613928bb0083d01bfe65bb4c333628725b300efdb7cf10ebc6f26ff03733886c20f25c7aef80875e81e59bda9fd7d3 SHA512 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
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
new file mode 100644
index 00000000000..c88fe83cb50
--- /dev/null
+++ b/sci-libs/proj/files/proj-8.1.0-test_factory-include.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/OSGeo/PROJ/pull/2760.patch
+
+From fc983b6e3343ba4d52fd0a889bb6bbf6f143f417 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Thu, 1 Jul 2021 21:24:26 +0200
+Subject: [PATCH] =?UTF-8?q?test=5Ffactory.cpp:=20fix=20build,=20in=20parti?=
+ =?UTF-8?q?cular=20on=20Alpine=20Edge=20(fixes=C2=A0#2759)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ test/unit/test_factory.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
+index 985499150e..a60296d10a 100644
+--- a/test/unit/test_factory.cpp
++++ b/test/unit/test_factory.cpp
+@@ -39,6 +39,8 @@
+ #include "proj/metadata.hpp"
+ #include "proj/util.hpp"
+
++#include <algorithm>
++
+ #include <sqlite3.h>
+
+ #ifdef _MSC_VER
+
diff --git a/sci-libs/proj/proj-8.1.0.ebuild b/sci-libs/proj/proj-8.1.0.ebuild
new file mode 100644
index 00000000000..0a2c53bf18f
--- /dev/null
+++ b/sci-libs/proj/proj-8.1.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DATUMGRID="${PN}-datumgrid-1.8.tar.gz"
+EUROPE_DATUMGRID="${PN}-datumgrid-europe-1.6.tar.gz"
+
+DESCRIPTION="PROJ coordinate transformation software"
+HOMEPAGE="https://proj4.org/"
+SRC_URI="
+ https://download.osgeo.org/proj/${P}.tar.gz
+ https://download.osgeo.org/proj/${DATUMGRID}
+ europe? ( https://download.osgeo.org/proj/${EUROPE_DATUMGRID} )
+"
+
+LICENSE="MIT"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="curl europe test +tiff"
+REQUIRED_USE="test? ( !europe )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ curl? ( net-misc/curl )
+ tiff? ( media-libs/tiff )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-test_factory-include.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ cd "${S}"/data || die
+ mv README README.DATA || die
+
+ unpack ${DATUMGRID}
+ use europe && unpack ${EUROPE_DATUMGRID}
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDOCDIR="${EPREFIX}"/usr/share/${PF}
+ -DBUILD_TESTING=$(usex test)
+ -DENABLE_CURL=$(usex curl)
+ -DBUILD_PROJSYNC=$(usex curl)
+ -DENABLE_TIFF=$(usex tiff)
+ )
+
+ use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ cd data || die
+ dodoc README.{DATA,DATUMGRID}
+ use europe && dodoc README.EUROPE
+ find "${ED}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/proj/, sci-libs/proj/files/
@ 2024-01-10 13:25 Andrew Ammerlaan
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Ammerlaan @ 2024-01-10 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 92c42a318e0f956e3cf42c8d1b6e4e24eeab3d5f
Author: Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Mon Dec 11 19:14:51 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 13:24:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c42a31
sci-libs/proj: add patch to install geotiff files
This patch is a backport of an upstream patch that will be
applied in version 9.4.0 scheduled for March 01, 2024.
Upstream: https://github.com/OSGeo/PROJ/pull/3970
Closes: https://bugs.gentoo.org/917393
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34242
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/proj/files/proj-geotiff.patch | 33 ++++++++++++++++++++++
.../{proj-9.2.1.ebuild => proj-9.2.1-r1.ebuild} | 6 +++-
.../{proj-9.3.0.ebuild => proj-9.3.0-r1.ebuild} | 6 +++-
3 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/sci-libs/proj/files/proj-geotiff.patch b/sci-libs/proj/files/proj-geotiff.patch
new file mode 100644
index 000000000000..cef1faa4628f
--- /dev/null
+++ b/sci-libs/proj/files/proj-geotiff.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/917393
+https://github.com/OSGeo/PROJ/pull/3970
+
+From afccfb609db16524b602216d9dc2b55c154403bb Mon Sep 17 00:00:00 2001
+From: Marco Genasci <fedeliallalinea@gmail.com>
+Date: Sun, 26 Nov 2023 08:40:45 +0100
+Subject: [PATCH] Database: added ability to install *.tif if present in data
+
+---
+ data/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 4cb89e7849..85ed6ba8d4 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -38,6 +38,8 @@ set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
+
+ file(GLOB SCHEMA_FILES *.json)
+
++file(GLOB GEOTIFF_FILES *.tif)
++
+ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
+ set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
+ include(sql_filelist.cmake)
+@@ -107,6 +109,7 @@ set(ALL_DATA_FILE
+ ${GRIDSHIFT_FILES}
+ ${PROJ_DB}
+ ${SCHEMA_FILES}
++ ${GEOTIFF_FILES}
+ )
+ install(
+ FILES ${ALL_DATA_FILE}
diff --git a/sci-libs/proj/proj-9.2.1.ebuild b/sci-libs/proj/proj-9.2.1-r1.ebuild
similarity index 94%
rename from sci-libs/proj/proj-9.2.1.ebuild
rename to sci-libs/proj/proj-9.2.1-r1.ebuild
index ac5e5df3f04d..50bbae86a419 100644
--- a/sci-libs/proj/proj-9.2.1.ebuild
+++ b/sci-libs/proj/proj-9.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,10 @@ DEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-geotiff.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
diff --git a/sci-libs/proj/proj-9.3.0.ebuild b/sci-libs/proj/proj-9.3.0-r1.ebuild
similarity index 94%
rename from sci-libs/proj/proj-9.3.0.ebuild
rename to sci-libs/proj/proj-9.3.0-r1.ebuild
index d161662887a4..f605561280c2 100644
--- a/sci-libs/proj/proj-9.3.0.ebuild
+++ b/sci-libs/proj/proj-9.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,10 @@ DEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-geotiff.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-10 13:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-06 4:12 [gentoo-commits] repo/gentoo:master commit in: sci-libs/proj/, sci-libs/proj/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-10 13:25 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox