Some build fixes for clutter-cairo-0.6, and clutter-gtk_svn

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5394 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/clutter/clutter-cairo-0.6_svn.bb b/meta/packages/clutter/clutter-cairo-0.6_svn.bb
index b07bdac5a06f9492399e284ec555e1be569a6fd8..11aefb8cc63b22381409fa1d2edabba137590d8e 100644 (file)
--- a/meta/packages/clutter/clutter-cairo-0.6_svn.bb
+++ b/meta/packages/clutter/clutter-cairo-0.6_svn.bb
@@ -1,12 +1,12 @@
 require clutter-cairo.inc
 
-PV = "0.8.0+svnr${SRCREV}"
+PV = "0.6.0+svnr${SRCREV}"
 
 DEPENDS += "clutter-0.6"
 
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
-           file://enable_examples.patch;patch=1"
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-6;proto=http \
+           file://enable_examples-0.6.patch;patch=1"
 
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/clutter-cairo-0-6"
 
 

diff --git a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch b/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
new file mode 100644 (file)
index 0000000..3baea4c
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
@@ -0,0 +1,23 @@
+Index: clutter-cairo-0-6/examples/Makefile.am
+===================================================================
+--- clutter-cairo-0-6.orig/examples/Makefile.am        2008-10-02 22:03:18.000000000 +0100
++++ clutter-cairo-0-6/examples/Makefile.am     2008-10-02 22:03:31.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = clock flowers
++bin_PROGRAMS = clock flowers
+ 
+ INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
+ AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la 
+Index: clutter-cairo-0-6/examples/flowers.c
+===================================================================
+--- clutter-cairo-0-6.orig/examples/flowers.c  2008-10-02 22:03:23.000000000 +0100
++++ clutter-cairo-0-6/examples/flowers.c       2008-10-02 22:03:39.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ #define PETAL_MIN 20
+ #define PETAL_VAR 40
+-#define N_FLOWERS 40 /* reduce if you have a small card */
++#define N_FLOWERS 8 /* reduce if you have a small card */
+ 
+ typedef struct Flower
+ {

diff --git a/meta/packages/clutter/clutter-gtk_svn.bb b/meta/packages/clutter/clutter-gtk_svn.bb
index 007aa4ae651664ba26911dd51449033e3219fa1c..24c0479f79ca06338c5913070327b28811326765 100644 (file)
--- a/meta/packages/clutter/clutter-gtk_svn.bb
+++ b/meta/packages/clutter/clutter-gtk_svn.bb
@@ -3,7 +3,6 @@ require clutter-gst.inc
 PV = "0.8.0+svnr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
-           file://autofoo.patch;patch=1"
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
 
 S = "${WORKDIR}/${PN}"