summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbionade242019-05-11 10:21:47 +0000
committerbionade242019-05-11 10:21:47 +0000
commita355b947ac12b97823a4b9e6823a11e3d7d40b82 (patch)
tree6d5dfcae3a74aeb4b4081f6cd36f497c84834ecd
parent64f18664927b6fee5cf5fe800babc3c74f491ce0 (diff)
downloadaur-a355b947ac12b97823a4b9e6823a11e3d7d40b82.tar.gz
Update version and changed source to official ROS releases
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa425565cc44..baaa04d5036e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ros-melodic-roscpp
pkgdesc = ROS - roscpp is a C++ implementation of ROS.
- pkgver = 1.14.3
+ pkgver = 1.12.14
pkgrel = 1
url = http://ros.org/wiki/roscpp
arch = any
@@ -28,8 +28,8 @@ pkgbase = ros-melodic-roscpp
depends = ros-melodic-rosconsole
depends = ros-melodic-roscpp-serialization
depends = ros-melodic-message-runtime
- source = ros-melodic-roscpp-1.14.3-0.tar.gz::https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roscpp/1.14.3-0.tar.gz
- sha256sums = aafa1e50ff61f428b3cdf7158129b8b09b4bd7aae6aee553f6a5c8251eae1806
+ source = ros-melodic-roscpp-1.12.14.tar.gz::https://github.com/ros/ros_comm/archive/1.12.14.tar.gz
+ sha256sums = 239c225cc9b1613cc7f76daf73c182f991787b7cf601287cb6cc28957eeeec1d
pkgname = ros-melodic-roscpp
diff --git a/PKGBUILD b/PKGBUILD
index 052430878bc3..44f341581426 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,7 @@ pkgdesc="ROS - roscpp is a C++ implementation of ROS."
url='http://ros.org/wiki/roscpp'
pkgname='ros-melodic-roscpp'
-pkgver='1.14.3'
-_pkgver_patch=0
+pkgver='1.12.14'
arch=('any')
pkgrel=1
license=('BSD')
@@ -47,9 +46,9 @@ depends=(
${ros_depends[@]}
)
-_dir="ros_comm-release-release-melodic-roscpp-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros_comm-release/archive/release/melodic/roscpp/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('aafa1e50ff61f428b3cdf7158129b8b09b4bd7aae6aee553f6a5c8251eae1806')
+_dir="ros_comm-${pkgver}/clients/roscpp"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
+sha256sums=('239c225cc9b1613cc7f76daf73c182f991787b7cf601287cb6cc28957eeeec1d')
build() {
# Use ROS environment variables.
@@ -63,6 +62,9 @@ build() {
# Fix Python2/Python3 conflicts.
/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
+ #Workaround for boost signals
+ sed -i 's/signals//g' ${srcdir}/${_dir}/CMakeLists.txt
+
# Build the project.
cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \