summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-01-28 21:03:09 +0100
committerAlexis Ballier <aballier@gentoo.org>2017-01-28 21:13:20 +0100
commit9c0dddf487d1ee72312fc8c1f7d2a5034ad79d50 (patch)
treecf424230d7e123fa0f743ce6862e2b9d0c67a162 /sci-electronics/gazebo/files
parentmedia-sound/wavpack: bump to 5.1.0 (diff)
downloadgentoo-9c0dddf487d1ee72312fc8c1f7d2a5034ad79d50.tar.gz
gentoo-9c0dddf487d1ee72312fc8c1f7d2a5034ad79d50.tar.bz2
gentoo-9c0dddf487d1ee72312fc8c1f7d2a5034ad79d50.zip
sci-electronics/gazebo: Bump to 8.0.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r--sci-electronics/gazebo/files/qwt.patch64
-rw-r--r--sci-electronics/gazebo/files/tests.patch46
2 files changed, 110 insertions, 0 deletions
diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
new file mode 100644
index 00000000000..d7bbce2f8cb
--- /dev/null
+++ b/sci-electronics/gazebo/files/qwt.patch
@@ -0,0 +1,64 @@
+Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
+===================================================================
+--- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
++++ gazebo-8.0.0/cmake/SearchForStuff.cmake
+@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
+ /usr/local/lib/qwt.framework/Headers
+ ${QWT_WIN_INCLUDE_DIR}
+
+- PATH_SUFFIXES qwt qwt5
++ PATH_SUFFIXES qwt6
+ )
+
+-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
++find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
+ /usr/lib
+ /usr/local/lib
+ /usr/local/lib/qwt.framework
+Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
+===================================================================
+--- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
++++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
+@@ -23,24 +23,24 @@
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wfloat-equal"
+
+-#include <qwt/qwt_curve_fitter.h>
+-#include <qwt/qwt_legend.h>
+-#include <qwt/qwt_painter.h>
+-#include <qwt/qwt_picker_machine.h>
+-#include <qwt/qwt_plot.h>
+-#include <qwt/qwt_plot_canvas.h>
+-#include <qwt/qwt_plot_curve.h>
+-#include <qwt/qwt_plot_directpainter.h>
+-#include <qwt/qwt_plot_grid.h>
+-#include <qwt/qwt_plot_layout.h>
+-#include <qwt/qwt_plot_magnifier.h>
+-#include <qwt/qwt_plot_marker.h>
+-#include <qwt/qwt_plot_panner.h>
+-#include <qwt/qwt_plot_zoomer.h>
+-#include <qwt/qwt_scale_engine.h>
+-#include <qwt/qwt_scale_widget.h>
+-#include <qwt/qwt_symbol.h>
+-#include <qwt/qwt_plot_renderer.h>
++#include <qwt6/qwt_curve_fitter.h>
++#include <qwt6/qwt_legend.h>
++#include <qwt6/qwt_painter.h>
++#include <qwt6/qwt_picker_machine.h>
++#include <qwt6/qwt_plot.h>
++#include <qwt6/qwt_plot_canvas.h>
++#include <qwt6/qwt_plot_curve.h>
++#include <qwt6/qwt_plot_directpainter.h>
++#include <qwt6/qwt_plot_grid.h>
++#include <qwt6/qwt_plot_layout.h>
++#include <qwt6/qwt_plot_magnifier.h>
++#include <qwt6/qwt_plot_marker.h>
++#include <qwt6/qwt_plot_panner.h>
++#include <qwt6/qwt_plot_zoomer.h>
++#include <qwt6/qwt_scale_engine.h>
++#include <qwt6/qwt_scale_widget.h>
++#include <qwt6/qwt_symbol.h>
++#include <qwt6/qwt_plot_renderer.h>
+
+ #pragma clang diagnostic pop
+
diff --git a/sci-electronics/gazebo/files/tests.patch b/sci-electronics/gazebo/files/tests.patch
new file mode 100644
index 00000000000..4f06acbc0ee
--- /dev/null
+++ b/sci-electronics/gazebo/files/tests.patch
@@ -0,0 +1,46 @@
+Index: gazebo-8.0.0/test/integration/physics_link.cc
+===================================================================
+--- gazebo-8.0.0.orig/test/integration/physics_link.cc
++++ gazebo-8.0.0/test/integration/physics_link.cc
+@@ -199,7 +199,7 @@ void PhysicsLinkTest::AddForce(const std
+ gzdbg << "World != link == inertial frames, no offset" << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(2, 3, 4),
+- ignition::math::Vector3d(0, IGN_PI/2.0, 1)), link);
++ ignition::math::Quaterniond(0, IGN_PI/2.0, 1)), link);
+ EXPECT_NE(ignition::math::Pose3d::Zero, link->WorldPose());
+ EXPECT_EQ(link->WorldPose(), link->WorldInertialPose());
+ this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(-1, 10, 5));
+@@ -215,7 +215,7 @@ void PhysicsLinkTest::AddForce(const std
+ model->SetLinkWorldPose(ignition::math::Pose3d::Zero, link);
+ ignition::math::Pose3d inertialPose = ignition::math::Pose3d(
+ ignition::math::Vector3d(1, 5, 8),
+- ignition::math::Vector3d(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
++ ignition::math::Quaterniond(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4));
+ link->GetInertial()->SetCoG(inertialPose);
+ EXPECT_EQ(ignition::math::Pose3d::Zero, link->WorldPose());
+ EXPECT_EQ(inertialPose, link->WorldInertialPose());
+@@ -224,9 +224,9 @@ void PhysicsLinkTest::AddForce(const std
+ gzdbg << "World != link != inertial frames, with offset" << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(5, 10, -4),
+- ignition::math::Vector3d(0, IGN_PI/2.0, IGN_PI/6)), link);
++ ignition::math::Quaterniond(0, IGN_PI/2.0, IGN_PI/6)), link);
+ inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(0, -5, 10),
+- ignition::math::Vector3d(0, 2.0*IGN_PI, IGN_PI/3));
++ ignition::math::Quaterniond(0, 2.0*IGN_PI, IGN_PI/3));
+ link->GetInertial()->SetCoG(inertialPose);
+ this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(1, 2, 1),
+ ignition::math::Vector3d(-2, 0.5, 1));
+@@ -235,9 +235,9 @@ void PhysicsLinkTest::AddForce(const std
+ << std::endl;
+ model->SetLinkWorldPose(ignition::math::Pose3d(
+ ignition::math::Vector3d(-1.5, 0.8, 3),
+- ignition::math::Vector3d(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
++ ignition::math::Quaterniond(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link);
+ inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(1, 0, -5.6),
+- ignition::math::Vector3d(IGN_PI/9, 0, IGN_PI*3));
++ ignition::math::Quaterniond(IGN_PI/9, 0, IGN_PI*3));
+ link->GetInertial()->SetCoG(inertialPose);
+ link->SetLinearVel(ignition::math::Vector3d(2, -0.1, 5));
+ link->SetAngularVel(ignition::math::Vector3d(-IGN_PI/10, 0, 0.0001));