summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-07-29 12:33:24 +0200
committerKoen Kooi <koen@openembedded.org>2009-07-29 12:33:24 +0200
commit69a41a50ac43e82deaa9a0114c9f1c9a0c02ff0b (patch)
treedd4ba89ba9c422f7240b5c6ba9cab48e0879a51f
parent6664caa93967e81bfeefe8a87a265565b8e32abb (diff)
qt4-x11-free-gles: reinstate it now the weird dependency problems have been resolved
* also switch to gles2, requires less patching
-rw-r--r--recipes/qt4/qt4-x11-free-gles_4.5.2.bb (renamed from recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled)12
-rw-r--r--recipes/qt4/qt4-x11-free-gles_git.bb.disabled2
2 files changed, 9 insertions, 5 deletions
diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
index 55a8b907ab..944378d0dd 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
@@ -2,12 +2,16 @@
FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:"
-QT_GLFLAGS = "-opengl es1"
+QT_GLFLAGS = "-opengl es2"
+
+QT_BASE_NAME = "qt4-gles"
+QT_BASE_LIB = "libqt-gles"
require qt4-x11-free_${PV}.bb
+PR = "${INC_PR}.3"
DEPENDS += "virtual/egl"
-SRC_URI += "file://sgx-hack.patch;patch=1"
+#SRC_URI += "file://sgx-hack.patch;patch=1"
export EXTRA_QMAKE_MUNGE = " glmunge "
@@ -15,8 +19,8 @@ glmunge() {
sed -e /QMAKE_INCDIR_OPENGL/d -e /QMAKE_LIBDIR_OPENGL/d -e /QMAKE_LIBS_OPENGL/d -e /QMAKE_LIBS_OPENGL_QT/d -i mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
echo "QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES/" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
echo "QMAKE_LIBDIR_OPENGL = ${STAGING_LIBDIR}" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+echo "QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lGLESv2 -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lGLESv2 -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
}
diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
index d5474a8f8b..2e2364414d 100644
--- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
@@ -10,7 +10,7 @@ PR = "${INC_PR}.0+gitr${SRCREV}"
DEPENDS += "virtual/egl"
-SRCREV = "b11f173"
+SRCREV = "9ec431c"
SRC_URI = "git://git.gitorious.org/qt/qt.git;protocol=http \
file://0001-cross-compile.patch;patch=1 \
file://0002-fix-resinit-declaration.patch;patch=1 \