summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD24
-rw-r--r--sumo.desktop13
3 files changed, 21 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6141e7f51ef3..b37d4a2e522d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,40 @@
pkgbase = sumo
pkgdesc = Traffic simulation modelling road vehicles, public transport and pedestrians.
pkgver = 1.19.0
- pkgrel = 2
+ pkgrel = 3
url = http://sumo.dlr.de
arch = i686
arch = x86_64
- license = GPL
+ license = EPL-2.0
makedepends = cmake
makedepends = help2man
makedepends = swig
makedepends = gtest
makedepends = gmock
- makedepends = flake8
- makedepends = autopep8
makedepends = python-setuptools
+ makedepends = python-build
+ makedepends = eigen
+ makedepends = jdk-openjdk
+ makedepends = maven
+ makedepends = git
+ makedepends = python-pip
depends = openscenegraph
- depends = python
depends = proj
depends = fox
depends = xerces-c
depends = gdal
depends = gl2ps
+ depends = flake8
+ depends = autopep8
depends = python-pyproj
depends = python-pandas
depends = python-scipy
+ depends = ffmpeg
+ depends = python-matplotlib
source = https://sumo.dlr.de/releases/1.19.0/sumo-src-1.19.0.tar.gz
- source = sumo.desktop
sha256sums = 7643b1f8a3d7144f181542c9c7b8c72f3e8e45ba9c627912665083db0fe106cd
- sha256sums = cc0ed7ad1cce228cd8c634e031c966e1795a16623f0e139ebdcc7ecd06d0bf4d
pkgname = sumo
optdepends = java-runtime-common: for executing Jar files like TraCI4J
- optdepends = python2: for executing various python scripts in /usr/share/sumo/tools
pkgname = sumo-doc
diff --git a/PKGBUILD b/PKGBUILD
index a062a9afd605..a545df3ee0bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,24 +3,23 @@
# Contributor: Florian Jacob <projects+arch AT florianjacob )DOT( de>
# Contributor: mareex <marcus [dot] behrendt [dot] 86 [at] gmail [dot] com>
-SUMO_HOME='/usr/share/sumo'
pkgname=('sumo' 'sumo-doc')
pkgbase=sumo
pkgver=1.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Traffic simulation modelling road vehicles, public transport and pedestrians."
arch=('i686' 'x86_64')
url="http://sumo.dlr.de"
license=('EPL-2.0')
depends=('openscenegraph' 'proj' 'fox' 'xerces-c' 'gdal' 'gl2ps' 'flake8' 'autopep8' 'python-pyproj' 'python-pandas' 'python-scipy' 'ffmpeg' 'python-matplotlib')
makedepends=('cmake' 'help2man' 'swig' 'gtest' 'gmock' 'python-setuptools' 'python-build' 'eigen' 'jdk-openjdk' 'maven' 'git' 'python-pip')
-source=("https://sumo.dlr.de/releases/${pkgver}/sumo-src-${pkgver}.tar.gz"
- "${pkgbase}.desktop")
+source=("https://sumo.dlr.de/releases/${pkgver}/sumo-src-${pkgver}.tar.gz")
-sha256sums=('7643b1f8a3d7144f181542c9c7b8c72f3e8e45ba9c627912665083db0fe106cd'
- 'cc0ed7ad1cce228cd8c634e031c966e1795a16623f0e139ebdcc7ecd06d0bf4d')
+sha256sums=('7643b1f8a3d7144f181542c9c7b8c72f3e8e45ba9c627912665083db0fe106cd')
prepare() {
+ # workaround for invalid version string generated by sumo at v1.19
+ sed -i "42i\ return 'v1_19_00'" "$pkgname-$pkgver"/tools/build/version.py
cmake -B build -S "$pkgname-$pkgver" \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -44,15 +43,10 @@ package_sumo() {
# Installs just the bin files
cmake --build build -- DESTDIR="${pkgdir}/" install
- install -d "${pkgdir}/etc/profile.d"
-cat <<EOF > "${pkgdir}/etc/profile.d/sumo.sh"
-#!/bin/sh
-
-export SUMO_HOME="$SUMO_HOME"
-EOF
-
- install -Dm644 ${pkgbase}-${pkgver}/data/logo/sumo-128x138.png ${pkgdir}/usr/share/pixmaps/${pkgbase}.png
- install -Dm644 ${srcdir}/${pkgbase}.desktop -t ${pkgdir}/usr/share/applications/
+ cd ${pkgbase}-${pkgver}
+ install -Dm644 data/logo/sumo-128x138.png ${pkgdir}/usr/share/pixmaps/${pkgbase}.png
+ install -Dm644 build/package/${pkgbase}.desktop -t ${pkgdir}/usr/share/applications/
+ install -Dm644 build/package/*sh -t ${pkgdir}/etc/profile.d/
}
package_sumo-doc() {
diff --git a/sumo.desktop b/sumo.desktop
deleted file mode 100644
index 121f218eb883..000000000000
--- a/sumo.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=sumo-gui %U
-Icon=sumo
-Terminal=false
-Name=Sumo
-GenericName=Sumo
-Comment=Microscopic Traffic Simulation
-Comment[de_DE]=Mikroskopische Verkehrssimulation
-Categories=Science;Education;
-MimeType=application/sumo-configuration;
-StartupWMClass=SUMO GUISimulation