summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f5f751765d4..4a5d01e7efc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Mar 22 00:27:47 UTC 2018
pkgbase = ros-kinetic-rviz
pkgdesc = ROS - 3D visualization tool for ROS.
- pkgver = 1.12.15
+ pkgver = 1.12.16
pkgrel = 1
url = http://ros.org/wiki/rviz
arch = any
@@ -63,15 +61,15 @@ pkgbase = ros-kinetic-rviz
depends = ros-kinetic-roscpp
depends = ros-kinetic-laser-geometry
depends = qt5-base
- depends = ogre
+ depends = ogre-1.9
depends = urdfdom-headers
depends = assimp
depends = eigen3
depends = tinyxml
depends = mesa
depends = yaml-cpp
- source = ros-kinetic-rviz-1.12.15-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/1.12.15-0.tar.gz
- sha256sums = f37baddc01fdc63586de61b5266c4d7bbcfac9d3f8696804e54e3d2165295afa
+ source = ros-kinetic-rviz-1.12.16-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/1.12.16-0.tar.gz
+ sha256sums = a106924bab0389bd8fe7c76567f70eeffe506dcce88d8c36a7f022b77c0cdd7b
pkgname = ros-kinetic-rviz
diff --git a/PKGBUILD b/PKGBUILD
index f7d91273237a..203ab836e7f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - 3D visualization tool for ROS."
url='http://ros.org/wiki/rviz'
pkgname='ros-kinetic-rviz'
-pkgver='1.12.15'
+pkgver='1.12.16'
_pkgver_patch=0
arch=('any')
pkgrel=1
@@ -68,7 +68,7 @@ ros_depends=(ros-kinetic-resource-retriever
ros-kinetic-laser-geometry)
depends=(${ros_depends[@]}
qt5-base
- ogre
+ ogre-1.9
urdfdom-headers
assimp
eigen3
@@ -85,7 +85,7 @@ depends=(${ros_depends[@]}
# Tarball version (faster download)
_dir="rviz-release-release-kinetic-rviz-${pkgver}-${_pkgver_patch}"
source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('f37baddc01fdc63586de61b5266c4d7bbcfac9d3f8696804e54e3d2165295afa')
+sha256sums=('a106924bab0389bd8fe7c76567f70eeffe506dcce88d8c36a7f022b77c0cdd7b')
build() {
# Use ROS environment variables
@@ -100,6 +100,7 @@ build() {
/usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
# Build project
+ export PKG_CONFIG_PATH=/opt/OGRE-1.9/lib/pkgconfig:$PKG_CONFIG_PATH
cmake ${srcdir}/${_dir} \
-DCMAKE_BUILD_TYPE=Release \
-DCATKIN_BUILD_BINARY_PACKAGE=ON \