clutter(-gst)-0.9: fix GLES build

diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb
index 6155d33..ed333ce 100644 (file)
--- a/recipes/clutter/clutter-0.9_git.bb
+++ b/recipes/clutter/clutter-0.9_git.bb
@@ -1,9 +1,9 @@
 require clutter.inc
 
-SRCREV = "b9a53d379d3aaca4b09a90cd44d5a9d9736a2435"
+SRCREV = "fdaaa8b6d701d2b43fd2750de1b018b5af5577ea"
 
-PV = "0.9.3"
-PR = "r2"
+PV = "0.9.4"
+PR = "r0"
 PR_append = "+git${SRCREV}"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \

diff --git a/recipes/clutter/clutter-gst-0.9_git.bb b/recipes/clutter/clutter-gst-0.9_git.bb
index f875c5d..5a0b2cd 100644 (file)
--- a/recipes/clutter/clutter-gst-0.9_git.bb
+++ b/recipes/clutter/clutter-gst-0.9_git.bb
@@ -1,12 +1,14 @@
 require clutter-gst.inc
 
-SRCREV = "460826267cbb50c257cf7d957f8f9483a678da4e"
+DEPENDS += "clutter-0.9"
+
+SRCREV = "487552b95f7ccce00118619d5b4256936621eb5e"
 PV = "0.9.0"
-PR = "r1"
+PR = "r3"
 PR_append = "+git${SRCREV}"
 
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=1.0-integration \
-           file://autofoo.patch;patch=1 \
-           file://0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch;patch=1"
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \
+           file://0001-clutter-gst-videosink-guard-GL-calls-with-ifdef-CL.patch;patch=1 \
+           file://gtk-doc.make"
 
 S = "${WORKDIR}/git"

diff --git a/recipes/clutter/clutter-gst.inc b/recipes/clutter/clutter-gst.inc
index caaa755..fa8f810 100644 (file)
--- a/recipes/clutter/clutter-gst.inc
+++ b/recipes/clutter/clutter-gst.inc
@@ -10,7 +10,11 @@ FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/au
 inherit autotools pkgconfig
 
 do_configure_prepend() {
-        touch ${S}/gtk-doc.make
+       if [ -e ${WORKDIR}/gtk-doc.make ] ; then
+               cp ${WORKDIR}/gtk-doc.make ${S}/gtk-doc.make
+       else
+               touch ${S}/gtk-doc.make
+       fi
 }
 
 do_stage () {