summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2015-02-13 17:40:03 +0100
committerBenjamin Chrétien2015-02-13 17:40:19 +0100
commit1512e7be03c6ff6fb25c75aada202170722967f8 (patch)
treef606c6efc36e611307c1f84ab50a60a548310b21
parentd5554248bff26d40c527bca416df23093d22def4 (diff)
downloadaur-1512e7be03c6ff6fb25c75aada202170722967f8.tar.gz
indigo: desktop_full update + catkin_pkg update.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD25
2 files changed, 9 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94bac393f6be..a3f85ddb7a8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-indigo-gazebo-plugins
pkgdesc = ROS - Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components.
pkgver = 2.4.7
- pkgrel = 2
+ pkgrel = 3
url = http://gazebosim.org/tutorials?cat=connect_ros
arch = any
license = BSD, Apache 2.0
@@ -33,8 +33,7 @@ pkgbase = ros-indigo-gazebo-plugins
makedepends = ros-indigo-dynamic-reconfigure
makedepends = ros-indigo-driver-base
makedepends = gazebo
- makedepends = ogre-1.8
- makedepends = cegui-0.7-ogre
+ makedepends = ogre
depends = ros-indigo-geometry-msgs
depends = ros-indigo-rospy
depends = ros-indigo-nav-msgs
@@ -59,11 +58,9 @@ pkgbase = ros-indigo-gazebo-plugins
depends = ros-indigo-dynamic-reconfigure
depends = ros-indigo-driver-base
depends = gazebo
- depends = ogre-1.8
+ depends = ogre
source = gazebo_plugins::git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git#tag=release/indigo/gazebo_plugins/2.4.7-1
- source = ogre_linker.patch
md5sums = SKIP
- md5sums = 995e16e3e777e9a4542d77654ecb1a54
pkgname = ros-indigo-gazebo-plugins
diff --git a/PKGBUILD b/PKGBUILD
index 313eaf2122a6..866d0af4abf9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-indigo-gazebo-plugins'
pkgver='2.4.7'
_pkgver_patch=1
arch=('any')
-pkgrel=2
+pkgrel=3
license=('BSD, Apache 2.0')
ros_makedepends=(ros-indigo-geometry-msgs
@@ -37,8 +37,7 @@ ros_makedepends=(ros-indigo-geometry-msgs
makedepends=('cmake' 'git' 'ros-build-tools'
${ros_makedepends[@]}
gazebo
- ogre-1.8
- cegui-0.7-ogre)
+ ogre)
ros_depends=(ros-indigo-geometry-msgs
ros-indigo-rospy
@@ -65,25 +64,18 @@ ros_depends=(ros-indigo-geometry-msgs
ros-indigo-driver-base)
depends=(${ros_depends[@]}
gazebo
- ogre-1.8)
+ ogre)
_tag=release/indigo/gazebo_plugins/${pkgver}-${_pkgver_patch}
_dir=gazebo_plugins
-source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag}
- "ogre_linker.patch")
-md5sums=('SKIP'
- '995e16e3e777e9a4542d77654ecb1a54')
+source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag})
+md5sums=('SKIP')
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
- # Apply patch
- msg "Patching source code"
- cd ${srcdir}/${_dir}
- git apply ${srcdir}/ogre_linker.patch
-
# Create build directory
[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
cd ${srcdir}/build
@@ -91,10 +83,6 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
- # Adapt paths for Ogre 1.8
- export PKG_CONFIG_PATH="/opt/OGRE-1.8/lib/pkgconfig:$PKG_CONFIG_PATH"
- export LD_LIBRARY_PATH="/opt/OGRE-1.8/lib:$LD_LIBRARY_PATH"
-
# Build project
cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \
@@ -104,8 +92,7 @@ build() {
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-DPYTHON_BASENAME=-python2.7 \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCMAKE_LIBRARY_PATH="/opt/OGRE-1.8/lib"
+ -DSETUPTOOLS_DEB_LAYOUT=OFF
make
}