sumo: update to 1.23.1

Remove no longer needed GCC14 patch.

Make python optional. It's not used anyway.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile
index b2143bfc36a226b0d3617592b2f2f80221458513..01ce97ee14f10763b4a3b4dd09914f2fb803f7c2 100644 (file)
--- a/utils/sumo/Makefile
+++ b/utils/sumo/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sumo
-PKG_VERSION:=1.16.0
+PKG_VERSION:=1.23.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/sumo
-PKG_HASH:=33694b554a8c661ec407d04cc7c6534c473ccb2fbe7bf2ea97e1faddc70654fa
+PKG_HASH:=016c506d8bd5d0b6f8e2229ac5dbb9e948535a041559cdd2ff6b616293ac21a8
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <[email protected]>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -40,7 +40,8 @@ define Package/sumo/description
 endef
 
 CMAKE_OPTIONS += \
-       -DCCACHE_SUPPORT=OFF
+       -DCCACHE_SUPPORT=OFF \
+       -DENABLE_PYTHON_BINDINGS=OFF
 
 define Package/sumo/install
        $(INSTALL_DIR) $(1)/usr/bin

diff --git a/utils/sumo/patches/010-gtest.patch b/utils/sumo/patches/010-gtest.patch
index a3ebc1307d4b9c14f9ddef513e619db4ed2f26d4..21e2b8771b76c68c3c385f8d62692b1c733f308b 100644 (file)
--- a/utils/sumo/patches/010-gtest.patch
+++ b/utils/sumo/patches/010-gtest.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -303,7 +303,6 @@ if (SUMO_LIBRARIES AND WIN32)
+@@ -366,7 +366,6 @@ if (SUMO_LIBRARIES AND WIN32)
      file(GLOB TEXTTEST_EXECUTABLE "${SUMO_LIBRARIES}/TextTest-*/texttest.exe")
  else ()
      # for Linux and Mac only

diff --git a/utils/sumo/patches/020-gcc14.patch b/utils/sumo/patches/020-gcc14.patch
deleted file mode 100644 (file)
index 682a783..0000000
--- a/utils/sumo/patches/020-gcc14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/utils/router/IntermodalEdge.h
-+++ b/src/utils/router/IntermodalEdge.h
-@@ -232,7 +232,7 @@ public:
- 
-     // only used by AStar
-     inline double getMinimumTravelTime(const IntermodalTrip<E, N, V>* const trip) const {
--        return myLength / trip->getMaxSpeed();
-+        return trip ? myLength / trip->getMaxSpeed() : myLength;
-     }
- 
-     /// @brief only used by mono-modal routing

diff --git a/utils/sumo/patches/020-python.patch b/utils/sumo/patches/020-python.patch
new file mode 100644 (file)
index 0000000..743c498
--- /dev/null
+++ b/utils/sumo/patches/020-python.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -197,7 +197,7 @@ if (SKBUILD OR ${CMAKE_VERSION} VERSION_
+     find_package(PythonInterp REQUIRED)
+     find_package(PythonLibs)
+ else()
+-    find_package(Python REQUIRED COMPONENTS Interpreter Development)
++    find_package(Python COMPONENTS Interpreter Development)
+     # define variables for compatibility. refactor once older cmake unsupported
+     if (Python_FOUND)
+         set(PYTHONLIBS_FOUND ${Python_FOUND})