From ca1355d61d9eced2b64da3b9508676c2eedef6d3 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 7 Oct 2024 21:45:06 +0300 Subject: [PATCH] package/osm2pgsql: bump version to 2.0.0 osm2pgsql now use std::filesystem instead of boost::filesystem. So drop BR2_PACKAGE_BOOST_SYSTEM, BR2_PACKAGE_BOOST_FILESYSTEM dependencies and set BR2_TOOLCHAIN_GCC_AT_LEAST_8. Lua is not optional now. So add lua or luajit as dependencies. Legacy Proj interface (Proj 4) was dropped and option was renamed from USE_PROJ_LIB to WITH_PROJ Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/2.0.0 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/osm2pgsql/Config.in | 11 ++++------- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 14 ++++++-------- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 439309df95..3b081af616 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -2,14 +2,12 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" depends on BR2_ARCH_IS_64 depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14, filesystem depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_WCHAR # boost, libosmium depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future + depends on BR2_PACKAGE_LUA || BR2_PACKAGE_LUAJIT select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_JSON_FOR_MODERN_CPP @@ -24,11 +22,10 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org -comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 8" depends on BR2_ARCH_IS_64 - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" depends on BR2_ARCH_IS_64 diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index df3302b2c7..cc0d91f98f 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b46313813b816f15ce906c04cd4108bbb05362740e0a1a8889055f4e25977d2 osm2pgsql-1.11.0.tar.gz +sha256 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 osm2pgsql-2.0.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index 846a4ea242..7b54e4c0d2 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.11.0 +OSM2PGSQL_VERSION = 2.0.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING @@ -22,19 +22,17 @@ OSM2PGSQL_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LUAJIT),y) OSM2PGSQL_DEPENDENCIES += luajit -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=ON -else ifeq ($(BR2_PACKAGE_LUA),y) -OSM2PGSQL_DEPENDENCIES += lua -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=ON -DWITH_LUAJIT=OFF +OSM2PGSQL_CONF_OPTS += -DWITH_LUAJIT=ON else -OSM2PGSQL_CONF_OPTS += -DWITH_LUA=OFF -DWITH_LUAJIT=OFF +OSM2PGSQL_DEPENDENCIES += lua +OSM2PGSQL_CONF_OPTS += -DWITH_LUAJIT=OFF endif ifeq ($(BR2_PACKAGE_PROJ),y) OSM2PGSQL_DEPENDENCIES += proj -OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=auto +OSM2PGSQL_CONF_OPTS += -DWITH_PROJ=ON else -OSM2PGSQL_CONF_OPTS += -DUSE_PROJ_LIB=off +OSM2PGSQL_CONF_OPTS += -DWITH_PROJ=OFF endif $(eval $(cmake-package))