[PATCH] Fix qt4-embedded compilation

[PATCH] Fix qt4-embedded compilation

[Holger Hans Peter Freyther]

Hey,

I need the below patch to be able to compile qt4-embedded without trying to 
download a PowerVR sdk for the OMAP when building on x86...

I think the gles/OpenVG backend can be added back whenever the normal build is 
not broken, or maybe someone finds the time to find out why it broke.

holger


From 36d8a5f1daf3aab9ad1b4faa672d796dadfe906d Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 23 Jul 2009 17:27:33 +0200
Subject: [PATCH] qt4-embedded: Fix compilation of qt4-embedded

The addition of the qt4-embedded-gles recipe broke the normal
plain qt4-embedded build. A plain bitbake qt4-embedded will attempt
to build both due some magic I don't yet understand.
---
 recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch |   18 --------------
 recipes/qt4/qt4-embedded-gles_4.5.2.bb             |   25 
--------------------
 2 files changed, 0 insertions(+), 43 deletions(-)
 delete mode 100644 recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch
 delete mode 100644 recipes/qt4/qt4-embedded-gles_4.5.2.bb

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
deleted file mode 100644
index c3bf39f..0000000
--- a/recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- /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
deleted file mode 100644
index 31bfe0f..0000000
--- 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
-}
-
-
-
-- 
1.6.3.3

Re: [PATCH] Fix qt4-embedded compilation

[Koen Kooi]

On 23-07-09 17:33, Holger Hans Peter Freyther wrote:
> Hey,
>
> I need the below patch to be able to compile qt4-embedded without trying to
> download a PowerVR sdk for the OMAP when building on x86...

Can't you just bbmask it out?


>
> I think the gles/OpenVG backend can be added back whenever the normal build is
> not broken, or maybe someone finds the time to find out why it broke.
>
> holger
>
>
>  From 36d8a5f1daf3aab9ad1b4faa672d796dadfe906d Mon Sep 17 00:00:00 2001
> From: Holger Hans Peter Freyther<zecke@selfish.org>
> Date: Thu, 23 Jul 2009 17:27:33 +0200
> Subject: [PATCH] qt4-embedded: Fix compilation of qt4-embedded
>
> The addition of the qt4-embedded-gles recipe broke the normal
> plain qt4-embedded build. A plain bitbake qt4-embedded will attempt
> to build both due some magic I don't yet understand.
> ---
>   recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch |   18 --------------
>   recipes/qt4/qt4-embedded-gles_4.5.2.bb             |   25
> --------------------
>   2 files changed, 0 insertions(+), 43 deletions(-)
>   delete mode 100644 recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch
>   delete mode 100644 recipes/qt4/qt4-embedded-gles_4.5.2.bb
>
> 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
> deleted file mode 100644
> index c3bf39f..0000000
> --- a/recipes/qt4/qt4-embedded-gles-4.5.2/sgx-hack.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> ---- /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
> deleted file mode 100644
> index 31bfe0f..0000000
> --- 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
> -}
> -
> -
> -

Re: [PATCH] Fix qt4-embedded compilation

[Holger Hans Peter Freyther]

On Thursday 23 July 2009 18:45:24 Koen Kooi wrote:
> On 23-07-09 17:33, Holger Hans Peter Freyther wrote:
> > Hey,
> >
> > I need the below patch to be able to compile qt4-embedded without trying
> > to download a PowerVR sdk for the OMAP when building on x86...
>
> Can't you just bbmask it out?

I would prefer if qt4-embedded is buildable out of the box. The problem is the 
following. qt4-embedded.inc is setting QT_BASE_NAME to qt4-embedded. This 
means that the various -dbg packages start to depend on qt4-embedded-gles.

Is this wanted? maybe we should set QT_BASE_NAME to ${PN} in qt4-embedded?

what do you think?

	holger

Re: [PATCH] Fix qt4-embedded compilation

[Koen Kooi]

On 24-07-09 05:17, Holger Hans Peter Freyther wrote:
> On Thursday 23 July 2009 18:45:24 Koen Kooi wrote:
>> On 23-07-09 17:33, Holger Hans Peter Freyther wrote:
>>> Hey,
>>>
>>> I need the below patch to be able to compile qt4-embedded without trying
>>> to download a PowerVR sdk for the OMAP when building on x86...
>>
>> Can't you just bbmask it out?
>
> I would prefer if qt4-embedded is buildable out of the box. The problem is the
> following. qt4-embedded.inc is setting QT_BASE_NAME to qt4-embedded. This
> means that the various -dbg packages start to depend on qt4-embedded-gles.
>
> Is this wanted? maybe we should set QT_BASE_NAME to ${PN} in qt4-embedded?
>
> what do you think?

I've been bitten more than once by this problem (e.g. when it got 
renamed again), so if setting it to ${PN} works, go for it.

regards,

Koen