From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Date: Tue, 6 Apr 2010 19:58:18 +0000 (+0200)
Subject: mesa-dri 7.8: disable egl for htcdream(this recipe is machine arch)
X-Git-Tag: Release-2010-05/1~121
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd60ddc92329fe9ef8fd707408be020a4f3303df;p=openembedded.git

mesa-dri 7.8: disable egl for htcdream(this recipe is machine arch)

If we don't disable egl,we have some undefined functions at linking:
| xeglgears.o: In function `main':
| xeglgears.c:(.text+0x1afc): undefined reference to `eglCreateImageKHR'
| xeglgears.c:(.text+0x1c4c): undefined reference to `eglCreateImageKHR'
| xeglgears.c:(.text+0x1cf8): undefined reference to `glEGLImageTargetTexture2DOES'
| collect2: ld returned 1 exit status
Note that we don't have 3d(yet and maybe never) on htcdream
---

diff --git a/recipes/mesa/mesa-dri_7.8.bb b/recipes/mesa/mesa-dri_7.8.bb
index bad028942c..46b7faa7a9 100644
--- a/recipes/mesa/mesa-dri_7.8.bb
+++ b/recipes/mesa/mesa-dri_7.8.bb
@@ -15,7 +15,7 @@ SRC_URI[archive.sha256sum] = "8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f91
 SRC_URI[demos.md5sum] = "9fe8ec184c7f78691e43c4c0a7f97d56"
 SRC_URI[demos.sha256sum] = "5bf65f03ddcd04b02e9ca044285f8754decee67eb274191da1f31627f1d84b0e"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -31,7 +31,9 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --disable-glx-tls --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-EXTRA_OECONF_shr += "--with-driver=dri --disable-glx-tls --disable-gallium --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+EXTRA_OECONF_shr += "--with-driver=dri --disable-glx-tls --disable-gallium \
+ --disable-gallium-intel --with-dri-drivers=swrast,${MACHINE_DRI_MODULES} \
+ ${@base_conditional( 'MACHINE',"htcdream", "--disable-egl", "",d)} "
 
 # We need glsl-compile built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
 do_configure_prepend() {