Update from jerry73204

5 files changed, 61 insertions, 160 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 303620a24935..7c5f57e71543 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun May 22 21:12:32 UTC 2016
 pkgbase = ros-indigo-rviz
 	pkgdesc = ROS - 3D visualization tool for ROS.
-	pkgver = 1.11.14
-	pkgrel = 2
+	pkgver = 1.11.19
+	pkgrel = 1
 	url = http://ros.org/wiki/rviz
 	arch = any
 	license = BSD, Creative Commons
@@ -34,7 +32,7 @@ pkgbase = ros-indigo-rviz
 	makedepends = ros-indigo-roslib
 	makedepends = ros-indigo-message-filters
 	makedepends = qt4
-	makedepends = ogre
+	makedepends = ogre-1.9
 	makedepends = assimp
 	makedepends = eigen3
 	makedepends = tinyxml
@@ -64,18 +62,16 @@ pkgbase = ros-indigo-rviz
 	depends = ros-indigo-roslib
 	depends = ros-indigo-message-filters
 	depends = qt4
-	depends = ogre
+	depends = ogre-1.9
 	depends = assimp
 	depends = eigen3
 	depends = tinyxml
 	depends = mesa
 	depends = yaml-cpp
-	source = ros-indigo-rviz-1.11.14-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/1.11.14-0.tar.gz
-	source = gcc.patch
-	source = headers.patch
-	sha256sums = 17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd
-	sha256sums = b761541381e14c1d85633b866aebe6dc3f56bdc85db777a99bdfaaaadebee2d9
-	sha256sums = afdc65a0fdd76c6daaca53e172d9b0735621df07e9a8d7cf9f663ba1d54c03ab
+	source = ros-indigo-rviz-1.11.19-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/1.11.19-0.tar.gz
+	source = use-ogre-1.9.patch
+	sha256sums = 74fdb4f4806aa68afa533c83014315e5790f2279d0b256c7d68164e4ff0de50f
+	sha256sums = fa3dbb6e00c70afb65e5a5bda131975039727034d3d2e04b80b0e620b6286907
 
 pkgname = ros-indigo-rviz
 
diff --git a/PKGBUILD b/PKGBUILD
index a5dbd3b75c1e..f55f07ea73a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgdesc="ROS - 3D visualization tool for ROS."
 url='http://ros.org/wiki/rviz'
 
 pkgname='ros-indigo-rviz'
-pkgver='1.11.14'
+pkgver='1.11.19'
 _pkgver_patch=0
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD, Creative Commons')
 
 ros_makedepends=(ros-indigo-geometry-msgs
@@ -37,7 +37,7 @@ ros_makedepends=(ros-indigo-geometry-msgs
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
   qt4
-  ogre
+  ogre-1.9
   assimp
   eigen3
   tinyxml
@@ -69,7 +69,7 @@ ros_depends=(ros-indigo-geometry-msgs
   ros-indigo-message-filters)
 depends=(${ros_depends[@]}
   qt4
-  ogre
+  ogre-1.9
   assimp
   eigen3
   tinyxml
@@ -86,25 +86,22 @@ depends=(${ros_depends[@]}
 _dir="rviz-release-release-indigo-rviz-${pkgver}-${_pkgver_patch}"
 source=(
   "${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/indigo/rviz/${pkgver}-${_pkgver_patch}.tar.gz"
-  "gcc.patch"
-  "headers.patch"
-)
-sha256sums=(
-  '17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd'
-  'b761541381e14c1d85633b866aebe6dc3f56bdc85db777a99bdfaaaadebee2d9'
-  'afdc65a0fdd76c6daaca53e172d9b0735621df07e9a8d7cf9f663ba1d54c03ab'
+  'use-ogre-1.9.patch'
 )
+sha256sums=('74fdb4f4806aa68afa533c83014315e5790f2279d0b256c7d68164e4ff0de50f'
+            'fa3dbb6e00c70afb65e5a5bda131975039727034d3d2e04b80b0e620b6286907')
+
+prepare() {
+  # Apply patch
+  cd "${srcdir}/${_dir}"
+  patch -p1 -i "${srcdir}/use-ogre-1.9.patch"
+}
 
 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
-  cd "${srcdir}/${_dir}"
-  patch -p1 -i "${srcdir}"/gcc.patch
-  patch -p1 -i "${srcdir}"/headers.patch
-
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
diff --git a/gcc.patch b/gcc.patch
deleted file mode 100644
index fcf49b9a19a5..000000000000
--- a/gcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b216efc06fcf41ceff6c7ad0b63552964f892245 Mon Sep 17 00:00:00 2001
-From: Kartik Mohta <kartikmohta@gmail.com>
-Date: Tue, 17 May 2016 03:58:19 -0400
-Subject: [PATCH] Fix compile error due to the user-defined string literals
- feature
-
----
- src/rviz/default_plugin/effort_display.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/rviz/default_plugin/effort_display.h b/src/rviz/default_plugin/effort_display.h
-index bc89bd6..c408421 100644
---- a/src/rviz/default_plugin/effort_display.h
-+++ b/src/rviz/default_plugin/effort_display.h
-@@ -36,13 +36,13 @@ namespace tf
- # undef TF_MESSAGEFILTER_DEBUG
- #endif
- #define TF_MESSAGEFILTER_DEBUG(fmt, ...) \
--  ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__)
-+  ROS_DEBUG_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__)
- 
- #ifdef TF_MESSAGEFILTER_WARN
- # undef TF_MESSAGEFILTER_WARN
- #endif
- #define TF_MESSAGEFILTER_WARN(fmt, ...) \
--  ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: "fmt, getTargetFramesString().c_str(), __VA_ARGS__)
-+  ROS_WARN_NAMED("message_filter", "MessageFilter [target=%s]: " fmt, getTargetFramesString().c_str(), __VA_ARGS__)
- 
-     class MessageFilterJointState : public MessageFilter<sensor_msgs::JointState>
-     {
diff --git a/headers.patch b/headers.patch
deleted file mode 100644
index 3310a4b12f86..000000000000
--- a/headers.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/ogre_media/materials/glsl120/nogp/nogp.program b/ogre_media/materials/glsl120/nogp/nogp.program
-index fe36ea7..a68a87e 100644
---- a/ogre_media/materials/glsl120/nogp/nogp.program
-+++ b/ogre_media/materials/glsl120/nogp/nogp.program
-@@ -1,10 +1,10 @@
- // These shaders are work-arounds in case geometry shaders
- // are not supported, so vertices can't be created on the graphics card.
--// Multiple vertices are passed in for each primitive, 
-+// Multiple vertices are passed in for each primitive,
- // and each one is offset according to its texture coords.
- 
- //includes:
--vertex_program rviz/glsl120/include/pass_depth.vert glsl { source ../include/pass_depth.vert }
-+vertex_program rviz/glsl120/nogp/pass_depth.vert glsl { source ../include/pass_depth.vert }
- 
- vertex_program rviz/glsl120/nogp/billboard_tile.vert glsl
- {
-@@ -21,7 +21,7 @@ vertex_program rviz/glsl120/nogp/billboard_tile.vert(with_depth) glsl
- {
-   source billboard_tile.vert
-   preprocessor_defines WITH_DEPTH=1
--  attach rviz/glsl120/include/pass_depth.vert
-+  attach rviz/glsl120/nogp/pass_depth.vert
-   default_params
-   {
-     param_named_auto worldviewproj_matrix worldviewproj_matrix
-@@ -47,7 +47,7 @@ vertex_program rviz/glsl120/nogp/billboard.vert(with_depth) glsl
- {
-   source billboard.vert
-   preprocessor_defines WITH_DEPTH=1
--  attach rviz/glsl120/include/pass_depth.vert
-+  attach rviz/glsl120/nogp/pass_depth.vert
-   default_params {
-     param_named_auto worldviewproj_matrix worldviewproj_matrix
-     param_named_auto worldview_matrix     worldview_matrix
-@@ -71,7 +71,7 @@ vertex_program rviz/glsl120/nogp/box.vert(with_depth) glsl
- {
-   source box.vert
-   preprocessor_defines WITH_DEPTH=1
--  attach rviz/glsl120/include/pass_depth.vert
-+  attach rviz/glsl120/nogp/pass_depth.vert
-   default_params {
-     param_named_auto worldviewproj_matrix worldviewproj_matrix
-     param_named_auto worldview_matrix     worldview_matrix
-diff --git a/src/rviz/ogre_helpers/mesh_shape.cpp b/src/rviz/ogre_helpers/mesh_shape.cpp
-index 560e1e3..12f2802 100644
---- a/src/rviz/ogre_helpers/mesh_shape.cpp
-+++ b/src/rviz/ogre_helpers/mesh_shape.cpp
-@@ -29,6 +29,7 @@
- 
- #include "mesh_shape.h"
- 
-+#include <OgreMesh.h>
- #include <OgreMeshManager.h>
- #include <OgreSceneManager.h>
- #include <OgreSceneNode.h>
-@@ -47,7 +48,7 @@ MeshShape::MeshShape(Ogre::SceneManager* scene_manager, Ogre::SceneNode* parent_
- , started_(false)
- {
-   static uint32_t count = 0;
--  manual_object_ = scene_manager->createManualObject("MeshShape_ManualObject" + boost::lexical_cast<std::string>(count++)); 
-+  manual_object_ = scene_manager->createManualObject("MeshShape_ManualObject" + boost::lexical_cast<std::string>(count++));
-   material_->setCullingMode(Ogre::CULL_NONE);
- }
- 
-@@ -70,7 +71,7 @@ void MeshShape::beginTriangles()
-     ROS_WARN("Cannot modify mesh once construction is complete");
-     return;
-   }
--  
-+
-   if (!started_)
-   {
-     started_ = true;
-diff --git a/src/test/render_points_test.cpp b/src/test/render_points_test.cpp
-index 424f644..b8504c7 100644
---- a/src/test/render_points_test.cpp
-+++ b/src/test/render_points_test.cpp
-@@ -34,6 +34,9 @@
- #include <QApplication>
- #include <QVBoxLayout>
- 
-+#include <OgreCamera.h>
-+#include <OgreSceneNode.h>
-+
- using namespace rviz;
- 
- MyFrame::MyFrame( QWidget* parent )
-diff --git a/src/test/two_render_widgets.cpp b/src/test/two_render_widgets.cpp
-index 8cb630d..f75145d 100644
---- a/src/test/two_render_widgets.cpp
-+++ b/src/test/two_render_widgets.cpp
-@@ -37,6 +37,9 @@
- 
- #include <OgreRenderWindow.h>
- #include <OgreEntity.h>
-+#include <OgreSceneNode.h>
-+#include <OgreCamera.h>
-+#include <OgreViewport.h>
- 
- using namespace rviz;
- 
diff --git a/use-ogre-1.9.patch b/use-ogre-1.9.patch
new file mode 100644
index 000000000000..a97db690ad89
--- /dev/null
+++ b/use-ogre-1.9.patch
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d2da7d..fce4e61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,15 +68,24 @@ message(STATUS OGRE_PLUGIN_PATH=${OGRE_PLUGIN_PATH})
+ # or when 2 versions of Ogre are installed.  Using absolute paths ensures that
+ # components that link against Ogre (rviz and any packages depending on rviz)
+ # all find the same Ogre shared library.
++
++unset(OGRE_OV_LIBRARIES_ABS CACHE)
++
+ if(NOT DEFINED OGRE_OV_LIBRARIES_ABS)
+   unset(OGRE_OV_LIBRARIES_ABS_TMP)
+   foreach(_lib ${OGRE_OV_LIBRARIES})
++    if(NOT _lib STREQUAL "OgreMain" AND NOT _lib STREQUAL "OgreOverlay")
++      continue()
++    endif(NOT _lib STREQUAL "OgreMain" AND NOT _lib STREQUAL "OgreOverlay")
++
+     set(OGRE_OV_LIB_TAG "OGRE_OV_RVIZ_LIB_${_lib}")
+
++    unset(${OGRE_OV_LIB_TAG} CACHE)
+     find_library(${OGRE_OV_LIB_TAG}
+             NAMES ${_lib}
+-            HINTS ${OGRE_OV_LIBRARY_DIRS}
+-            PATHS ${OGRE_OV_LIBRARY_DIRS}
++            PATHS "/opt/OGRE-1.9/lib"
++            NO_DEFAULT_PATH
++            REQUIRED
+     )
+
+     set(OGRE_OV_LIBRARIES_ABS_TMP ${OGRE_OV_LIBRARIES_ABS_TMP} ${${OGRE_OV_LIB_TAG}})
+@@ -86,6 +95,8 @@ if(NOT DEFINED OGRE_OV_LIBRARIES_ABS)
+         CACHE FILEPATH "Pathname of library ${_lib}")
+ endif(NOT DEFINED OGRE_OV_LIBRARIES_ABS)
+
++set(OGRE_OV_INCLUDE_DIRS "/opt/OGRE-1.9/include/OGRE" "/opt/OGRE-1.9/include/OGRE/Overlay")
++
+ if(APPLE)
+   FIND_LIBRARY(Cocoa_LIBRARIES Cocoa)
+   set(rviz_ADDITIONAL_LIBRARIES ${Cocoa_LIBRARIES})