summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Borgert2020-05-03 11:51:04 +0200
committerTobias Borgert2020-05-03 11:51:04 +0200
commit878c4d3ff4e797f28400c31cb95913fe23177d79 (patch)
tree570d71a6732ca938526dbe5e1528fee70103e629
parentccf12534dc8ffeaf34f50c2496af1f715d01a844 (diff)
downloadaur-878c4d3ff4e797f28400c31cb95913fe23177d79.tar.gz
Update to version 5.5.5
-rw-r--r--PKGBUILD6
-rw-r--r--arch-linux-compat.diff30
2 files changed, 5 insertions, 31 deletions
diff --git a/PKGBUILD b/PKGBUILD
index e1870da85eac..4351e1926b4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=ecal
_pkgver_major=5
_pkgver_minor=5
-_pkgver_patch=4
+_pkgver_patch=5
pkgver=$_pkgver_major.$_pkgver_minor.$_pkgver_patch
pkgrel=1
pkgdesc="enhanced Communication Abstraction Layer"
@@ -15,8 +15,8 @@ makedepends=('asio' 'cmake' 'doxygen' 'git' 'graphviz' 'simpleini' 'spdlog' 'tcl
optdepends=()
source=(https://github.com/continental/ecal/archive/v$pkgver.tar.gz
arch-linux-compat.diff)
-sha256sums=('445a864c9dcf43af098cea42cc604a2c3315e8d6de659cfb24872a966194315a'
- '9607c3b853fa07f7d5fe987438f5d9776b52f0472994b94557771c9c40d4f2f9')
+sha256sums=('35c58f8f22a2743d976484b6b2284542bdc21103c197cf8e816ea81658bbc061'
+ '5681be1564c288f5ad0afb0aef1c10c848b77a2f6a198a673a401d5271989ffa')
backup=('etc/ecal/ecal.ini' 'etc/ecal/ecaltime.ini')
prepare() {
diff --git a/arch-linux-compat.diff b/arch-linux-compat.diff
index cc5b1f9eea53..0bcb72572de0 100644
--- a/arch-linux-compat.diff
+++ b/arch-linux-compat.diff
@@ -1,17 +1,5 @@
-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>
- #include <unistd.h>
--#include <stropts.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.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
+index 2541ce3..4802d54 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 @@
@@ -23,15 +11,8 @@ index 2541ce3..9fc4a9a 100644
#include <spdlog/spdlog.h>
#include <iostream>
-@@ -91,4 +93,4 @@ private:
-
- EcalPlayLogger(const EcalPlayLogger&) = delete;
- EcalPlayLogger& operator = (const EcalPlayLogger&) = delete;
--};
-\ No newline at end of file
-+};
diff --git a/app/rec/rec_core/include/rec_core/ecal_rec_logger.h b/app/rec/rec_core/include/rec_core/ecal_rec_logger.h
-index 3b7aa62..52ea3fa 100644
+index 3b7aa62..138538c 100644
--- a/app/rec/rec_core/include/rec_core/ecal_rec_logger.h
+++ b/app/rec/rec_core/include/rec_core/ecal_rec_logger.h
@@ -21,6 +21,8 @@
@@ -43,10 +24,3 @@ index 3b7aa62..52ea3fa 100644
#include <spdlog/spdlog.h>
#include <iostream>
-@@ -97,4 +99,4 @@ namespace eCAL
- EcalRecLogger& operator = (const EcalRecLogger&) = delete;
- };
- }
--}
-\ No newline at end of file
-+}