diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-01-04 16:38:25 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-01-05 10:07:58 +0100 |
| commit | 4a3a725cc558b2841959c84529389c97587eae45 (patch) | |
| tree | 8985a4997feccd22c565c4ebb6f3b92d9b563570 /recipes/qt4/qt-4.6.0.inc | |
| parent | 1029524234e0d6da592b946803cbd09b882acf2e (diff) | |
qt 4.6.0: backport a few patches from git, mainly QGL related
Diffstat (limited to 'recipes/qt4/qt-4.6.0.inc')
| -rw-r--r-- | recipes/qt4/qt-4.6.0.inc | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc index b29b708d74..91565f7e0e 100644 --- a/recipes/qt4/qt-4.6.0.inc +++ b/recipes/qt4/qt-4.6.0.inc @@ -1,5 +1,7 @@ DEFAULT_PREFERENCE = "-1" +FILESPATHPKG .= ":qt-${PV}" + SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ file://0002-fix-resinit-declaration.patch;patch=1 \ @@ -12,6 +14,37 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://g++.conf \ file://linux.conf \ " + +# Patches for '4.6' qt branch +SRC_URI += "\ + file://0860-Added-caching-of-vectorpaths-to-the-GL-paint-engine.patch;patch=1 \ + file://0917-Better-check-for-EGL-extension-strings.patch;patch=1 \ + file://0919-Rebind-window-surface-fbo-after-native-GL-rendering.patch;patch=1 \ + file://0943-Fixed-OpenGL-graphicssystem-issues-for-OpenGL-ES-2.0.patch;patch=1 \ + file://0945-Add-EGL_BUFFER_SIZE-to-QEglProperties-reduceConfigur.patch;patch=1 \ + file://0946-Fix-WA_TranslucentBackground-for-QGLWidgets-on-X11-E.patch;patch=1 \ + file://0947-Compressed-texture-binding-for-QtOpenGL-ETC1-and-PVR.patch;patch=1 \ + file://0951-Detect-GL2-paint-engine-based-on-fragment-shaders-no.patch;patch=1 \ + file://0971-Fix-GL_BGRA-formats-under-OpenGL-ES-systems.patch;patch=1 \ + file://0991-QGtkStyle-support-for-the-inner-border-property-in-G.patch;patch=1 \ + file://0992-Make-sure-a-context-is-current-when-loading-compress.patch;patch=1 \ + file://0993-Fix-upside-down-PVR-compressed-textures.patch;patch=1 \ + file://0996-Export-QGLShareRegister-because-qgl_share_reg-is-exp.patch;patch=1 \ + file://0998-Set-stacking-class-for-stays-on-top-windows-in-DFB.patch;patch=1 \ + file://0999-Enable-customizing-of-DirectFB-layer-to-use.patch;patch=1 \ + file://1008-GLES-2-should-not-use-a-multisampled-format-by-defau.patch;patch=1 \ + file://1115-Fix-QGLWidgets-created-with-an-alpha-channel-on-X11-.patch;patch=1 \ + file://1118-Fix-EGL-surface-leaks-when-re-parenting-QGLWidget-on.patch;patch=1 \ + file://1136-Disable-depth-testing-during-the-2D-QGLWidget-render.patch;patch=1 \ + file://1149-GL2Engine-Don-t-mark-brush-as-dirty-if-it-hasn-t-cha.patch;patch=1 \ + file://1157-Align-GL_RGB-lines-on-a-4-byte-boundary-when-uploadi.patch;patch=1 \ +# file://1165-NEON-configure-detection-and-initial-blend-function-.patch;patch=1 \ + file://1175-Fix-memory-leak-of-QGLGlyphCoord-objects-in-the-Open.patch;patch=1 \ + file://1197-Add-GLfloat-2-2-GLfloat-3-3-uniform-setters-to-QGLSh.patch;patch=1 \ + file://1198-Handle-broken-shaders-better-in-the-GL2-engine-s-sha.patch;patch=1 \ + file://1205-Fix-text-rendering-on-GL2-paint-engine.patch;patch=1 \ +" + S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" do_configure_prepend() { @@ -22,8 +55,6 @@ do_configure_prepend() { -e /QMAKE_UIC3\ /d \ -e /QMAKE_RCC\ /d \ ${S}/configure - -# sed -i /tools.pro/d ${S}/src/src.pro } QT_GLFLAGS ?= "" |