diff options
| author |   Phil Blundell <philb@gnu.org> | 2007-01-17 15:24:31 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2007-01-17 15:24:31 +0000 |
| commit | f305f4b21e651b8bc5cadc79720592302815edf9 (patch) | |
| tree | 9d01cb33af94594846ba9969db765faf92aae26f /packages | |
| parent | eb9def83a75c134d31e2143cf2e89132527a5b45 (diff) | |
| parent | 3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff) | |
| download | openembedded-f305f4b21e651b8bc5cadc79720592302815edf9.tar.gz | |
merge of '4f76054a2fbe49f396cba8a3b6ef23027b6eb15d'
and '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/qmake/files/linux-oe-qmake.conf | 3 | ||||
| -rw-r--r-- | packages/qmake/qmake-native_1.07a.bb | 2 | ||||
| -rw-r--r-- | packages/qmake/qmake2-native_2.00a.bb | 2 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free/configure.patch | 9 | ||||
| -rw-r--r-- | packages/qt/qt-x11-free_3.3.6.bb | 4 |
5 files changed, 6 insertions, 14 deletions
diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf index 287dbeba19..205b693fda 100644 --- a/packages/qmake/files/linux-oe-qmake.conf +++ b/packages/qmake/files/linux-oe-qmake.conf @@ -56,7 +56,8 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_OPENGL = $(OE_QMAKE_LIBS_OPENGL) +QMAKE_LIBS_OPENGL_QT = $(OE_QMAKE_LIBS_OPENGL_QT) QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(OE_QMAKE_MOC) diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index a5c164c08a..29f736dea1 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r3" +PR = "r4" QTEVER = "qt-embedded-free-3.3.5" diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 2dcabe3261..306891e9af 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r1" +PR = "r2" QTVER = "qt-x11-opensource-src-4.1.1" 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 \ |