[gentoo-commits] repo/gentoo:master commit in: sci-libs/libspatialindex/, sci-libs/libspatialindex/files/
commit: 4ef95ff8de20aaa290cc8cdf5bafed989b6f4b64
Author: Dennis Lamm gentoo org>
AuthorDate: Sat Mar 6 06:38:53 2021 +
Commit: Dennis Lamm gentoo org>
CommitDate: Sat Mar 6 10:02:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef95ff8
sci-libs/libspatialindex: fixed werror
Using system provided gtest instead of bundled one
Closes: https://bugs.gentoo.org/show_bug.cgi?id=764305
Signed-off-by: Dennis Lamm gentoo.org>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19791
Signed-off-by: Dennis Lamm gentoo.org>
.../libspatialindex-1.9.3-use-system-gtest.patch | 12 +++
.../libspatialindex-1.9.3-r1.ebuild| 37 ++
2 files changed, 49 insertions(+)
diff --git
a/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
new file mode 100644
index 000..996fc9b9692
--- /dev/null
+++
b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
@@ -0,0 +1,12 @@
+diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
+--- a/test/gtest/CMakeLists.txt(revision
5a08124d541319d39886710afc1d61dfff5575a1)
b/test/gtest/CMakeLists.txt(date 1615011059253)
+@@ -1,8 +1,5 @@
+ set (GOOGLETEST_VERSION "1.10.0")
+
+-add_subdirectory(gtest-1.10.0)
+-include_directories(./gtest-1.10.0/include)
+-
+ set (SOURCES
+ test.h
+ sidx_api_test.h
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
new file mode 100644
index 000..bee01dbe197
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="spatialindex-src-${PV}"
+
+DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C
API"
+HOMEPAGE="https://libspatialindex.org/
+ https://github.com/libspatialindex/libspatialindex;
+SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2;
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-compiler-flags.patch
+ "${FILESDIR}"/${P}-use-system-gtest.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DSIDX_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libspatialindex/, sci-libs/libspatialindex/files/
commit: a66e627f237837b81f3c475a762b13cacfeb4e6a
Author: Dennis Lamm gentoo org>
AuthorDate: Thu Jan 7 08:21:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 7 11:16:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66e627f
sci-libs/libspatialindex: drop old
Signed-off-by: Dennis Lamm gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18972
Signed-off-by: Sam James gentoo.org>
sci-libs/libspatialindex/Manifest | 1 -
.../files/libspatialindex-1.8.1-QA.patch | 15
.../libspatialindex-1.8.5-r1.ebuild| 40 --
3 files changed, 56 deletions(-)
diff --git a/sci-libs/libspatialindex/Manifest
b/sci-libs/libspatialindex/Manifest
index 48a85c3a79c..d830821da52 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,2 +1 @@
-DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B
936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1
SHA512
d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B
89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae
SHA512
7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
b/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
deleted file mode 100644
index 446452dc9ef..000
--- a/sci-libs/libspatialindex/files/libspatialindex-1.8.1-QA.patch
+++ /dev/null
@@ -1,15 +0,0 @@
spatialindex-src-1.8.0/configure.ac
-+++ spatialindex-src-1.8.0/configure.ac
-@@ -49,10 +49,10 @@
- AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging
[default=$debug_default]],, enable_debug=$debug_default)
-
- if test "x$enable_debug" = "xyes"; then
-- CXXFLAGS="$CXXFLAGS -g -DDEBUG"
-+ CXXFLAGS="$CXXFLAGS -DDEBUG"
- AC_MSG_RESULT(checking wether debug information is enabled... yes)
- else
-- CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
-+ CXXFLAGS="$CXXFLAGS -DNDEBUG"
- AC_MSG_RESULT(checking wether debug information is enabled... no)
- fi
-
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
b/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
deleted file mode 100644
index 2e959536740..000
--- a/sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-MY_PN="spatialindex-src"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="General framework for developing spatial indices"
-HOMEPAGE="https://libspatialindex.github.com/;
-SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2;
-LICENSE="MIT"
-
-KEYWORDS="amd64 x86"
-SLOT="0/4"
-IUSE="debug static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.1-QA.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable debug)
-}
-
-src_install() {
- default
- use static-libs || prune_libtool_files
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/libspatialindex/, sci-libs/libspatialindex/files/
commit: 9626e242d58aea853c28f3b83e2dc6841db9839d
Author: Dennis Lamm gentoo org>
AuthorDate: Tue Jul 21 14:18:00 2020 +
Commit: Dennis Lamm gentoo org>
CommitDate: Wed Jul 22 19:25:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9626e242
sci-libs/libspatialindex: version bump to 1.9.3
Signed-off-by: Dennis Lamm gentoo.org>
sci-libs/libspatialindex/Manifest | 1 +
...spatialindex-1.9.3-respect-compiler-flags.patch | 15 ++
.../libspatialindex/libspatialindex-1.9.3.ebuild | 33 ++
sci-libs/libspatialindex/metadata.xml | 14 -
4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/sci-libs/libspatialindex/Manifest
b/sci-libs/libspatialindex/Manifest
index 5ecea354f11..48a85c3a79c 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1 +1,2 @@
DIST spatialindex-src-1.8.5.tar.bz2 407871 BLAKE2B
936d0fc4950b4c685088c84019aa22e720371c623bd1883725dc497380e90072333c25f979e13fbc91b7d164b87cb21a285c037bdbe0b8df84eb3876590e8dd1
SHA512
d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06
+DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B
89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae
SHA512
7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
diff --git
a/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch
b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch
new file mode 100644
index 000..f96fbe11c94
--- /dev/null
+++
b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-respect-compiler-flags.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -117,12 +117,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${SIDX_BUILD_OUTPUT_DIRECTORY})
+ # Platform and compiler specific settings
+
#--
+
+-if(NOT WIN32)
+- # Recommended C++ compilation flags
+- set(SIDX_COMMON_CXX_FLAGS
+-"-pedantic -Wall -Wpointer-arith -Wcast-align -Wcast-qual
-Wredundant-decls -Wno-long-long")
+-endif(NOT WIN32)
+-
+ if (APPLE)
+ set(SO_EXT dylib)
+ set(CMAKE_FIND_FRAMEWORK "LAST")
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
new file mode 100644
index 000..60bde5fb4d4
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="spatialindex-src"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="General framework for developing spatial indices"
+HOMEPAGE="https://libspatialindex.org/
+ https://github.com/libspatialindex/libspatialindex;
+SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2;
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0/6"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.3-respect-compiler-flags.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DSIDX_BUILD_TESTS=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/sci-libs/libspatialindex/metadata.xml
b/sci-libs/libspatialindex/metadata.xml
index 6f49eba8f49..d9166ea51c0 100644
--- a/sci-libs/libspatialindex/metadata.xml
+++ b/sci-libs/libspatialindex/metadata.xml
@@ -1,5 +1,17 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
+
+ 3dpr...@gentoo.org
+ Gentoo 3D print
+
+
+ Extensible framework for robust spatial indexing
+
+
+ Soname version number of libspatialindex
+
+
+ libspatialindex/libspatialindex
+
