osrm-backend 6.0.0

Author: bevanjkay

Formula/o/osrm-backend.rb

@@ -1,40 +1,11 @@
 class OsrmBackend < Formula
   desc "High performance routing engine"
   homepage "https://project-osrm.org/"
+  url "https://github.com/Project-OSRM/osrm-backend/archive/refs/tags/v6.0.0.tar.gz"
+  sha256 "369192672c0041600740c623ce961ef856e618878b7d28ae5e80c9f6c2643031"
   license "BSD-2-Clause"
-  revision 8
   head "https://github.com/Project-OSRM/osrm-backend.git", branch: "master"
 
-  # TODO: Remove `conflicts_with "mapnik"` in release that has following commit:
-  # https://github.com/Project-OSRM/osrm-backend/commit/c1ed73126dd467171dc7adb4ad07864909bcb90f
-  stable do
-    url "https://github.com/Project-OSRM/osrm-backend/archive/refs/tags/v5.27.1.tar.gz"
-    sha256 "52391580e0f92663dd7b21cbcc7b9064d6704470e2601bf3ec5c5170b471629a"
-
-    # Backport commit to build with CMake 4. Remove in the next release
-    patch do
-      url "https://github.com/Project-OSRM/osrm-backend/commit/d691af4860350287041676178ceb511b240c336c.patch?full_index=1"
-      sha256 "216a143e58ee96abf4585b0f1d046469f7b42966e175b3b7b30350c232b48fff"
-    end
-
-    # Backport fix for Boost 1.85.0. Remove in the next release.
-    # PR ref: https://github.com/Project-OSRM/osrm-backend/pull/6856
-    patch do
-      url "https://github.com/Project-OSRM/osrm-backend/commit/10ec6fc33547e4b96a5929c18db57fb701152c68.patch?full_index=1"
-      sha256 "4f475ed8a08aa95a2b626ba23c9d8ac3dc55d54c3f163e3d505d4a45c2d4e504"
-    end
-
-    # Backport fix for missing include. Remove in the next release.
-    # Ref: https://github.com/Project-OSRM/osrm-backend/commit/565959b3896945a0eb437cc799b697be023121ef
-    #
-    # Also backport sol2.hpp workaround to avoid a Clang bug. Remove in the next release
-    # Ref: https://github.com/Project-OSRM/osrm-backend/commit/523ee762f077908d03b66d0976c877b52adf22fa
-    #
-    # Also add diff from open PR to support Boost 1.87.0
-    # Ref: https://github.com/Project-OSRM/osrm-backend/pull/7073
-    patch :DATA
-  end
-
   livecheck do
     url :stable
     regex(/^v?(\d+(?:\.\d+)+)$/i)
@@ -51,6 +22,7 @@ class OsrmBackend < Formula
   end
 
   depends_on "cmake" => :build
+  depends_on "pkgconf" => :build
 
   depends_on "boost"
   depends_on "libstxxl"
@@ -67,12 +39,6 @@ class OsrmBackend < Formula
   conflicts_with "mapnik", because: "both install Mapbox Variant headers"
 
   def install
-    # Workaround to build with CMake 4. Remove in the next release
-    if build.stable?
-      odie "Remove CMake 4 workaround!" if version >= 6
-      ENV["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5"
-    end
-
     # Work around build failure: duplicate symbol 'boost::phoenix::placeholders::uarg9'
     # Issue ref: https://github.com/boostorg/phoenix/issues/111
     ENV.append_to_cflags "-DBOOST_PHOENIX_STL_TUPLE_H_"
@@ -129,67 +95,3 @@ def install
     assert_path_exists testpath/"test.osrm.names", "osrm-extract generated no output!"
   end
 end
-
-__END__
-diff --git a/include/extractor/suffix_table.hpp b/include/extractor/suffix_table.hpp
-index 5d16fe6..2c378bf 100644
---- a/include/extractor/suffix_table.hpp
-+++ b/include/extractor/suffix_table.hpp
-@@ -3,6 +3,7 @@
-
- #include <string>
- #include <unordered_set>
-+#include <vector>
-
- #include "util/string_view.hpp"
-
-diff --git a/third_party/sol2-3.3.0/include/sol/sol.hpp b/third_party/sol2-3.3.0/include/sol/sol.hpp
-index 8b0b7d36ea4ef2a36133ce28476ae1620fcd72b5..d7da763f735434bf4a40b204ff735f4e464c1b13 100644
---- a/third_party/sol2-3.3.0/include/sol/sol.hpp
-+++ b/third_party/sol2-3.3.0/include/sol/sol.hpp
-@@ -19416,7 +19416,14 @@ namespace sol { namespace function_detail {
- 		}
-
- 		template <bool is_yielding, bool no_trampoline>
--		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
-+		static int call(lua_State* L)
-+// see https://github.com/ThePhD/sol2/issues/1581#issuecomment-2103463524
-+#if SOL_IS_ON(SOL_COMPILER_CLANG)
-+		// apparent regression in clang 18 - llvm/llvm-project#91362
-+#else
-+			noexcept(std::is_nothrow_copy_assignable_v<T>)
-+#endif
-+		{
- 			int nr;
- 			if constexpr (no_trampoline) {
- 				nr = real_call(L);
-@@ -19456,7 +19463,14 @@ namespace sol { namespace function_detail {
- 		}
-
- 		template <bool is_yielding, bool no_trampoline>
--		static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
-+		static int call(lua_State* L)
-+// see https://github.com/ThePhD/sol2/issues/1581#issuecomment-2103463524
-+#if SOL_IS_ON(SOL_COMPILER_CLANG)
-+		// apparent regression in clang 18 - llvm/llvm-project#91362
-+#else
-+			noexcept(std::is_nothrow_copy_assignable_v<T>)
-+#endif
-+		{
- 			int nr;
- 			if constexpr (no_trampoline) {
- 				nr = real_call(L);
-diff --git a/include/server/server.hpp b/include/server/server.hpp
-index 34b8982e67..02b0dda050 100644
---- a/include/server/server.hpp
-+++ b/include/server/server.hpp
-@@ -53,8 +53,7 @@ class Server
-         const auto port_string = std::to_string(port);
- 
-         boost::asio::ip::tcp::resolver resolver(io_context);
--        boost::asio::ip::tcp::resolver::query query(address, port_string);
--        boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
-+        boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port_string).begin();
- 
-         acceptor.open(endpoint.protocol());
- #ifdef SO_REUSEPORT