summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD35
2 files changed, 20 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4d44ea18482b..a33072b34786 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,25 @@
# Generated by mksrcinfo v8
-# Sun Aug 6 10:47:42 UTC 2017
+# Tue Dec 12 20:47:25 UTC 2017
pkgbase = ros-lunar-urdf
pkgdesc = ROS - This package contains a C++ parser for the Unified Robot Description Format (URDF), which is an XML format for representing a robot model.
- pkgver = 1.12.11
+ pkgver = 1.12.12
pkgrel = 1
url = http://ros.org/wiki/urdf
arch = any
license = BSD
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-lunar-rosconsole-bridge
makedepends = ros-lunar-catkin
- makedepends = ros-lunar-roscpp
- makedepends = ros-lunar-pluginlib
makedepends = ros-lunar-cmake-modules
- makedepends = ros-lunar-rostest
makedepends = ros-lunar-urdf-parser-plugin
- makedepends = urdfdom
- makedepends = urdfdom-headers
depends = ros-lunar-rosconsole-bridge
depends = ros-lunar-roscpp
depends = ros-lunar-pluginlib
- depends = ros-lunar-urdf-parser-plugin
depends = urdfdom
+ depends = tinyxml
depends = urdfdom-headers
- source = ros-lunar-urdf-1.12.11-0.tar.gz::https://github.com/ros-gbp/robot_model-release/archive/release/lunar/urdf/1.12.11-0.tar.gz
- sha256sums = daf1e720eb332684c7c6e5ef0fbee8f748fe1175c8db22afde948b5dcd9ef375
+ source = ros-lunar-urdf-1.12.12-0.tar.gz::https://github.com/ros-gbp/urdf-release/archive/release/lunar/urdf/1.12.12-0.tar.gz
+ sha256sums = 215d05cb557935c5e9f60a34278d34cb12729efcdecf15e2029b91d9d7952999
pkgname = ros-lunar-urdf
diff --git a/PKGBUILD b/PKGBUILD
index 1cde0459951b..6834c3915314 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,36 @@ pkgdesc="ROS - This package contains a C++ parser for the Unified Robot Descript
url='http://ros.org/wiki/urdf'
pkgname='ros-lunar-urdf'
-pkgver='1.12.11'
+pkgver='1.12.12'
_pkgver_patch=0
arch=('any')
pkgrel=1
license=('BSD')
-ros_makedepends=(ros-lunar-rosconsole-bridge
- ros-lunar-catkin
- ros-lunar-roscpp
- ros-lunar-pluginlib
+ros_makedepends=(ros-lunar-catkin
ros-lunar-cmake-modules
- ros-lunar-rostest
ros-lunar-urdf-parser-plugin)
makedepends=('cmake' 'ros-build-tools'
- ${ros_makedepends[@]}
- urdfdom
- urdfdom-headers)
+ ${ros_makedepends[@]})
ros_depends=(ros-lunar-rosconsole-bridge
ros-lunar-roscpp
- ros-lunar-pluginlib
- ros-lunar-urdf-parser-plugin)
+ ros-lunar-pluginlib)
depends=(${ros_depends[@]}
urdfdom
+ tinyxml
urdfdom-headers)
# Git version (e.g. for debugging)
# _tag=release/lunar/urdf/${pkgver}-${_pkgver_patch}
# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/robot_model-release.git"#tag=${_tag})
+# source=("${_dir}"::"git+https://github.com/ros-gbp/urdf-release.git"#tag=${_tag})
# sha256sums=('SKIP')
# Tarball version (faster download)
-_dir="robot_model-release-release-lunar-urdf-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/robot_model-release/archive/release/lunar/urdf/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('daf1e720eb332684c7c6e5ef0fbee8f748fe1175c8db22afde948b5dcd9ef375')
+_dir="urdf-release-release-lunar-urdf-${pkgver}-${_pkgver_patch}"
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/urdf-release/archive/release/lunar/urdf/${pkgver}-${_pkgver_patch}.tar.gz")
+sha256sums=('215d05cb557935c5e9f60a34278d34cb12729efcdecf15e2029b91d9d7952999')
build() {
# Use ROS environment variables
@@ -47,14 +41,14 @@ build() {
[ -f /opt/ros/lunar/setup.bash ] && source /opt/ros/lunar/setup.bash
# Create build directory
- [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
- cd ${srcdir}/build
+ [ -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}
+ /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 "${srcdir}/${_dir}"
# Build project
- cmake ${srcdir}/${_dir} \
+ cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/lunar \
@@ -62,7 +56,8 @@ build() {
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DCATKIN_ENABLE_TESTING=OFF
make
}