From c1d2cab4a0b95a77822766ca28820ca4aede23a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 23 Jul 2009 18:50:04 +0200 Subject: qt*gles: rename to .disabled till the qt4 stuff becomes less magical --- recipes/qt4/qt4-embedded-gles_4.5.2.bb | 25 -------------- recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled | 25 ++++++++++++++ recipes/qt4/qt4-x11-free-gles-4.5.2/sgx-hack.patch | 20 ----------- recipes/qt4/qt4-x11-free-gles/sgx-hack.patch | 20 +++++++++++ recipes/qt4/qt4-x11-free-gles_4.5.2.bb | 23 ------------- recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled | 23 +++++++++++++ recipes/qt4/qt4-x11-free-gles_git.bb | 40 ---------------------- recipes/qt4/qt4-x11-free-gles_git.bb.disabled | 40 ++++++++++++++++++++++ recipes/qt4/qt4-x11-free_4.5.2.bb | 2 +- 9 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 recipes/qt4/qt4-embedded-gles_4.5.2.bb create mode 100644 recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled delete mode 100644 recipes/qt4/qt4-x11-free-gles-4.5.2/sgx-hack.patch create mode 100644 recipes/qt4/qt4-x11-free-gles/sgx-hack.patch delete mode 100644 recipes/qt4/qt4-x11-free-gles_4.5.2.bb create mode 100644 recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled delete mode 100644 recipes/qt4/qt4-x11-free-gles_git.bb create mode 100644 recipes/qt4/qt4-x11-free-gles_git.bb.disabled diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb b/recipes/qt4/qt4-embedded-gles_4.5.2.bb deleted file mode 100644 index 31bfe0fee2..0000000000 --- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -# 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 " - -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 - sed -i -e s:MBX_SYNC:HW_SYNC:g ${S}/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c -} - - - diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled new file mode 100644 index 0000000000..31bfe0fee2 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled @@ -0,0 +1,25 @@ +# 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 " + +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 + sed -i -e s:MBX_SYNC:HW_SYNC:g ${S}/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c +} + + + diff --git a/recipes/qt4/qt4-x11-free-gles-4.5.2/sgx-hack.patch b/recipes/qt4/qt4-x11-free-gles-4.5.2/sgx-hack.patch deleted file mode 100644 index 77f0e2a2fd..0000000000 --- a/recipes/qt4/qt4-x11-free-gles-4.5.2/sgx-hack.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/qegl_p.h 2009-07-09 08:42:12.000000000 +0200 -+++ qt-x11-opensource-src-4.5.2/src/opengl/qegl_p.h 2009-07-09 08:42:30.000000000 +0200 -@@ -65,7 +65,7 @@ - #else - #include - #endif --#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED) -+//#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED) - #undef EGLNativeWindowType - #undef EGLNativePixmapType - #undef EGLNativeDisplayType -@@ -73,7 +73,7 @@ - typedef NativePixmapType EGLNativePixmapType; - typedef NativeDisplayType EGLNativeDisplayType; - #define QEGL_NATIVE_TYPES_DEFINED 1 --#endif -+//#endif - QT_END_INCLUDE_NAMESPACE - - class QX11Info; diff --git a/recipes/qt4/qt4-x11-free-gles/sgx-hack.patch b/recipes/qt4/qt4-x11-free-gles/sgx-hack.patch new file mode 100644 index 0000000000..77f0e2a2fd --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles/sgx-hack.patch @@ -0,0 +1,20 @@ +--- /tmp/qegl_p.h 2009-07-09 08:42:12.000000000 +0200 ++++ qt-x11-opensource-src-4.5.2/src/opengl/qegl_p.h 2009-07-09 08:42:30.000000000 +0200 +@@ -65,7 +65,7 @@ + #else + #include + #endif +-#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED) ++//#if !defined(EGL_VERSION_1_3) && !defined(QEGL_NATIVE_TYPES_DEFINED) + #undef EGLNativeWindowType + #undef EGLNativePixmapType + #undef EGLNativeDisplayType +@@ -73,7 +73,7 @@ + typedef NativePixmapType EGLNativePixmapType; + typedef NativeDisplayType EGLNativeDisplayType; + #define QEGL_NATIVE_TYPES_DEFINED 1 +-#endif ++//#endif + QT_END_INCLUDE_NAMESPACE + + class QX11Info; diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb deleted file mode 100644 index 55a8b907ab..0000000000 --- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -# recipe to build GLES gfxdriver - -FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" - -QT_GLFLAGS = "-opengl es1" - -require qt4-x11-free_${PV}.bb - -DEPENDS += "virtual/egl" -SRC_URI += "file://sgx-hack.patch;patch=1" - -export EXTRA_QMAKE_MUNGE = " glmunge " - -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 -} - - - 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.disabled new file mode 100644 index 0000000000..55a8b907ab --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb.disabled @@ -0,0 +1,23 @@ +# recipe to build GLES gfxdriver + +FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" + +QT_GLFLAGS = "-opengl es1" + +require qt4-x11-free_${PV}.bb + +DEPENDS += "virtual/egl" +SRC_URI += "file://sgx-hack.patch;patch=1" + +export EXTRA_QMAKE_MUNGE = " glmunge " + +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 +} + + + diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb b/recipes/qt4/qt4-x11-free-gles_git.bb deleted file mode 100644 index fa9703eb33..0000000000 --- a/recipes/qt4/qt4-x11-free-gles_git.bb +++ /dev/null @@ -1,40 +0,0 @@ -# recipe to build GLES gfxdriver - -FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" - -QT_GLFLAGS = "-opengl es1 -openvg" - -include qt4-x11-free.inc -LICENSE += "LGPL" -PR = "${INC_PR}.0+gitr${SRCREV}" - -DEPENDS += "virtual/egl" - -SRCREV = "9e54faf" -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 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1 \ - file://0008-qt-lib-infix.patch;patch=1 \ - file://g++.conf \ - file://linux.conf \ - " -#SRC_URI += "file://sgx-hack.patch;patch=1" - -S = "${WORKDIR}/git" - -export EXTRA_QMAKE_MUNGE = " glmunge " - -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 -lOpenVG" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf -echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um -lOpenVG" >> 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 new file mode 100644 index 0000000000..d5474a8f8b --- /dev/null +++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled @@ -0,0 +1,40 @@ +# recipe to build GLES gfxdriver + +FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" + +QT_GLFLAGS = "-opengl es1 -openvg" + +include qt4-x11-free.inc +LICENSE += "LGPL" +PR = "${INC_PR}.0+gitr${SRCREV}" + +DEPENDS += "virtual/egl" + +SRCREV = "b11f173" +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 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-qt-lib-infix.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " +#SRC_URI += "file://sgx-hack.patch;patch=1" + +S = "${WORKDIR}/git" + +export EXTRA_QMAKE_MUNGE = " glmunge " + +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 -lOpenVG" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf +echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um -lOpenVG" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf +} + + + diff --git a/recipes/qt4/qt4-x11-free_4.5.2.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb index 1cc637a548..14d635c04f 100644 --- a/recipes/qt4/qt4-x11-free_4.5.2.bb +++ b/recipes/qt4/qt4-x11-free_4.5.2.bb @@ -1,4 +1,4 @@ include qt4-x11-free.inc LICENSE += "LGPL" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" -- cgit v1.2.3