summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-11 17:06:57 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-11 17:06:57 +0000
commitfc05d6187895a3b8e51ccb84e5232c6a40f44c46 (patch)
tree8932e2a94661a53ddbd1e2541b792e149b90a9da /meta
parentb1b30e698a522b62d1dd21b8f4c59fd17c707cc0 (diff)
downloadopenembedded-core-fc05d6187895a3b8e51ccb84e5232c6a40f44c46.tar.gz
openembedded-core-fc05d6187895a3b8e51ccb84e5232c6a40f44c46.tar.bz2
openembedded-core-fc05d6187895a3b8e51ccb84e5232c6a40f44c46.tar.xz
openembedded-core-fc05d6187895a3b8e51ccb84e5232c6a40f44c46.zip
clutter-*: Updates to work with clutter 0.8 and later svn
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5050 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/clutter/clutter-box2d_svn.bb3
-rw-r--r--meta/packages/clutter/clutter-cairo/enable_examples.patch14
-rw-r--r--meta/packages/clutter/clutter-cairo_svn.bb2
-rw-r--r--meta/packages/clutter/clutter-gst_svn.bb4
-rw-r--r--meta/packages/clutter/clutter_svn.bb4
5 files changed, 12 insertions, 15 deletions
diff --git a/meta/packages/clutter/clutter-box2d_svn.bb b/meta/packages/clutter/clutter-box2d_svn.bb
index 0eda690a6..f241622a5 100644
--- a/meta/packages/clutter/clutter-box2d_svn.bb
+++ b/meta/packages/clutter/clutter-box2d_svn.bb
@@ -3,8 +3,7 @@ require clutter-box2d.inc
PV = "0.0+svnr${SRCREV}"
PR = "r3"
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
- file://clutter08.patch;patch=1 "
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples.patch b/meta/packages/clutter/clutter-cairo/enable_examples.patch
index c1cddf684..c5ed63ff1 100644
--- a/meta/packages/clutter/clutter-cairo/enable_examples.patch
+++ b/meta/packages/clutter/clutter-cairo/enable_examples.patch
@@ -5,18 +5,18 @@
Index: clutter-cairo/examples/Makefile.am
===================================================================
---- clutter-cairo.orig/examples/Makefile.am 2007-07-10 00:25:03.000000000 +0100
-+++ clutter-cairo/examples/Makefile.am 2007-07-10 12:06:49.000000000 +0100
+--- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100
++++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100
@@ -1,4 +1,4 @@
--noinst_PROGRAMS = clock flowers
-+bin_PROGRAMS = clock flowers
+-noinst_PROGRAMS = clock flowers bubbles
++bin_PROGRAMS = clock flowers bubbles
INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
- LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la
+ AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la
Index: clutter-cairo/examples/flowers.c
===================================================================
---- clutter-cairo.orig/examples/flowers.c 2007-07-10 12:30:44.000000000 +0100
-+++ clutter-cairo/examples/flowers.c 2007-07-10 12:30:51.000000000 +0100
+--- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100
++++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100
@@ -11,7 +11,7 @@
#define PETAL_MIN 20
diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb
index 3d71bb2b7..1084c1cc1 100644
--- a/meta/packages/clutter/clutter-cairo_svn.bb
+++ b/meta/packages/clutter/clutter-cairo_svn.bb
@@ -1,6 +1,6 @@
require clutter-cairo.inc
-PV = "0.4.0+svnr${SRCREV}"
+PV = "0.8.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
file://enable_examples.patch;patch=1"
diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb
index b4d41d683..8ef87236f 100644
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ b/meta/packages/clutter/clutter-gst_svn.bb
@@ -1,8 +1,6 @@
require clutter-gst.inc
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.5.0+svnr${SRCREV}"
+PV = "0.8.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
file://autofoo.patch;patch=1"
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index 83b5ae40c..cf88871ae 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -1,7 +1,7 @@
require clutter.inc
-PV = "0.7.0+svnr${SRCREV}"
-PR = "r6"
+PV = "0.8.0+svnr${SRCREV}"
+PR = "r0"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
file://enable_tests.patch;patch=1;maxrev=2989 \