diff options
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 5 | ||||
| -rwxr-xr-x | contrib/angstrom/sort.sh | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch | 18 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles_4.5.2.bb | 27 |
4 files changed, 51 insertions, 1 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 505be3e72a..b1b9d7b834 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -100,6 +100,7 @@ do cvs \ cwiid \ dates \ + devicekit-disks \ dialog \ distcc \ dsniff \ @@ -173,9 +174,11 @@ do gqview \ gsm0710muxd \ gspcav1 \ + gst-omapfb \ gtk+ \ gzip \ hal \ + hdparm \ hexatrolic \ htop \ i2c-tools \ @@ -191,6 +194,7 @@ do iscsi-target \ ivman \ jamvm \ + julius \ kernel-module-udlfb \ kismet \ konqueror-embedded \ @@ -225,6 +229,7 @@ do mutt \ mythtv \ nautilus \ + nbench-byte \ navit \ netkit-ftp \ netsurf \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 20b1739bf4..ffdac86365 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -58,7 +58,7 @@ case "$arch" in "armv7") machines="" ;; "armv7a") - machines="beagleboard omap3evm omap3-pandora omapzoom overo" ;; + machines="beagleboard omap3evm omap3-pandora omapzoom omapzoom2 overo" ;; "avr32") machines="atngw100 at32stk1000" ;; "bfin") diff --git a/recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch b/recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch new file mode 100644 index 0000000000..c3bf39f0e5 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch @@ -0,0 +1,18 @@ +--- /tmp/qglscreen_qws.h 2009-07-09 09:39:40.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.5.2/src/opengl/qglscreen_qws.h 2009-07-09 09:40:11.000000000 +0200 +@@ -60,7 +60,6 @@ + #else + #include <GLES/egl.h> + #endif +-#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED) + #undef EGLNativeWindowType + #undef EGLNativePixmapType + #undef EGLNativeDisplayType +@@ -68,7 +67,6 @@ + typedef NativePixmapType EGLNativePixmapType; + typedef NativeDisplayType EGLNativeDisplayType; + #define QEGL_NATIVE_TYPES_DEFINED 1 +-#endif + + QT_BEGIN_HEADER + diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb b/recipes/qt4/qt4-embedded-gles_4.5.2.bb new file mode 100644 index 0000000000..4e207c1863 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb @@ -0,0 +1,27 @@ +# recipe to build GLES gfxdriver + +FILESPATHPKG =. "qt4-embedded-${PV}:qt4-embedded:" + +QT_CONFIG_FLAGS += "-D QT_QWS_CLIENTBLIT -depths 16,24,32 -opengl es1 -plugin-gfx-powervr" + +require qt4-embedded_${PV}.bb + +DEPENDS += "virtual/egl" +SRC_URI += "file://sgx-hack.patch;patch=1" + +export EXTRA_QMAKE_MUNGE = " glmunge " + +CXXFLAGS_append = " -I${S}/src/3rdparty/powervr/" +CFLAGS_append = " -I${S}/src/3rdparty/powervr/" + + +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 +} + + + |