openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

sumo: update to 1.23.1

Browse Source 
Remove no longer needed GCC14 patch.

Make python optional. It's not used anyway.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2025-07-08 17:45:58 -07:00
committed by Tianling Shen
parent 832b3a4e43
commit 4a022613b8
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/sumo/Makefile
View File

@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sumo PKG_NAME:=sumo
PKG_VERSION:=1.16.0 PKG_VERSION:=1.23.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sumo PKG_SOURCE_URL:=@SF/sumo
PKG_HASH:=33694b554a8c661ec407d04cc7c6534c473ccb2fbe7bf2ea97e1faddc70654fa PKG_HASH:=016c506d8bd5d0b6f8e2229ac5dbb9e948535a041559cdd2ff6b616293ac21a8
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
@@ -40,7 +40,8 @@ define Package/sumo/description
endef endef
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DCCACHE_SUPPORT=OFF -DCCACHE_SUPPORT=OFF \
-DENABLE_PYTHON_BINDINGS=OFF
define Package/sumo/install define Package/sumo/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

2
utils/sumo/patches/010-gtest.patch
View File

@@ -1,6 +1,6 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/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") file(GLOB TEXTTEST_EXECUTABLE "${SUMO_LIBRARIES}/TextTest-*/texttest.exe")
else () else ()
# for Linux and Mac only # for Linux and Mac only

11
utils/sumo/patches/020-gcc14.patch
View File

@@ -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

11
utils/sumo/patches/020-python.patch Normal file
View File

@@ -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})