diff options
Diffstat (limited to 'media-gfx/meshlab/files/1.3.2/17_structuresynth.patch')
-rw-r--r-- | media-gfx/meshlab/files/1.3.2/17_structuresynth.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch b/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch new file mode 100644 index 000000000000..6a6b84c8d682 --- /dev/null +++ b/media-gfx/meshlab/files/1.3.2/17_structuresynth.patch @@ -0,0 +1,48 @@ +From: Teemu Ikonen <tpikonen@gmail.com> +Subject: Include glu.h where needed in included structure-synth code. +Git-Branch: p/structuresynth +Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..45495fd45078a06d7c5f7405ba636c + +Also link structuresynth code with libGLU. + +This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same +issue in the real structure-synth Debian package. + + .../structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h | 1 + + .../src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h | 1 + + meshlab/src/external/structuresynth/structuresynth.pro | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h +index 8905cbe..e13b011 100644 +--- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h ++++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h +@@ -5,6 +5,7 @@ + #include <QMainWindow>
+ #include <QPoint>
+ #include <QList>
++#include <GL/glu.h>
+
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "SyntopiaCore/Math/Matrix4.h"
+diff --git a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h +index 0b0dc40..ed95346 100644 +--- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h ++++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h +@@ -2,6 +2,7 @@ +
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "Object3D.h"
++#include <GL/glu.h>
+
+ namespace SyntopiaCore {
+ namespace GLEngine {
+diff --git a/meshlab/src/external/structuresynth/structuresynth.pro b/meshlab/src/external/structuresynth/structuresynth.pro +index 8579b03..362ce5d 100644 +--- a/meshlab/src/external/structuresynth/structuresynth.pro ++++ b/meshlab/src/external/structuresynth/structuresynth.pro +@@ -120,3 +120,4 @@ win32-msvc2008:DESTDIR = ../lib/win32-msvc2008 + linux-g++-32:DESTDIR = ../lib/linux-g++-32
+ linux-g++-64:DESTDIR = ../lib/linux-g++-64
+ linux-g++:DESTDIR = ../lib/linux-g++
++unix:LIBS+=-lGLU
|