From 55c49b85fd65c801fd8366c38e099207fd564175 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@openedhand.com>
Date: Wed, 26 Sep 2007 13:01:01 +0000
Subject: clutter: Refresh clutter to a 0.4 version
We can now use poky's clutter to build zylonite clutter images.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2803 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
meta/conf/distro/poky.conf | 8 +++----
meta/packages/clutter/clutter-cairo_svn.bb | 2 +-
meta/packages/clutter/clutter-gst/autofoo.patch | 31 -------------------------
meta/packages/clutter/clutter-gst_svn.bb | 2 +-
meta/packages/clutter/clutter.inc | 7 +++++-
meta/packages/clutter/clutter_svn.bb | 2 +-
6 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 56b3345a6..d28d169ee 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -120,15 +120,15 @@ SRCREV_pn-matchbox-applet-light ?= "1548"
SRCREV_pn-fstests ?= "266"
SRCDATE_abiword ?= "20070130"
SRCREV_pn-xvideo-tests ?= "272"
-SRCREV_pn-clutter ?= "1196"
+SRCREV_pn-clutter ?= "1451"
SRCDATE_libgsmd ?= "20070917"
SRCREV_gaku ?= "286"
# Previously floating revisions
SRCREV_pn-aaina ?= "1231"
-SRCREV_pn-clutter-cairo ?= "1219"
-SRCREV_pn-clutter-gst ?= "1220"
-SRCREV_pn-table ?= "969"
+SRCREV_pn-clutter-cairo ?= "1223"
+SRCREV_pn-clutter-gst ?= "1454"
+SRCREV_pn-table ?= "1456"
SRCREV_pn-libmatchbox ?= "1531"
SRCREV_pn-msynctool ?= "314"
SRCREV_pn-libopensync-plugin-file-sync ?= "2392"
diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb
index 0e459ec85..3d71bb2b7 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.3.0+svnr${SRCREV}"
+PV = "0.4.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/autofoo.patch b/meta/packages/clutter/clutter-gst/autofoo.patch
index f5b8ef7d1..7b3e87702 100644
--- a/meta/packages/clutter/clutter-gst/autofoo.patch
+++ b/meta/packages/clutter/clutter-gst/autofoo.patch
@@ -1,6 +1,4 @@
---
- configure.ac | 2 +-
- doc/reference/Makefile.am | 2 +-
examples/Makefile.am | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
@@ -14,32 +12,3 @@ Index: clutter-gst/examples/Makefile.am
INCLUDES = -I$(top_srcdir)/
-@@ -9,12 +9,12 @@ video_player_LDFLAGS = \
- $(GST_LIBS) \
- $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
-
--video_cube_SOURCES = video-cube.c
--video_cube_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
--video_cube_LDFLAGS = \
-- $(CLUTTER_LIBS) \
-- $(GST_LIBS) \
-- $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
-+#video_cube_SOURCES = video-cube.c
-+#video_cube_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-+#video_cube_LDFLAGS = \
-+# $(CLUTTER_LIBS) \
-+# $(GST_LIBS) \
-+# $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
-
- video_sink_SOURCES = video-sink.c
- video_sink_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
-Index: clutter-gst/doc/reference/Makefile.am
-===================================================================
---- clutter-gst.orig/doc/reference/Makefile.am 2007-07-10 13:01:17.000000000 +0100
-+++ clutter-gst/doc/reference/Makefile.am 2007-07-10 13:02:50.000000000 +0100
-@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
-
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb
index ff939d9b4..6afb4f52d 100644
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ b/meta/packages/clutter/clutter-gst_svn.bb
@@ -1,6 +1,6 @@
require clutter-gst.inc
-PV = "0.3.0+svnr${SRCREV}"
+PV = "0.4.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.inc b/meta/packages/clutter/clutter.inc
index 64deb958c..84cd418e6 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -8,6 +8,11 @@ BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
DEPENDS = "${STDDEPENDS}"
EXTRA_OECONF = "${BASE_CONF}"
+DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
+EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
+LDFLAGS_append_zylonite = " -lnws -lstdc++ "
+
inherit autotools pkgconfig
PACKAGES =+ "clutter-examples"
@@ -24,7 +29,7 @@ do_configure_prepend() {
}
do_stage () {
- cp ${S}/clutter.pc ${S}/clutter-0.3.pc
+ cp ${S}/clutter.pc ${S}/clutter-0.4.pc
autotools_stage_all
}
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index 4a03bf68d..0a6ff0d68 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -1,6 +1,6 @@
require clutter.inc
-PV = "0.3.0+svnr${SRCREV}"
+PV = "0.4.0+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
file://enable_tests.patch;patch=1 "
--
cgit v1.2.3