summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-08-25 23:52:48 +0200
committerTim Rakowski2017-08-25 23:53:15 +0200
commitf07d49f4276972746ac3df83e7f7ed8e93613c1f (patch)
tree640349df5617e1e632263003a53fef28b1bb9560
parent7967c590c38ab301a134a2d294e78f41a57e687d (diff)
downloadaur-f07d49f4276972746ac3df83e7f7ed8e93613c1f.tar.gz
Fixed 'no matching function for call to SharedPtr::SharedPtr(int)'
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--ogre-1.10.patch15
3 files changed, 18 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93840383045c..5ab18d99016a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Aug 7 05:00:52 UTC 2017
+# Fri Aug 25 21:50:46 UTC 2017
pkgbase = gazebo-ogre-1.10
pkgdesc = A multi-robot simulator for outdoor environments (using ogre 1.10)
pkgver = 8.0.0
- pkgrel = 2
+ pkgrel = 3
url = http://gazebosim.org/
install = gazebo.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 64621e5984dd..ae3dff7046c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=gazebo-ogre-1.10
pkgver=8.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="A multi-robot simulator for outdoor environments (using ogre 1.10)"
arch=('i686' 'x86_64')
url="http://gazebosim.org/"
diff --git a/ogre-1.10.patch b/ogre-1.10.patch
index 756c942dd66d..71f820ce9093 100644
--- a/ogre-1.10.patch
+++ b/ogre-1.10.patch
@@ -9,6 +9,21 @@ diff -ura src/gazebo-8.0.0/gazebo/rendering/RenderEngine.cc src2/gazebo-8.0.0/ga
/*const Ogre::Root::PluginInstanceList ll =
this->dataPtr->root->getInstalledPlugins();
+diff -ura src/gazebo-8.0.0/gazebo/rendering/skyx/src/MeshManager.cpp src2/gazebo-8.0.0/gazebo/rendering/skyx/src/MeshManager.cpp
+--- src/gazebo-8.0.0/gazebo/rendering/skyx/src/MeshManager.cpp 2017-01-26 02:16:27.000000000 +0100
++++ src2/gazebo-8.0.0/gazebo/rendering/skyx/src/MeshManager.cpp 2017-08-25 23:33:57.747595635 +0200
+@@ -32,9 +32,9 @@
+ , mCreated(false)
+ , mSubMesh(0)
+ , mEntity(0)
+- , mVertexBuffer(0)
++ , mVertexBuffer()
+ , mVertices(0)
+- , mIndexBuffer(0)
++ , mIndexBuffer()
+ , mSceneNode(0)
+ , mSteps(70)
+ , mCircles(95)
diff -ura src/gazebo-8.0.0/gazebo/rendering/skyx/src/VClouds/DataManager.cpp src2/gazebo-8.0.0/gazebo/rendering/skyx/src/VClouds/DataManager.cpp
--- src/gazebo-8.0.0/gazebo/rendering/skyx/src/VClouds/DataManager.cpp 2017-01-26 02:16:27.000000000 +0100
+++ src2/gazebo-8.0.0/gazebo/rendering/skyx/src/VClouds/DataManager.cpp 2017-08-06 19:27:43.967225361 +0200