From: Rosen Penev <redacted>
Date: Mon, 24 Jun 2024 05:17:27 +0000 (-0700)
Subject: sumo: update to 1.16.0
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ba0ff68c27a724c0c0dd3dc6f780598815395402;p=openwrt-packages.git

sumo: update to 1.16.0

Add patch for GCC14.

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/utils/sumo/Makefile b/utils/sumo/Makefile
index 1f2fe8a00..b2143bfc3 100644
--- a/utils/sumo/Makefile
+++ b/utils/sumo/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sumo
-PKG_VERSION:=1.12.0
+PKG_VERSION:=1.16.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/sumo
-PKG_HASH:=163dd6f7ed718e2a30630be3d2ac2ddfc4abce24750ed7f4efce879a3ae9447e
+PKG_HASH:=33694b554a8c661ec407d04cc7c6534c473ccb2fbe7bf2ea97e1faddc70654fa
 
 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
diff --git a/utils/sumo/patches/010-gtest.patch b/utils/sumo/patches/010-gtest.patch
index eb801e4d7..a3ebc1307 100644
--- a/utils/sumo/patches/010-gtest.patch
+++ b/utils/sumo/patches/010-gtest.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -270,7 +270,6 @@ if (SUMO_LIBRARIES AND WIN32)
+@@ -303,7 +303,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
new file mode 100644
index 000000000..682a78331
--- /dev/null
+++ b/utils/sumo/patches/020-gcc14.patch
@@ -0,0 +1,11 @@
+--- 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