diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-20 02:54:26 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-05-20 02:54:26 +0000 |
commit | cda040dcec16ccd2073a02c1abf112a7a3e887f0 (patch) | |
tree | e47b9445edc55ca6c8b3820840c0864526e8f2da /graphics/fracplanet | |
parent | cb15105d415737e8522c9be05310b72da3c83c3a (diff) | |
download | ports-cda040dcec16ccd2073a02c1abf112a7a3e887f0.tar.gz ports-cda040dcec16ccd2073a02c1abf112a7a3e887f0.zip |
Make the port build with the upcoming Qt 4.8.x series.
Since 4.8.0 [1], Qt itself does not automatically include GLU's
headers and libraries with its OpenGL module, so applications which
relied on Qt to get these need to be adjusted.
PORTREVISION bumped since we now explicitly depend on GLU via
USE_GL=glu.
[1] http://qt.gitorious.org/qt/qt/commit/e7eed096a0c33607a7a37baaf06e5952dc9d556b
Notes
Notes:
svn path=/head/; revision=296994
Diffstat (limited to 'graphics/fracplanet')
-rw-r--r-- | graphics/fracplanet/Makefile | 3 | ||||
-rw-r--r-- | graphics/fracplanet/files/patch-fracplanet.pro | 11 | ||||
-rw-r--r-- | graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp | 11 |
3 files changed, 24 insertions, 1 deletions
diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile index 3169d05f0466..2a40c1df2dd5 100644 --- a/graphics/fracplanet/Makefile +++ b/graphics/fracplanet/Makefile @@ -7,7 +7,7 @@ PORTNAME= fracplanet PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF @@ -19,6 +19,7 @@ LIB_DEPENDS= boost_program_options.4:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/${PORTNAME} +USE_GL= glu USE_QT_VER= 4 QT_COMPONENTS= corelib gui opengl \ moc_build qmake_build diff --git a/graphics/fracplanet/files/patch-fracplanet.pro b/graphics/fracplanet/files/patch-fracplanet.pro new file mode 100644 index 000000000000..a3a2d6db432d --- /dev/null +++ b/graphics/fracplanet/files/patch-fracplanet.pro @@ -0,0 +1,11 @@ +--- fracplanet.pro~ 2012-05-19 23:50:08.000000000 -0300 ++++ fracplanet.pro 2012-05-19 23:50:19.000000000 -0300 +@@ -8,7 +8,7 @@ + + HEADERS += $$system(ls *.h) + SOURCES += $$system(ls *.cpp) +-LIBS += -lboost_program_options ++LIBS += -lboost_program_options -lGLU + + DEFINES += QT_DLL + diff --git a/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp b/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp new file mode 100644 index 000000000000..6a4dd83f31ef --- /dev/null +++ b/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp @@ -0,0 +1,11 @@ +--- triangle_mesh_viewer_display.cpp~ 2012-05-19 23:49:24.000000000 -0300 ++++ triangle_mesh_viewer_display.cpp 2012-05-19 23:49:55.000000000 -0300 +@@ -24,6 +24,8 @@ + #include "matrix33.h" + #include "triangle_mesh_viewer.h" + ++#include <GL/glu.h> ++ + TriangleMeshViewerDisplay::TriangleMeshViewerDisplay(TriangleMeshViewer* parent,const QGLFormat& format,const ParametersRender* param,const std::vector<const TriangleMesh*>& m,bool verbose) + :QGLWidget(format,parent) + ,_notify(*parent) |