Sfoglia il codice sorgente

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 <fido_max@inbox.ru>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Maxim Kochetkov 5 mesi fa
parent
commit
ef3d171e50

+ 3 - 3
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

+ 1 - 1
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

+ 1 - 5
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