Skip to content

Commit

Permalink
Bump version 0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Libor Wagner committed Jun 17, 2020
1 parent a6692e6 commit 4445c79
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 22 deletions.
14 changes: 8 additions & 6 deletions .SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ros-noetic-libfranka
pkgdesc = C++ library for Franka Emika research robots
pkgver = 0.7.1
pkgver = 0.8.0
pkgrel = 1
url = http://wiki.ros.org/libfranka
arch = i686
Expand All @@ -10,13 +10,15 @@ pkgbase = ros-noetic-libfranka
arch = armv6h
license = Apache
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-noetic-roscpp
makedepends = ros-noetic-catkin
makedepends = git
depends = eigen
depends = poco
source = ros-noetic-libfranka-0.7.1.tar.gz::https://github.com/frankaemika/libfranka-release/archive/upstream/0.7.1.tar.gz
sha256sums = 4e552542954f43b03d68e4c8f2b21f221ac563b40ad9d7e63dd9938a17db0ab7
source = git+https://github.com/frankaemika/libfranka-common.git
source = git+https://github.com/frankaemika/libfranka.git#tag=0.8.0
source = fix_missing_includes.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP

pkgname = ros-noetic-libfranka

50 changes: 34 additions & 16 deletions PKGBUILD
@@ -1,37 +1,55 @@
pkgdesc="C++ library for Franka Emika research robots "
url="http://wiki.ros.org/libfranka"

pkgname='ros-noetic-libfranka'
pkgver='0.7.1'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
pkgname="ros-noetic-libfranka"
pkgver="0.8.0"
pkgrel=1
pkgdesc="C++ library for Franka Emika research robots "
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
url="http://wiki.ros.org/libfranka"
license=('Apache')

ros_makedepends=(ros-noetic-roscpp ros-noetic-catkin)
makedepends=('cmake' 'ros-build-tools' ${ros_makedepends[@]})
ros_makedepends=()
makedepends=('cmake' 'git' ${ros_makedepends[@]})

ros_depends=()
depends=('eigen' 'poco' ${ros_depends[@]})

_dir="libfranka-release-upstream-$pkgver"
source=("$pkgname-$pkgver.tar.gz::https://github.com/frankaemika/libfranka-release/archive/upstream/$pkgver.tar.gz")
sha256sums=("4e552542954f43b03d68e4c8f2b21f221ac563b40ad9d7e63dd9938a17db0ab7")
source=(
"git+https://github.com/frankaemika/libfranka-common.git"
"git+https://github.com/frankaemika/libfranka.git#tag=$pkgver"
"fix_missing_includes.patch"
)

sha256sums=(
SKIP
SKIP
SKIP
)

prepare() {
# add submodule
cd ${srcdir}/libfranka
git submodule init
git config submodule.common.url $srcdir/libfranka-common
git submodule update

# fix missing string include
cd ${srcdir}/libfranka
patch --forward --strip=1 --input="${srcdir}/fix_missing_includes.patch"
}

build() {
# Use ROS environment variables
source /usr/share/ros-build-tools/clear-ros-env.sh
[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash

# Create build directory
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
cd ${srcdir}/build

# Build project
cmake ${srcdir}/${_dir} \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
cmake ${srcdir}/libfranka \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
-DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}

Expand Down
24 changes: 24 additions & 0 deletions fix_missing_includes.patch
@@ -0,0 +1,24 @@
diff --git a/include/franka/control_tools.h b/include/franka/control_tools.h
index dc5017c..0bd2c30 100644
--- a/include/franka/control_tools.h
+++ b/include/franka/control_tools.h
@@ -4,6 +4,7 @@

#include <array>
#include <cmath>
+#include <string>

/**
* @file control_tools.h
diff --git a/src/control_types.cpp b/src/control_types.cpp
index 046062e..0c6bd58 100644
--- a/src/control_types.cpp
+++ b/src/control_types.cpp
@@ -3,6 +3,7 @@
#include <type_traits>

#include <franka/control_types.h>
+#include <stdexcept>

namespace franka {

0 comments on commit 4445c79

Please sign in to comment.