UPDATE: osrm-backend 5.27.1

Here is an update to osrm-backend 5.27.1.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/geo/osrm-backend/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 8 Nov 2022 11:14:48 -0000 1.10
+++ Makefile 2 Jun 2023 04:53:41 -0000
@@ -6,12 +6,11 @@ COMMENT = high-performance road network

GH_ACCOUNT = Project-OSRM
GH_PROJECT = osrm-backend
-GH_TAGNAME = v5.22.0
-REVISION = 0
+GH_TAGNAME = v5.27.1

CATEGORIES = geo

-HOMEPAGE = http://project-osrm.org/
+HOMEPAGE = https://project-osrm.org/

# BSD 2-clause
PERMIT_PACKAGE = Yes
@@ -19,9 +18,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_program_options-mt boost_regex-mt
-WANTLIB += boost_system-mt boost_thread-mt bz2 c expat m tbb tbbmalloc z
+WANTLIB += boost_system-mt boost_thread-mt bz2 c expat m tbb z

-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc

MODULES = devel/cmake \
lang/lua
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/geo/osrm-backend/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 18 May 2020 17:02:35 -0000 1.2
+++ distinfo 2 Jun 2023 03:53:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (osrm-backend-5.22.0.tar.gz) = 3wmHoEvPZddPnE4Y80oBmCvzu5eqR/nYbPuLNfF6alU=
-SIZE (osrm-backend-5.22.0.tar.gz) = 6492998
+SHA256 (osrm-backend-5.27.1.tar.gz) = UjkVgOD5JmPdeyHLzHuQZNZwRHDiYBvz7FxRcLRxYpo=
+SIZE (osrm-backend-5.27.1.tar.gz) = 10979468
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/geo/osrm-backend/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Mar 2022 19:06:15 -0000 1.3
+++ patches/patch-CMakeLists_txt 2 Jun 2023 04:38:50 -0000
@@ -1,16 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -325,7 +325,7 @@ if (ENABLE_SANITIZER)
- endif()
-
- # Configuring compilers
--set(OSRM_WARNING_FLAGS "-Werror=all -Werror=extra -Werror=uninitialized -Werror=unreachable-code -Werror=unused-variable -Werror=unreachable-code -Wno-error=cpp -Wpedantic")
-+set(OSRM_WARNING_FLAGS "-Werror=extra -Werror=uninitialized -Werror=unreachable-code -Werror=unused-variable -Werror=unreachable-code -Wno-error=cpp -Wpedantic")
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OSRM_WARNING_FLAGS} -Werror=strict-overflow=2 -Wno-error=unused-local-typedef -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC -fcolor-diagnostics -ftemplate-depth=1024 -Wno-unused-command-line-argument")
- elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-@@ -379,7 +379,7 @@ if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER
+@@ -389,7 +389,7 @@ if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER
set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,--gc-sections")
endif()
# Default linker optimization flags
@@ -19,21 +10,12 @@ Index: CMakeLists.txt

else()
message(STATUS "Using unknown linker, not setting linker optimizations")
-@@ -410,10 +410,6 @@ if(APPLE)
- message(STATUS "linking against libc++")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+@@ -419,7 +419,7 @@ if(APPLE)
endif()
--endif()
--
+ endif()
+
-if(UNIX AND NOT APPLE)
-- set(MAYBE_RT_LIBRARY -lrt)
++if(UNIX AND NOT APPLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
+ set(MAYBE_RT_LIBRARY -lrt)
endif()

- find_package(Threads REQUIRED)
-@@ -873,4 +869,4 @@ if (ENABLE_NODE_BINDINGS)
- endforeach()
- add_library(check-headers STATIC EXCLUDE_FROM_ALL ${sources})
- set_target_properties(check-headers PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${check_headers_dir})
--endif()
-\ No newline at end of file
-+endif()
Index: patches/patch-src_extractor_edge_based_graph_factory_cpp
===================================================================
RCS file: patches/patch-src_extractor_edge_based_graph_factory_cpp
diff -N patches/patch-src_extractor_edge_based_graph_factory_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_extractor_edge_based_graph_factory_cpp 2 Jun 2023 04:32:36 -0000
@@ -0,0 +1,60 @@
+make it tolerant of TBB 2020
+https://github.com/Project-OSRM/osrm-backend/pull/6493
+
+Index: src/extractor/edge_based_graph_factory.cpp
+--- src/extractor/edge_based_graph_factory.cpp.orig
++++ src/extractor/edge_based_graph_factory.cpp
+@@ -32,7 +32,11 @@
+
+ #include <tbb/blocked_range.h>
+ #include <tbb/parallel_for.h>
++#if TBB_VERSION_MAJOR == 2020
++#include <tbb/pipeline.h>
++#else
+ #include <tbb/parallel_pipeline.h>
++