1 |
commit: ce028372069fd6bd77c1d6081452601dc1392ed0 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 29 14:28:45 2021 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 29 14:32:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce028372 |
7 |
|
8 |
sci-libs/octomap: bump to 1.9.7 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
sci-libs/octomap/Manifest | 2 +- |
14 |
sci-libs/octomap/files/qglqt5.patch | 231 --------------------- |
15 |
.../{octomap-1.9.5.ebuild => octomap-1.9.7.ebuild} | 3 - |
16 |
3 files changed, 1 insertion(+), 235 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest |
19 |
index bd5f5692560..86ee75a8455 100644 |
20 |
--- a/sci-libs/octomap/Manifest |
21 |
+++ b/sci-libs/octomap/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST octomap-1.9.5.tar.gz 1682781 BLAKE2B 1ced023160d10c424d4bff76a0481ffe6c87c5bf8133480afe6c47ee0ee116304a811293cc0af0b303ebcad370b7ce433e85212f070ac921a9c5be41905a94ea SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581 |
24 |
+DIST octomap-1.9.7.tar.gz 1684088 BLAKE2B 357b574f770d553a51c936c84772c729754a822e1c1e840a179a2cb3d3ef1b15f1c7173a4333b1262b10aa5d2f64d1b1c063ad90d4cc0edfcbaee9799ceb24a8 SHA512 639ff65cf020865d5302ba9785089782aec1e46496982c11bbf86919b6938c01c7921d84e60880091b89a949dd05f4d1151871f63503d19342462b74e6791ddd |
25 |
|
26 |
diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch |
27 |
deleted file mode 100644 |
28 |
index 3fad0a0fc63..00000000000 |
29 |
--- a/sci-libs/octomap/files/qglqt5.patch |
30 |
+++ /dev/null |
31 |
@@ -1,231 +0,0 @@ |
32 |
-Index: octomap-1.9.0/octovis/src/ViewerGui.cpp |
33 |
-=================================================================== |
34 |
---- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp |
35 |
-+++ octomap-1.9.0/octovis/src/ViewerGui.cpp |
36 |
-@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() { |
37 |
- m_mapSizeStatus->setText(size); |
38 |
- //} |
39 |
- |
40 |
-- m_glwidget->updateGL(); |
41 |
-+ m_glwidget->update(); |
42 |
- |
43 |
- // generate cubes -> display |
44 |
- // timeval start; |
45 |
-@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() { |
46 |
- // gettimeofday(&stop, NULL); // stop timer |
47 |
- // double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec); |
48 |
- // fprintf(stderr, "setOcTree took %f sec\n", time_to_generate); |
49 |
-- m_glwidget->updateGL(); |
50 |
-+ m_glwidget->update(); |
51 |
- } |
52 |
- |
53 |
- |
54 |
-@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t |
55 |
- m_glwidget->enableSelectionBox(checked); |
56 |
- |
57 |
- |
58 |
-- m_glwidget->updateGL(); |
59 |
-+ m_glwidget->update(); |
60 |
- } |
61 |
- |
62 |
- void ViewerGui::on_actionHeight_map_toggled(bool checked){ |
63 |
-@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo |
64 |
- it != m_octrees.end(); ++it) { |
65 |
- it->second.octree_drawer->enableAxes(checked); |
66 |
- } |
67 |
-- m_glwidget->updateGL(); |
68 |
-+ m_glwidget->update(); |
69 |
- } |
70 |
- |
71 |
- void ViewerGui::on_actionHideBackground_toggled(bool checked) { |
72 |
-@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_ |
73 |
- if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) { |
74 |
- if (checked) m_glwidget->removeSceneObject(r->octree_drawer); |
75 |
- else m_glwidget->addSceneObject(r->octree_drawer); |
76 |
-- m_glwidget->updateGL(); |
77 |
-+ m_glwidget->update(); |
78 |
- } |
79 |
- } |
80 |
- |
81 |
-@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to |
82 |
- it != m_octrees.end(); ++it) { |
83 |
- it->second.octree_drawer->enableOcTreeCells(enabled); |
84 |
- } |
85 |
-- m_glwidget->updateGL(); |
86 |
-+ m_glwidget->update(); |
87 |
- } |
88 |
- |
89 |
- void ViewerGui::on_actionOctree_structure_toggled(bool enabled) { |
90 |
-@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur |
91 |
- it != m_octrees.end(); ++it) { |
92 |
- it->second.octree_drawer->enableOcTree(enabled); |
93 |
- } |
94 |
-- m_glwidget->updateGL(); |
95 |
-+ m_glwidget->update(); |
96 |
- } |
97 |
- |
98 |
- void ViewerGui::on_actionFree_toggled(bool enabled) { |
99 |
-@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo |
100 |
- it != m_octrees.end(); ++it) { |
101 |
- it->second.octree_drawer->enableFreespace(enabled); |
102 |
- } |
103 |
-- m_glwidget->updateGL(); |
104 |
-+ m_glwidget->update(); |
105 |
- |
106 |
- } |
107 |
- |
108 |
-@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle |
109 |
- // } else{ |
110 |
- // m_octreeDrawer->clearOcTreeSelection(); |
111 |
- // } |
112 |
-- // m_glwidget->updateGL(); |
113 |
-+ // m_glwidget->update(); |
114 |
- // } |
115 |
- } |
116 |
- |
117 |
- |
118 |
- void ViewerGui::on_action_bg_black_triggered() { |
119 |
- m_glwidget->setBackgroundColor( QColor(0,0,0) ); |
120 |
-- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); |
121 |
- } |
122 |
- |
123 |
- void ViewerGui::on_action_bg_white_triggered() { |
124 |
- m_glwidget->setBackgroundColor( QColor(255,255,255) ); |
125 |
-- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); |
126 |
- } |
127 |
- |
128 |
- void ViewerGui::on_action_bg_gray_triggered() { |
129 |
- m_glwidget->setBackgroundColor( QColor(117,117,117) ); |
130 |
-- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); |
131 |
- } |
132 |
- |
133 |
- void ViewerGui::on_savecampose_triggered() { |
134 |
-Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp |
135 |
-=================================================================== |
136 |
---- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp |
137 |
-+++ octomap-1.9.0/octovis/src/ViewerWidget.cpp |
138 |
-@@ -67,13 +67,12 @@ void ViewerWidget::init() { |
139 |
- |
140 |
- // background color defaults to white |
141 |
- this->setBackgroundColor( QColor(255,255,255) ); |
142 |
-- this->qglClearColor( this->backgroundColor() ); |
143 |
- } |
144 |
- |
145 |
- void ViewerWidget::resetView(){ |
146 |
- this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2); |
147 |
- this->showEntireScene(); |
148 |
-- updateGL(); |
149 |
-+ update(); |
150 |
- } |
151 |
- |
152 |
- |
153 |
-@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode |
154 |
- for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { |
155 |
- (*it)->enableHeightColorMode(enabled); |
156 |
- } |
157 |
-- updateGL(); |
158 |
-+ update(); |
159 |
- } |
160 |
- |
161 |
- void ViewerWidget::enablePrintoutMode(bool enabled) { |
162 |
-@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo |
163 |
- for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { |
164 |
- (*it)->enablePrintoutMode(enabled); |
165 |
- } |
166 |
-- updateGL(); |
167 |
-+ update(); |
168 |
- } |
169 |
- |
170 |
- void ViewerWidget::enableSemanticColoring (bool enabled) { |
171 |
-@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin |
172 |
- for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { |
173 |
- (*it)->enableSemanticColoring(enabled); |
174 |
- } |
175 |
-- updateGL(); |
176 |
-+ update(); |
177 |
- } |
178 |
- |
179 |
- void ViewerWidget::enableSelectionBox(bool enabled) { |
180 |
- m_drawSelectionBox = enabled; |
181 |
-- updateGL(); |
182 |
-+ update(); |
183 |
- } |
184 |
- |
185 |
- |
186 |
-@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double |
187 |
- camera()->setPosition(qglviewer::Vec(x, y, z)); |
188 |
- camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ)); |
189 |
- camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0)); |
190 |
-- updateGL(); |
191 |
-+ update(); |
192 |
- } |
193 |
- |
194 |
- void ViewerWidget::setCamPose(const octomath::Pose6D& pose){ |
195 |
-@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id |
196 |
- } else { |
197 |
- std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl; |
198 |
- } |
199 |
-- updateGL(); |
200 |
-+ update(); |
201 |
- } |
202 |
- |
203 |
- void ViewerWidget::deleteCameraPath(int id) { |
204 |
- if(camera()->keyFrameInterpolator(id)) { |
205 |
-- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); |
206 |
-+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); |
207 |
- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); |
208 |
- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); |
209 |
- camera()->deletePath(id); |
210 |
-@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id |
211 |
- m_current_camera_frame = start_frame; |
212 |
- kfi->setInterpolationTime(kfi->keyFrameTime(start_frame)); |
213 |
- std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl; |
214 |
-- connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL())); |
215 |
-+ connect(kfi, SIGNAL(interpolated()), this, SLOT(update())); |
216 |
- connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); |
217 |
- connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished())); |
218 |
- kfi->startInterpolation(); |
219 |
-@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id |
220 |
- |
221 |
- void ViewerWidget::stopCameraPath(int id) { |
222 |
- if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) { |
223 |
-- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); |
224 |
-+ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); |
225 |
- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); |
226 |
- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); |
227 |
- camera()->keyFrameInterpolator(id)->stopInterpolation(); |
228 |
-@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id |
229 |
- |
230 |
- void ViewerWidget::cameraPathFinished() { |
231 |
- if(camera()->keyFrameInterpolator(m_current_camera_path)) { |
232 |
-- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL())); |
233 |
-+ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update())); |
234 |
- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); |
235 |
- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); |
236 |
- emit cameraPathStopped(m_current_camera_path); |
237 |
-@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c |
238 |
- void ViewerWidget::addSceneObject(SceneObject* obj){ |
239 |
- assert (obj); |
240 |
- m_sceneObjects.push_back(obj); |
241 |
-- updateGL(); |
242 |
-+ update(); |
243 |
- } |
244 |
- |
245 |
- void ViewerWidget::removeSceneObject(SceneObject* obj){ |
246 |
-@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce |
247 |
- else |
248 |
- ++it; |
249 |
- } |
250 |
-- updateGL(); |
251 |
-+ update(); |
252 |
- } |
253 |
- |
254 |
- void ViewerWidget::clearAll(){ |
255 |
-@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){ |
256 |
- glPushAttrib(GL_ALL_ATTRIB_BITS); |
257 |
- |
258 |
- glDisable(GL_COLOR_MATERIAL); |
259 |
-- qglColor(foregroundColor()); |
260 |
- |
261 |
- if (gridIsDrawn()){ |
262 |
- glLineWidth(1.0); |
263 |
|
264 |
diff --git a/sci-libs/octomap/octomap-1.9.5.ebuild b/sci-libs/octomap/octomap-1.9.7.ebuild |
265 |
similarity index 94% |
266 |
rename from sci-libs/octomap/octomap-1.9.5.ebuild |
267 |
rename to sci-libs/octomap/octomap-1.9.7.ebuild |
268 |
index b38b3ab44bf..9d9bd32c85f 100644 |
269 |
--- a/sci-libs/octomap/octomap-1.9.5.ebuild |
270 |
+++ b/sci-libs/octomap/octomap-1.9.7.ebuild |
271 |
@@ -30,9 +30,6 @@ BDEPEND="${RDEPEND} |
272 |
) |
273 |
" |
274 |
|
275 |
-# https://github.com/OctoMap/octomap/issues/194 |
276 |
-PATCHES=( "${FILESDIR}/qglqt5.patch" ) |
277 |
- |
278 |
src_prepare() { |
279 |
rm -r octovis/src/extern |