summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-06-07 18:19:43 +0200
committerBenjamin Chrétien2014-06-07 18:19:43 +0200
commitfe3cc8273582a23e127f06e8e0c4dc624eee44da (patch)
tree43c4f8651e36a5100acd38838c553ed98c288066
downloadaur-fe3cc8273582a23e127f06e8e0c4dc624eee44da.tar.gz
indigo: add robot.
-rw-r--r--.SRCINFO41
-rw-r--r--PKGBUILD79
-rw-r--r--assimp.patch32
3 files changed, 152 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..2cb8fff18197
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,41 @@
+pkgbase = ros-indigo-collada-urdf
+ pkgdesc = ROS - This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents.
+ pkgver = 1.11.2
+ pkgrel = 1
+ url = http://ros.org/wiki/collada_urdf
+ arch = any
+ license = BSD
+ makedepends = cmake
+ makedepends = git
+ makedepends = ros-build-tools
+ makedepends = ros-indigo-tf
+ makedepends = ros-indigo-geometric-shapes
+ makedepends = ros-indigo-roscpp
+ makedepends = ros-indigo-resource-retriever
+ makedepends = ros-indigo-angles
+ makedepends = ros-indigo-catkin
+ makedepends = ros-indigo-urdfdom
+ makedepends = ros-indigo-cmake-modules
+ makedepends = ros-indigo-collada-parser
+ makedepends = ros-indigo-urdf
+ makedepends = ros-indigo-urdfdom-headers
+ makedepends = assimp
+ makedepends = collada-dom
+ depends = ros-indigo-tf
+ depends = ros-indigo-geometric-shapes
+ depends = ros-indigo-roscpp
+ depends = ros-indigo-resource-retriever
+ depends = ros-indigo-angles
+ depends = ros-indigo-urdfdom
+ depends = ros-indigo-collada-parser
+ depends = ros-indigo-urdf
+ depends = ros-indigo-urdfdom-headers
+ depends = assimp
+ depends = collada-dom
+ source = collada_urdf::git+https://github.com/ros-gbp/robot_model-release.git#tag=release/indigo/collada_urdf/1.11.2-0
+ source = assimp.patch
+ md5sums = SKIP
+ md5sums = 17a9ba03b0d8332073d748e15f20f95d
+
+pkgname = ros-indigo-collada-urdf
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..f2e48db2085c
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,79 @@
+# Script generated with import_catkin_packages.py
+# For more information: https://github.com/bchretien/arch-ros-stacks
+pkgdesc="ROS - This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents."
+url='http://ros.org/wiki/collada_urdf'
+
+pkgname='ros-indigo-collada-urdf'
+pkgver='1.11.2'
+_pkgver_patch=0
+arch=('any')
+pkgrel=1
+license=('BSD')
+
+ros_makedepends=(ros-indigo-tf
+ ros-indigo-geometric-shapes
+ ros-indigo-roscpp
+ ros-indigo-resource-retriever
+ ros-indigo-angles
+ ros-indigo-catkin
+ ros-indigo-urdfdom
+ ros-indigo-cmake-modules
+ ros-indigo-collada-parser
+ ros-indigo-urdf
+ ros-indigo-urdfdom-headers)
+makedepends=('cmake' 'git' 'ros-build-tools'
+ ${ros_makedepends[@]}
+ assimp
+ collada-dom)
+
+ros_depends=(ros-indigo-tf
+ ros-indigo-geometric-shapes
+ ros-indigo-roscpp
+ ros-indigo-resource-retriever
+ ros-indigo-angles
+ ros-indigo-urdfdom
+ ros-indigo-collada-parser
+ ros-indigo-urdf
+ ros-indigo-urdfdom-headers)
+depends=(${ros_depends[@]}
+ assimp
+ collada-dom)
+
+_tag=release/indigo/collada_urdf/${pkgver}-${_pkgver_patch}
+_dir=collada_urdf
+source=("${_dir}"::"git+https://github.com/ros-gbp/robot_model-release.git"#tag=${_tag}
+ "assimp.patch")
+md5sums=('SKIP'
+ '17a9ba03b0d8332073d748e15f20f95d')
+
+build() {
+ # Use ROS environment variables
+ source /usr/share/ros-build-tools/clear-ros-env.sh
+ [ -f /opt/ros/indigo/setup.bash ] && source /opt/ros/indigo/setup.bash
+
+ cd ${srcdir}/${_dir}
+ git apply ${srcdir}/assimp.patch
+
+ # Create build directory
+ [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+ cd ${srcdir}/build
+
+ # Fix Python2/Python3 conflicts
+ /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+
+ # Build project
+ cmake ${srcdir}/${_dir} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/indigo \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}/" install
+}
diff --git a/assimp.patch b/assimp.patch
new file mode 100644
index 000000000000..bade67f78ebb
--- /dev/null
+++ b/assimp.patch
@@ -0,0 +1,32 @@
+commit 2d39cb20f09c2f2dd1cb6abbe228b0756c2a7e32
+Author: Benjamin Chrétien <chretien@lirmm.fr>
+Date: Fri May 23 10:43:14 2014 +0200
+
+ Fix clash with assimp 3.1 in CMake.
+
+diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
+index fc93e4c..524f2e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,9 +12,6 @@ catkin_package(
+
+ include_directories(include)
+
+-find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
+-include_directories(${Boost_INCLUDE_DIR})
+-
+ find_package(assimp QUIET)
+ if ( NOT ASSIMP_FOUND )
+ find_package(Assimp QUIET)
+@@ -42,6 +39,11 @@ else()
+ set(ASSIMP_INCLUDE_DIRS)
+ endif()
+
++# Note: assimp 3.1 overwrites CMake Boost variables, so we need to check for
++# Boost after assimp.
++find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
++include_directories(${Boost_INCLUDE_DIR})
++
+ find_package(COLLADA_DOM 2.3 COMPONENTS 1.5)
+ if( COLLADA_DOM_FOUND )
+ include_directories(${COLLADA_DOM_INCLUDE_DIRS})