diff options
| author | Robert Bragg <bob@openedhand.com> | 2008-10-02 21:10:24 +0000 |
|---|---|---|
| committer | Robert Bragg <bob@openedhand.com> | 2008-10-02 21:10:24 +0000 |
| commit | e668b911e115a56956158ec79b6b096ec09b19dd (patch) | |
| tree | 05d534d64535400c20b9207df8e543e4de90c7e9 /meta | |
| parent | 785f33dfaaefe8b6300a01a8a2538eed6382ee85 (diff) | |
| download | openembedded-core-e668b911e115a56956158ec79b6b096ec09b19dd.tar.gz openembedded-core-e668b911e115a56956158ec79b6b096ec09b19dd.tar.bz2 openembedded-core-e668b911e115a56956158ec79b6b096ec09b19dd.zip | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/clutter/clutter-cairo-0.6_svn.bb | 8 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch | 23 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter-gtk_svn.bb | 3 |
3 files changed, 28 insertions, 6 deletions
diff --git a/meta/packages/clutter/clutter-cairo-0.6_svn.bb b/meta/packages/clutter/clutter-cairo-0.6_svn.bb index b07bdac5a0..11aefb8cc6 100644 --- 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 index 0000000000..3baea4c5c9 --- /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 007aa4ae65..24c0479f79 100644 --- 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}" |