Mercurial > mxe-octave

changeset 470:a07d9f69e2ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add OpenGL support to package qt (by Martin Lambers)
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 06 Oct 2009 12:17:40 +0200
parents c3b6cc491946
children db393d589865
files src/qt-win32.patch src/qt.mk
diffstat 2 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt-win32.patch	Mon Oct 05 12:40:31 2009 +0200
+++ b/src/qt-win32.patch	Tue Oct 06 12:17:40 2009 +0200
@@ -1,5 +1,6 @@
 Copyright (C) 2009  Mark Brand
                     Volker Grabsch
+                    Martin Lambers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -44,7 +45,18 @@
      fi
  
      # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-@@ -7594,7 +7598,10 @@
+@@ -5035,7 +5039,9 @@
+             echo " You might need to modify the include and library search paths by editing"
+             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
+             echo " ${XQMAKESPEC}."
+-            exit 1
++echo NOTICE: This is a specially modifed configure script!
++echo For our purposes we do not want the OpenGL functionality test.
++#            exit 1
+         fi
+         case "$PLATFORM" in
+         hpux*)
+@@ -7594,7 +7600,10 @@
          [ "$IN_ROOT" = "no" ] && continue
  
          case $a in
--- a/src/qt.mk	Mon Oct 05 12:40:31 2009 +0200
+++ b/src/qt.mk	Tue Oct 06 12:17:40 2009 +0200
@@ -126,6 +126,7 @@
         -plugin-sql-sqlite \
         -plugin-sql-mysql \
         -script \
+        -opengl desktop \
         -webkit \
         -phonon \
         -no-phonon-backend \