summaryrefslogtreecommitdiff
path: root/packages/qt
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2007-01-17 14:52:17 +0000
committerPhil Blundell <philb@gnu.org>2007-01-17 14:52:17 +0000
commit3a508238c49e86e0476319bfe71a24fdfdd56b66 (patch)
treea858eaf5225150dcb127a97a1c390c69f02fd245 /packages/qt
parent09bc29575b10dec0d98a051dd2dc22261329a258 (diff)
qt-x11-free: enable opengl
Diffstat (limited to 'packages/qt')
-rw-r--r--packages/qt/qt-x11-free/configure.patch9
-rw-r--r--packages/qt/qt-x11-free_3.3.6.bb4
2 files changed, 2 insertions, 11 deletions
diff --git a/packages/qt/qt-x11-free/configure.patch b/packages/qt/qt-x11-free/configure.patch
index a56c621abb..9d6c1e8ef7 100644
--- a/packages/qt/qt-x11-free/configure.patch
+++ b/packages/qt/qt-x11-free/configure.patch
@@ -5,15 +5,6 @@
--- qt-x11-free-3.3.2/configure~configure.patch
+++ qt-x11-free-3.3.2/configure
-@@ -219,7 +219,7 @@
- # licensed modules depend on type of commercial license
- MODULES="styles tools kernel widgets dialogs iconview workspace"
- [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network"
--[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql"
-+[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql"
- CFG_MODULES_AVAILABLE=$MODULES
- QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\""
- QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\""
@@ -1754,21 +1754,14 @@
CFG_FREETYPE=yes
fi
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index 5a1c014e6d..51228b4d30 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -3,9 +3,9 @@ SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
PROVIDES = "qt3x11"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
file://configure.patch;patch=1 \