[oe-commits] Koen Kooi : clutter-0.9: fix build for gles2

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 42870b21740b4de888f62915d2422a0008ba45d0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=42870b21740b4de888f62915d2422a0008ba45d0

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Jun  5 13:42:53 2009 +0200

clutter-0.9: fix build for gles2

---

 recipes/clutter/clutter-0.9_git.bb |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb
index d0b7aa9..624ad6e 100644
--- a/recipes/clutter/clutter-0.9_git.bb
+++ b/recipes/clutter/clutter-0.9_git.bb
@@ -1,24 +1,21 @@
 require clutter.inc
 
-SRCREV = "36cfb6030784791a4420a1e52a8c18d56b1d0c69"
-#good: 20090512 08a73a215f2cf18abcfd7d93e8047583511497bd
+SRCREV = "745ca8a62ca52eedfad850e556f160f36eb32953"
 
 PV = "0.9.3"
+PR = "r1"
 PR_append = "+git${SRCREV}"
 
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=1.0-integration \
            file://enable_tests.patch;patch=1 "
 S = "${WORKDIR}/git"
 
 BASE_CONF += "--disable-introspection"
 
-# Fixup gles backend: 
-
 do_compile_prepend() {
-	for i in ${S}/clutter/cogl/gles/* ; do
-		sed -i -e s:CGL_NEAREST:COGL_TEXTURE_FILTER_NEAREST:g \
-		       -e s:CGL_LINEAR:iCOGL_TEXTURE_FILTER_LINEAR:g \
-		       -e s:CGL_VERTEX_SHADER:COGL_SHADER_TYPE_VERTEX:g \
-		       -e s:CGL_FRAGMENT_SHADER:COGL_SHADER_TYPE_FRAGMENT:g $i
+	for i in $(find ${S} -name Makefile) ; do
+		sed -i -e s:-Werror::g $i
 	done
+    ( cd clutter/cogl/gles ; for i in *.glsl ; do sh stringify.sh -h $i ; done )
 }
+