From 81b5cd17506455c23e2282dff1fae97f105a0737 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Sun, 20 May 2012 00:17:16 +0000 Subject: Add explicit dependency on libGLU and patches to fix build with upcoming Qt 4.8 Mark MAKE_JOBS_SAFE --- graphics/fraqtive/Makefile | 2 ++ graphics/fraqtive/files/patch-src__meshview.cpp | 11 +++++++++++ graphics/fraqtive/files/patch-src__src.pro | 13 +++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 graphics/fraqtive/files/patch-src__meshview.cpp create mode 100644 graphics/fraqtive/files/patch-src__src.pro (limited to 'graphics/fraqtive') diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile index 95861a7b9726..37610e028831 100644 --- a/graphics/fraqtive/Makefile +++ b/graphics/fraqtive/Makefile @@ -18,10 +18,12 @@ USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= gui opengl qmake_build uic_build moc_build rcc_build QT_NONSTANDARD= yes +USE_GL= glu HAS_CONFIGURE= yes CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ QMAKE_CFLAGS="${CFLAGS}" CONFIGURE_ARGS= -prefix ${PREFIX} -qmake ${QMAKE} +MAKE_JOBS_SAFE= yes OPTIONS= SSE2 "Enable SSE2 optimization" off diff --git a/graphics/fraqtive/files/patch-src__meshview.cpp b/graphics/fraqtive/files/patch-src__meshview.cpp new file mode 100644 index 000000000000..a2d571bd41b1 --- /dev/null +++ b/graphics/fraqtive/files/patch-src__meshview.cpp @@ -0,0 +1,11 @@ +--- src/meshview.cpp 2009/12/17 19:54:48 66 ++++ src/meshview.cpp 2012/04/03 22:32:00 74 +@@ -16,6 +16,8 @@ + # define M_PI 3.14159265358979323846 + #endif + ++#include ++ + #include + #include + #include diff --git a/graphics/fraqtive/files/patch-src__src.pro b/graphics/fraqtive/files/patch-src__src.pro new file mode 100644 index 000000000000..f3012fba95e0 --- /dev/null +++ b/graphics/fraqtive/files/patch-src__src.pro @@ -0,0 +1,13 @@ +--- src/src.pro 2009/12/15 17:10:52 64 ++++ src/src.pro 2012/04/03 22:32:00 74 +@@ -154,6 +154,10 @@ + LIBS += -lshell32 + } + ++unix { ++ LIBS += -lGLU ++} ++ + MOC_DIR = ../tmp + RCC_DIR = ../tmp + UI_DIR = ../tmp -- cgit v1.2.3