summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Greenslade2017-06-03 19:11:34 -0700
committerSean Greenslade2017-06-03 19:11:34 -0700
commit7561e9aab0a87988ef2745b950cd04685cf9713e (patch)
treee6a4958e30be688bb7c737cf04ee0b8537392543
parentfa29edeb468c2c7e65333526083fd3824f0b6996 (diff)
downloadaur-7561e9aab0a87988ef2745b950cd04685cf9713e.tar.gz
Adjust for OGRE 1.9.
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 277fb57a0bdd..479f63c46b89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Jan 14 03:31:58 UTC 2017
+# Sun Jun 4 02:11:34 UTC 2017
pkgbase = ros-kinetic-rviz
pkgdesc = ROS - 3D visualization tool for ROS.
pkgver = 1.12.4
- pkgrel = 1
+ pkgrel = 2
url = http://ros.org/wiki/rviz
arch = any
license = BSD, Creative Commons
@@ -32,7 +32,7 @@ pkgbase = ros-kinetic-rviz
makedepends = ros-kinetic-python-qt-binding
makedepends = ros-kinetic-roscpp
makedepends = ros-kinetic-laser-geometry
- makedepends = ogre
+ makedepends = ogre-1.9
makedepends = qt5-base
makedepends = urdfdom-headers
makedepends = assimp
@@ -62,7 +62,7 @@ pkgbase = ros-kinetic-rviz
depends = ros-kinetic-python-qt-binding
depends = ros-kinetic-roscpp
depends = ros-kinetic-laser-geometry
- depends = ogre
+ depends = ogre-1.9
depends = qt5-base
depends = urdfdom-headers
depends = assimp
diff --git a/PKGBUILD b/PKGBUILD
index fb1a169a7877..898920d24b38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-kinetic-rviz'
pkgver='1.12.4'
_pkgver_patch=0
arch=('any')
-pkgrel=1
+pkgrel=2
license=('BSD, Creative Commons')
ros_makedepends=(ros-kinetic-map-msgs
@@ -35,7 +35,7 @@ ros_makedepends=(ros-kinetic-map-msgs
ros-kinetic-laser-geometry)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
- ogre
+ ogre-1.9
qt5-base
urdfdom-headers
assimp
@@ -67,7 +67,7 @@ ros_depends=(ros-kinetic-resource-retriever
ros-kinetic-roscpp
ros-kinetic-laser-geometry)
depends=(${ros_depends[@]}
- ogre
+ ogre-1.9
qt5-base
urdfdom-headers
assimp
@@ -99,6 +99,8 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
+ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/OGRE-1.9/lib/pkgconfig/
+
# Build project
cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \