diff options
| author | Tim Rakowski | 2017-09-22 18:31:18 +0200 |
|---|---|---|
| committer | Tim Rakowski | 2017-09-22 18:31:18 +0200 |
| commit | 7d696c065f708a7a365660dc55bbb747980555f2 (patch) | |
| tree | b219db5023b5188a5365bde972c74ba9eb6acb0f | |
| parent | dbd497c1a4fd48c51a47b3c6b26f9d9e638dbf37 (diff) | |
| download | aur-gazebo-ogre-1.10.tar.gz | |
Fixed std::cout being used without iostream include
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | ogre-1.10.patch | 12 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sat Aug 26 09:36:48 UTC 2017 +# Fri Sep 22 16:28:55 UTC 2017 pkgbase = gazebo-ogre-1.10 pkgdesc = A multi-robot simulator for outdoor environments (using ogre 1.10) pkgver = 8.1.1 @@ -44,7 +44,7 @@ pkgbase = gazebo-ogre-1.10 source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.1.1.tar.bz2 source = ogre-1.10.patch sha256sums = bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949 - sha256sums = 4c375a1b29fc876832b98ce5a79fde4f98e6bffa10ba03088841a20b85a7fb9b + sha256sums = 0b687c04268709a84e2f0f7c10c815f1a6f7b364c58cb35fc5ada3653a704bc2 pkgname = gazebo-ogre-1.10 @@ -30,7 +30,7 @@ makedepends=('cmake' 'doxygen' 'pkg-config>=0.26') install="gazebo.install" source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-${pkgver}.tar.bz2" "ogre-1.10.patch") sha256sums=('bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949' - '4c375a1b29fc876832b98ce5a79fde4f98e6bffa10ba03088841a20b85a7fb9b') + '0b687c04268709a84e2f0f7c10c815f1a6f7b364c58cb35fc5ada3653a704bc2') provides=("gazebo=8.0.0") conflicts=("gazebo") diff --git a/ogre-1.10.patch b/ogre-1.10.patch index 80987a36a745..6a7ba1a131da 100644 --- a/ogre-1.10.patch +++ b/ogre-1.10.patch @@ -73,3 +73,15 @@ diff -ura src/gazebo-8.1.1/media/materials/scripts/ShadowCaster.material src2/ga - } - } -} +diff -ura src/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc src2/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc +--- src/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc 2017-06-05 17:01:57.000000000 +0200 ++++ src2/gazebo-8.1.1/gazebo/rendering/deferred_shading/MergeMaterialGenerator.cc 2017-09-22 18:07:48.348154448 +0200 +@@ -25,6 +25,8 @@ + + #include "gazebo/rendering/deferred_shading/MergeMaterialGenerator.hh" + ++#include <iostream> ++ + using namespace gazebo; + using namespace rendering; + |