[oe-commits] org.oe.dev qt-x11-free: enable opengl

[pb commit]

qt-x11-free: enable opengl

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 77df6e755fc8272db3fd5e4c3b0620b4453ca180
ViewMTN: http://monotone.openembedded.org/revision.psp?id=77df6e755fc8272db3fd5e4c3b0620b4453ca180
Files:
1
packages/qt/qt-x11-free/configure.patch
packages/qt/qt-x11-free_3.3.6.bb
Diffs:

#
# mt diff -r4fbd658056e8d7494a7290edd7f4482da6fe51d6 -r77df6e755fc8272db3fd5e4c3b0620b4453ca180
#
# 
# 
# patch "packages/qt/qt-x11-free/configure.patch"
#  from [02303c487bfe3941e7c43111d686ca57275af67c]
#    to [1decc44c8895cc7c3272d9c0a26f59e1f26196e6]
# 
# patch "packages/qt/qt-x11-free_3.3.6.bb"
#  from [79475d951cadbbca43056adb5ccc54857ad734bd]
#    to [1e18ee4f56c0928ba39bb3a73490ea39bccd089e]
# 
============================================================
--- packages/qt/qt-x11-free/configure.patch	02303c487bfe3941e7c43111d686ca57275af67c
+++ packages/qt/qt-x11-free/configure.patch	1decc44c8895cc7c3272d9c0a26f59e1f26196e6
@@ -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
============================================================
--- packages/qt/qt-x11-free_3.3.6.bb	79475d951cadbbca43056adb5ccc54857ad734bd
+++ packages/qt/qt-x11-free_3.3.6.bb	1e18ee4f56c0928ba39bb3a73490ea39bccd089e
@@ -1,11 +1,11 @@ HOMEPAGE = "http://www.trolltech.com"
 DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
 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 \