diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /sci-electronics/gazebo/files | |
parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) |
gentoo resync : 23.09.2020
Diffstat (limited to 'sci-electronics/gazebo/files')
-rw-r--r-- | sci-electronics/gazebo/files/oal.patch | 19 | ||||
-rw-r--r-- | sci-electronics/gazebo/files/qtmoc.patch | 44 |
2 files changed, 0 insertions, 63 deletions
diff --git a/sci-electronics/gazebo/files/oal.patch b/sci-electronics/gazebo/files/oal.patch deleted file mode 100644 index 4a09793aed00..000000000000 --- a/sci-electronics/gazebo/files/oal.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes build with openal 1.20 - -Index: gazebo-10.1.0/gazebo/util/OpenALPrivate.hh -=================================================================== ---- gazebo-10.1.0.orig/gazebo/util/OpenALPrivate.hh -+++ gazebo-10.1.0/gazebo/util/OpenALPrivate.hh -@@ -37,10 +37,10 @@ namespace gazebo - class OpenALPrivate - { - /// \brief OpenAL audio context pointer. -- public: ALCcontext_struct *context; -+ public: ALCcontext *context; - - /// \brief OpenAL audio device pointer. -- public: ALCdevice_struct *audioDevice; -+ public: ALCdevice *audioDevice; - - /// \brief OpenAL sink pointer. - public: OpenALSinkPtr sink; diff --git a/sci-electronics/gazebo/files/qtmoc.patch b/sci-electronics/gazebo/files/qtmoc.patch deleted file mode 100644 index 47841eb26e0d..000000000000 --- a/sci-electronics/gazebo/files/qtmoc.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 66dcba0375357d294d4769a6eb542de29b78a519 Mon Sep 17 00:00:00 2001 -From: Steve Peters <scpeters@openrobotics.org> -Date: Thu, 26 Dec 2019 05:12:08 -0800 -Subject: [PATCH] use ifndef Q_MOC_RUN to fix compilation of plugins with tbb - and qt 5.14 (issue #2681) - ---- - plugins/CessnaGUIPlugin.hh | 3 +++ - plugins/LookAtDemoPlugin.hh | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/plugins/CessnaGUIPlugin.hh b/plugins/CessnaGUIPlugin.hh -index 7556d89982..091b8ffd00 100644 ---- a/plugins/CessnaGUIPlugin.hh -+++ b/plugins/CessnaGUIPlugin.hh -@@ -23,7 +23,10 @@ - - #include <gazebo/common/Plugin.hh> - #include <gazebo/gui/GuiPlugin.hh> -+// moc parsing error of tbb headers -+#ifndef Q_MOC_RUN - #include <gazebo/transport/transport.hh> -+#endif - - namespace gazebo - { -diff --git a/plugins/LookAtDemoPlugin.hh b/plugins/LookAtDemoPlugin.hh -index 5659394892..2a22b222f5 100644 ---- a/plugins/LookAtDemoPlugin.hh -+++ b/plugins/LookAtDemoPlugin.hh -@@ -21,7 +21,10 @@ - - #include <gazebo/common/Plugin.hh> - #include <gazebo/gui/GuiPlugin.hh> -+// moc parsing error of tbb headers -+#ifndef Q_MOC_RUN - #include <gazebo/transport/transport.hh> -+#endif - - namespace gazebo - { --- -2.24.1 - |