From ef3d171e50fb6aec9d1477356b07036cadc2409c Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 17 Feb 2025 10:07:08 +0300 Subject: [PATCH] package/libosmium: bump version to 2.21.0 Release-notes: https://github.com/osmcode/libosmium/releases/tag/v2.21.0 Bump minimal GCC version to 5. (Switched to C++14 as minimum requirement) https://github.com/osmcode/libosmium/commit/a83fbf8852b00e57bf30fe3f69c37f575726c7d7 Remove support for projection using the Proj library https://github.com/osmcode/libosmium/commit/711721cb1f37dff18bcfb2e5fbd7667c7a22bbf0 Signed-off-by: Maxim Kochetkov Signed-off-by: Julien Olivain --- package/libosmium/Config.in | 6 +++--- package/libosmium/libosmium.hash | 2 +- package/libosmium/libosmium.mk | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 825e2b7e33..c2e905cd37 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBOSMIUM bool "libosmium" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST @@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBOSMIUM https://osmcode.org/libosmium/ -comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index 37bcdd267c..82657d7fe7 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3d3e0873c6aaabb3b2ef4283896bebf233334891a7a49f4712af30ca6ed72477 libosmium-2.20.0.tar.gz +sha256 5a222e555865f742102d2802a7ad7ef91d6e1c8944c097c70a924214e079c858 libosmium-2.21.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index c39e7d0152..e5392b06e9 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.20.0 +LIBOSMIUM_VERSION = 2.21.0 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE @@ -23,10 +23,6 @@ ifeq ($(BR2_PACKAGE_LIBGEOS),y) LIBOSMIUM_DEPENDENCIES += libgeos endif -ifeq ($(BR2_PACKAGE_PROJ),y) -LIBOSMIUM_DEPENDENCIES += proj -endif - ifeq ($(BR2_PACKAGE_ZLIB),y) LIBOSMIUM_DEPENDENCIES += zlib endif