summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD10
-rw-r--r--arch-linux-compat.diff16
3 files changed, 19 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 00e0a065772b..dec6efb55c33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ecal
pkgdesc = enhanced Communication Abstraction Layer
- pkgver = 5.5.3
- pkgrel = 4
+ pkgver = 5.5.4
+ pkgrel = 1
url = https://github.com/continental/ecal
arch = x86_64
arch = armv7h
@@ -9,6 +9,7 @@ pkgbase = ecal
makedepends = asio
makedepends = cmake
makedepends = doxygen
+ makedepends = git
makedepends = graphviz
makedepends = simpleini
makedepends = spdlog
@@ -18,10 +19,10 @@ pkgbase = ecal
depends = hdf5
backup = etc/ecal/ecal.ini
backup = etc/ecal/ecaltime.ini
- source = https://github.com/continental/ecal/archive/v5.5.3.tar.gz
+ source = https://github.com/continental/ecal/archive/v5.5.4.tar.gz
source = arch-linux-compat.diff
- sha256sums = ba95e707c69a0eb4b65f897bd34fc1d9c3c2d342d7685450960cc61435c3e613
- sha256sums = c01b56b234f3e2b105e10e3850ee568dc33f728efebedc768a3b0dc0e4b6e835
+ sha256sums = 445a864c9dcf43af098cea42cc604a2c3315e8d6de659cfb24872a966194315a
+ sha256sums = 9607c3b853fa07f7d5fe987438f5d9776b52f0472994b94557771c9c40d4f2f9
pkgname = ecal
diff --git a/PKGBUILD b/PKGBUILD
index 8c655d12a486..e1870da85eac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,20 @@
pkgname=ecal
_pkgver_major=5
_pkgver_minor=5
-_pkgver_patch=3
+_pkgver_patch=4
pkgver=$_pkgver_major.$_pkgver_minor.$_pkgver_patch
-pkgrel=4
+pkgrel=1
pkgdesc="enhanced Communication Abstraction Layer"
arch=('x86_64' 'armv7h')
url="https://github.com/continental/ecal"
license=('Apache')
depends=('protobuf' 'qt5-base' 'hdf5')
-makedepends=('asio' 'cmake' 'doxygen' 'graphviz' 'simpleini' 'spdlog' 'tclap')
+makedepends=('asio' 'cmake' 'doxygen' 'git' 'graphviz' 'simpleini' 'spdlog' 'tclap')
optdepends=()
source=(https://github.com/continental/ecal/archive/v$pkgver.tar.gz
arch-linux-compat.diff)
-sha256sums=('ba95e707c69a0eb4b65f897bd34fc1d9c3c2d342d7685450960cc61435c3e613'
- 'c01b56b234f3e2b105e10e3850ee568dc33f728efebedc768a3b0dc0e4b6e835')
+sha256sums=('445a864c9dcf43af098cea42cc604a2c3315e8d6de659cfb24872a966194315a'
+ '9607c3b853fa07f7d5fe987438f5d9776b52f0472994b94557771c9c40d4f2f9')
backup=('etc/ecal/ecal.ini' 'etc/ecal/ecaltime.ini')
prepare() {
diff --git a/arch-linux-compat.diff b/arch-linux-compat.diff
index d864c3cc3625..cc5b1f9eea53 100644
--- a/arch-linux-compat.diff
+++ b/arch-linux-compat.diff
@@ -1,7 +1,7 @@
-diff --git a/app/play/eCALPlay/src/EcalPlayCli.cpp b/app/play/eCALPlay/src/EcalPlayCli.cpp
-index 05d0524..21c5fed 100644
---- a/app/play/eCALPlay/src/EcalPlayCli.cpp
-+++ b/app/play/eCALPlay/src/EcalPlayCli.cpp
+diff --git a/app/play/play_cli/src/ecal_play_cli.cpp b/app/play/play_cli/src/ecal_play_cli.cpp
+index c42ef7b..25c9e8d 100644
+--- a/app/play/play_cli/src/ecal_play_cli.cpp
++++ b/app/play/play_cli/src/ecal_play_cli.cpp
@@ -54,7 +54,6 @@
#include <sys/ioctl.h>
#include <termios.h>
@@ -10,10 +10,10 @@ index 05d0524..21c5fed 100644
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-diff --git a/app/play/eCALPlayCore/include/EcalPlayLogger.h b/app/play/eCALPlayCore/include/EcalPlayLogger.h
-index eaa971c..6672431 100644
---- a/app/play/eCALPlayCore/include/EcalPlayLogger.h
-+++ b/app/play/eCALPlayCore/include/EcalPlayLogger.h
+diff --git a/app/play/play_core/include/ecal_play_logger.h b/app/play/play_core/include/ecal_play_logger.h
+index 2541ce3..9fc4a9a 100644
+--- a/app/play/play_core/include/ecal_play_logger.h
++++ b/app/play/play_core/include/ecal_play_logger.h
@@ -21,6 +21,8 @@
#include <string>