diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | headers.patch | 102 |
3 files changed, 116 insertions, 4 deletions
@@ -72,8 +72,10 @@ pkgbase = ros-indigo-rviz 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 pkgname = ros-indigo-rviz @@ -84,10 +84,16 @@ depends=(${ros_depends[@]} # Tarball version (faster download) _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") -sha256sums=('17f125bd19e7ef1ccfd6674006346bcd626fbbc8c02b16703db03352ff6cc1bd' - 'b761541381e14c1d85633b866aebe6dc3f56bdc85db777a99bdfaaaadebee2d9') +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' +) build() { # Use ROS environment variables @@ -97,6 +103,7 @@ build() { # 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 @@ -108,6 +115,7 @@ build() { # Build project cmake ${srcdir}/${_dir} \ -DCMAKE_BUILD_TYPE=Release \ + -DUseQt5=ON \ -DCATKIN_BUILD_BINARY_PACKAGE=ON \ -DCMAKE_INSTALL_PREFIX=/opt/ros/indigo \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ diff --git a/headers.patch b/headers.patch new file mode 100644 index 000000000000..3310a4b12f86 --- /dev/null +++ b/headers.patch @@ -0,0 +1,102 @@ +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; + |