From 43b69dbac811e509ad38c959b0238d565669de6a Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 10 Aug 2021 13:24:40 +0300 Subject: [PATCH] package/libgeos: bump version to 3.9.1 Remove upstream patch. Add myself to DEVELOPERS Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + ...-CMakeLists.txt-add-BUILD_BENCHMARKS.patch | 37 ------------------- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch diff --git a/DEVELOPERS b/DEVELOPERS index b82f36f776..a102ce4af4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1871,6 +1871,7 @@ N: Max Filippov F: arch/Config.in.xtensa N: Maxim Kochetkov +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 index 94748dcdbd..0000000000 --- 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 -Date: Sun, 24 Jan 2021 12:38:37 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS - -Signed-off-by: Fabrice Fontaine -[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 5b5e44c7c5..3508ba9077 100644 --- 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 a355732af8..ab2035c62a 100644 --- 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 -- 2.30.2