summaryrefslogtreecommitdiffstats
path: root/meta/packages/clutter
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/clutter')
-rw-r--r--meta/packages/clutter/clutter-cairo_svn.bb2
-rw-r--r--meta/packages/clutter/clutter-gst/autofoo.patch31
-rw-r--r--meta/packages/clutter/clutter-gst_svn.bb2
-rw-r--r--meta/packages/clutter/clutter.inc7
-rw-r--r--meta/packages/clutter/clutter_svn.bb2
5 files changed, 9 insertions, 35 deletions
diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb
index 0e459ec855..3d71bb2b73 100644
--- a/meta/packages/clutter/clutter-cairo_svn.bb
+++ b/meta/packages/clutter/clutter-cairo_svn.bb
@@ -1,6 +1,6 @@
1require clutter-cairo.inc 1require clutter-cairo.inc
2 2
3PV = "0.3.0+svnr${SRCREV}" 3PV = "0.4.0+svnr${SRCREV}"
4 4
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ 5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
6 file://enable_examples.patch;patch=1" 6 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 f5b8ef7d1d..7b3e87702f 100644
--- a/meta/packages/clutter/clutter-gst/autofoo.patch
+++ b/meta/packages/clutter/clutter-gst/autofoo.patch
@@ -1,6 +1,4 @@
1--- 1---
2 configure.ac | 2 +-
3 doc/reference/Makefile.am | 2 +-
4 examples/Makefile.am | 14 +++++++------- 2 examples/Makefile.am | 14 +++++++-------
5 3 files changed, 9 insertions(+), 9 deletions(-) 3 3 files changed, 9 insertions(+), 9 deletions(-)
6 4
@@ -14,32 +12,3 @@ Index: clutter-gst/examples/Makefile.am
14 12
15 INCLUDES = -I$(top_srcdir)/ 13 INCLUDES = -I$(top_srcdir)/
16 14
17@@ -9,12 +9,12 @@ video_player_LDFLAGS = \
18 $(GST_LIBS) \
19 $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
20
21-video_cube_SOURCES = video-cube.c
22-video_cube_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
23-video_cube_LDFLAGS = \
24- $(CLUTTER_LIBS) \
25- $(GST_LIBS) \
26- $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
27+#video_cube_SOURCES = video-cube.c
28+#video_cube_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
29+#video_cube_LDFLAGS = \
30+# $(CLUTTER_LIBS) \
31+# $(GST_LIBS) \
32+# $(top_builddir)/clutter-gst/libclutter-gst-@CLUTTER_GST_MAJORMINOR@.la
33
34 video_sink_SOURCES = video-sink.c
35 video_sink_CFLAGS = $(CLUTTER_GST_CFLAGS) $(GST_CFLAGS)
36Index: clutter-gst/doc/reference/Makefile.am
37===================================================================
38--- clutter-gst.orig/doc/reference/Makefile.am 2007-07-10 13:01:17.000000000 +0100
39+++ clutter-gst/doc/reference/Makefile.am 2007-07-10 13:02:50.000000000 +0100
40@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
41
42 # Other files to distribute
43 # e.g. EXTRA_DIST += version.xml.in
44-EXTRA_DIST += version.xml.in
45+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb
index ff939d9b4c..6afb4f52de 100644
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ b/meta/packages/clutter/clutter-gst_svn.bb
@@ -1,6 +1,6 @@
1require clutter-gst.inc 1require clutter-gst.inc
2 2
3PV = "0.3.0+svnr${SRCREV}" 3PV = "0.4.0+svnr${SRCREV}"
4 4
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ 5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
6 file://autofoo.patch;patch=1" 6 file://autofoo.patch;patch=1"
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 64deb958c8..84cd418e6f 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)}"
8DEPENDS = "${STDDEPENDS}" 8DEPENDS = "${STDDEPENDS}"
9EXTRA_OECONF = "${BASE_CONF}" 9EXTRA_OECONF = "${BASE_CONF}"
10 10
11DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
12EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
13PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
14LDFLAGS_append_zylonite = " -lnws -lstdc++ "
15
11inherit autotools pkgconfig 16inherit autotools pkgconfig
12 17
13PACKAGES =+ "clutter-examples" 18PACKAGES =+ "clutter-examples"
@@ -24,7 +29,7 @@ do_configure_prepend() {
24} 29}
25 30
26do_stage () { 31do_stage () {
27 cp ${S}/clutter.pc ${S}/clutter-0.3.pc 32 cp ${S}/clutter.pc ${S}/clutter-0.4.pc
28 autotools_stage_all 33 autotools_stage_all
29} 34}
30 35
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index 4a03bf68da..0a6ff0d688 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -1,6 +1,6 @@
1require clutter.inc 1require clutter.inc
2 2
3PV = "0.3.0+svnr${SRCREV}" 3PV = "0.4.0+svnr${SRCREV}"
4 4
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ 5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
6 file://enable_tests.patch;patch=1 " 6 file://enable_tests.patch;patch=1 "