package/libgeos: bump version to 3.9.1

Remove upstream patch.
Add myself to DEVELOPERS

Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/DEVELOPERS b/DEVELOPERS
index b82f36f776d06bc3fc860c06980c2d87f66426d5..a102ce4af4ca52ee702de0f3f1aec4efdbdd077f 100644 (file)
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1871,6 +1871,7 @@ N:        Max Filippov <jcmvbkbc@gmail.com>
 F:     arch/Config.in.xtensa
 
 N:     Maxim Kochetkov <fido_max@inbox.ru>
+F:     package/libgeos/
 F:     package/libosmium/
 F:     package/osm2pgsql/
 F:     package/postgis/

diff --git a/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch b/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch
deleted file mode 100644 (file)
index 94748dc..0000000
--- a/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 16848d6da27140caf922f71a233f96a508fb061e Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 24 Jan 2021 12:38:37 +0100
-Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/libgeos/geos/pull/395]
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c8b39bac..8ca6b829 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,6 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
- set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
- 
- ## GEOS custom variables
-+option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON)
- cmake_dependent_option(GEOS_BUILD_DEVELOPER
-   "Build with compilation flags useful for development" ON
-   "GEOS_BUILD_FROM_GIT" OFF)
-@@ -292,7 +293,9 @@ endif()
- #-----------------------------------------------------------------------------
- # Benchmarks
- #-----------------------------------------------------------------------------
--add_subdirectory(benchmarks)
-+if(BUILD_BENCHMARKS)
-+  add_subdirectory(benchmarks)
-+endif()
- 
- #-----------------------------------------------------------------------------
- # Utils
--- 
-2.29.2
-

diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash
index 5b5e44c7c5de7aad4cb60601698ddf1e86e1b6f1..3508ba9077f07605f93459b69e78c66b1b4d25de 100644 (file)
--- a/package/libgeos/libgeos.hash
+++ b/package/libgeos/libgeos.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269  geos-3.9.0.tar.bz2
+sha256  7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a  geos-3.9.1.tar.bz2
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING

diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk
index a355732af8d30311c6118dc6bc710d35f75010fd..ab2035c62a0ce66bf8b93c11ed3e851912fd4cd5 100644 (file)
--- a/package/libgeos/libgeos.mk
+++ b/package/libgeos/libgeos.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGEOS_VERSION = 3.9.0
+LIBGEOS_VERSION = 3.9.1
 LIBGEOS_SITE = http://download.osgeo.org/geos
 LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2
 LIBGEOS_LICENSE = LGPL-2.1