meshlab/qt-4.8.patch

   1 diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
   2 --- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp       2011-01-25 18:51:28.000000000 +1100
   3 +++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp    2012-01-07 11:47:12.836800072 +1100
   4 @@ -7,6 +7,12 @@
   5  #include "SyntopiaCore/Logging/Logging.h"
   6  #include "SyntopiaCore/Misc/MiniParser.h"
   7
   8 +#ifdef Q_WS_MAC
   9 +#include <OpenGL/glu.h>
  10 +#else
  11 +#include <GL/glu.h>
  12 +#endif
  13 +
  14  using namespace SyntopiaCore::Math;
  15  using namespace SyntopiaCore::Misc;
  16
  17 diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
  18 --- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h      2011-01-25 18:51:28.000000000 +1100
  19 +++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h   2012-01-07 11:45:26.795586149 +1100
  20 @@ -3,6 +3,12 @@
  21  #include "SyntopiaCore/Math/Vector3.h"
  22  #include "Object3D.h"
  23
  24 +#ifdef Q_WS_MAC
  25 +#include <OpenGL/glu.h>
  26 +#else
  27 +#include <GL/glu.h>
  28 +#endif
  29 +
  30  namespace SyntopiaCore {
  31         namespace GLEngine {
  32
  33 diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro
  34 --- meshlab.orig/src/external/structuresynth/structuresynth.pro 2011-01-25 18:49:34.000000000 +1100
  35 +++ meshlab/src/external/structuresynth/structuresynth.pro      2012-01-07 11:51:46.695981995 +1100
  36 @@ -113,6 +113,7 @@
  37             ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp
  38  CONFIG+=opengl
  39  QT+=xml opengl script
  40 +unix:LIBS += -lGLU
  41  macx:DESTDIR       = ../lib/macx
  42  win32-g++:DESTDIR       = ../lib/win32-gcc
  43  win32-msvc2005:DESTDIR       = ../lib/win32-msvc2005
  44 diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
  45 --- meshlab.orig/src/meshlab/meshlab.pro        2011-02-15 20:39:47.000000000 +1100
  46 +++ meshlab/src/meshlab/meshlab.pro     2012-01-07 11:57:18.055586086 +1100
  47 @@ -85,6 +85,7 @@
  48  QT += xmlpatterns
  49  QT += network
  50  QT += script
  51 +unix:LIBS += -lGLU
  52
  53
  54  # the following line is needed to avoid mismatch between