summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <bob@openedhand.com>2008-10-02 17:11:36 +0000
committerRoss Burton <ross@linux.intel.com>2008-12-01 17:56:33 +0000
commiteea56a7f4d72664b1fb67a874198f3ac77235800 (patch)
tree9d4f4bd885a8f7a03ccf6da6378f8a320948ed6c
parent13ac7cba377e08ac3b62d202b94abe329cf72924 (diff)
downloadpoky-eea56a7f4d72664b1fb67a874198f3ac77235800.tar.gz
Merge Clutter packaging rewrite from master.
- This adds clutter-{gst,gtk,cairo}-0.8 recipes and clutter-{gst,gtk,cairo}-0.6 recipes. - It removes the 0.4 recipes. - It renames things so that the major.minor revision is now part of the package name. This lets us correctly specify SRCREVs for each branch, and allows parallell install. - All the SRCREVs have been updated to the heads of their corresponding branches git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5384 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc17
-rw-r--r--meta/packages/clutter/aaina.inc2
-rw-r--r--meta/packages/clutter/clutter-0.6_svn.bb (renamed from meta/packages/clutter/clutter_0.6svn.bb)0
-rw-r--r--meta/packages/clutter/clutter-0.8_svn.bb11
-rw-r--r--meta/packages/clutter/clutter-box2d.inc2
-rw-r--r--meta/packages/clutter/clutter-cairo-0.6_svn.bb12
-rw-r--r--meta/packages/clutter/clutter-cairo-0.8_svn.bb12
-rw-r--r--meta/packages/clutter/clutter-cairo.inc4
-rw-r--r--meta/packages/clutter/clutter-cairo_svn.bb1
-rw-r--r--meta/packages/clutter/clutter-gst-0.6_svn.bb10
-rw-r--r--meta/packages/clutter/clutter-gst-0.8_svn.bb10
-rw-r--r--meta/packages/clutter/clutter-gst.inc10
-rw-r--r--meta/packages/clutter/clutter-gst_0.4svn.bb9
-rw-r--r--meta/packages/clutter/clutter-gst_svn.bb1
-rw-r--r--meta/packages/clutter/clutter-gtk-0.6_svn.bb10
-rw-r--r--meta/packages/clutter/clutter-gtk-0.8_svn.bb10
-rw-r--r--meta/packages/clutter/clutter-gtk.inc17
-rw-r--r--meta/packages/clutter/clutter-gtk_svn.bb9
-rw-r--r--meta/packages/clutter/clutter.inc2
-rw-r--r--meta/packages/clutter/clutter/enable_tests-0.4.patch52
-rw-r--r--meta/packages/clutter/clutter/enable_tests-0.8.patch50
-rw-r--r--meta/packages/clutter/clutter_0.4svn.bb13
-rw-r--r--meta/packages/clutter/clutter_svn.bb2
-rw-r--r--meta/packages/clutter/table.inc2
-rw-r--r--meta/packages/clutter/table_svn.bb1
-rw-r--r--meta/packages/clutter/tidy.inc2
-rw-r--r--meta/packages/clutter/tidy_svn.bb2
-rw-r--r--meta/packages/tasks/task-poky-clutter.bb16
28 files changed, 191 insertions, 98 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 92b40ad328..2c49473c0f 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -20,10 +20,19 @@ SRCDATE_yaffs2-utils = "20071107"
20PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}" 20PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
21SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" 21SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
22SRCREV_pn-clipboard-manager ?= "14994" 22SRCREV_pn-clipboard-manager ?= "14994"
23SRCREV_pn-clutter-box2d = "3197" 23SRCREV_pn-clutter-box2d = "3326"
24SRCREV_pn-clutter-cairo ?= "3210" 24SRCREV_pn-clutter-cairo-0.6 ?= "2754"
25SRCREV_pn-clutter-gst ?= "3188" 25SRCREV_pn-clutter-cairo-0.8 ?= "3322"
26SRCREV_pn-clutter ?= "3240" 26SRCREV_pn-clutter-cairo ?= "3313"
27SRCREV_pn-clutter-gst-0.6 ?= "2961"
28SRCREV_pn-clutter-gst-0.8 ?= "3351"
29SRCREV_pn-clutter-gst ?= "3349"
30SRCREV_pn-clutter-gtk-0.6 ?= "2961"
31SRCREV_pn-clutter-gtk-0.8 ?= "3350"
32SRCREV_pn-clutter-gtk ?= "3349"
33SRCREV_pn-clutter-0.6 ?= "2816"
34SRCREV_pn-clutter-0.8 ?= "3323"
35SRCREV_pn-clutter ?= "3334"
27SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93" 36SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
28SRCREV_pn-dbus-wait ?= "402" 37SRCREV_pn-dbus-wait ?= "402"
29SRCREV_pn-eds-dbus ?= "691" 38SRCREV_pn-eds-dbus ?= "691"
diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc
index fbef34f563..1baccc730c 100644
--- a/meta/packages/clutter/aaina.inc
+++ b/meta/packages/clutter/aaina.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Aaina Clutter Demo"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "GPL" 3LICENSE = "GPL"
4 4
5DEPENDS = "clutter libxml2 gtk+ neon" 5DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
6 6
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
diff --git a/meta/packages/clutter/clutter_0.6svn.bb b/meta/packages/clutter/clutter-0.6_svn.bb
index 79882d6ddf..79882d6ddf 100644
--- a/meta/packages/clutter/clutter_0.6svn.bb
+++ b/meta/packages/clutter/clutter-0.6_svn.bb
diff --git a/meta/packages/clutter/clutter-0.8_svn.bb b/meta/packages/clutter/clutter-0.8_svn.bb
new file mode 100644
index 0000000000..c8315a2421
--- /dev/null
+++ b/meta/packages/clutter/clutter-0.8_svn.bb
@@ -0,0 +1,11 @@
1require clutter.inc
2
3PE = "1"
4PR = "r0"
5PV = "0.8.0+svnr${SRCREV}"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http \
8 file://enable_tests-0.8.patch;patch=1 "
9
10S = "${WORKDIR}/clutter-0-8"
11
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc
index 8189d12bbb..c5cd3283e2 100644
--- a/meta/packages/clutter/clutter-box2d.inc
+++ b/meta/packages/clutter/clutter-box2d.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4 4
5DEPENDS = "clutter" 5DEPENDS = "clutter-0.8"
6 6
7# The main clutter lib is machine specific so we need to be too 7# The main clutter lib is machine specific so we need to be too
8PACKAGE_ARCH = "${MACHINE_ARCH}" 8PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/packages/clutter/clutter-cairo-0.6_svn.bb b/meta/packages/clutter/clutter-cairo-0.6_svn.bb
new file mode 100644
index 0000000000..b07bdac5a0
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo-0.6_svn.bb
@@ -0,0 +1,12 @@
1require clutter-cairo.inc
2
3PV = "0.8.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.6"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
8 file://enable_examples.patch;patch=1"
9
10S = "${WORKDIR}/${PN}"
11
12
diff --git a/meta/packages/clutter/clutter-cairo-0.8_svn.bb b/meta/packages/clutter/clutter-cairo-0.8_svn.bb
new file mode 100644
index 0000000000..53d1f712cf
--- /dev/null
+++ b/meta/packages/clutter/clutter-cairo-0.8_svn.bb
@@ -0,0 +1,12 @@
1require clutter-cairo.inc
2
3PV = "0.8.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \
8 file://enable_examples.patch;patch=1"
9
10S = "${WORKDIR}/${PN}"
11
12
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc
index 1095a7e8ef..3a94c35ad6 100644
--- a/meta/packages/clutter/clutter-cairo.inc
+++ b/meta/packages/clutter/clutter-cairo.inc
@@ -2,7 +2,9 @@ DESCRIPTION = "Clutter Cairo"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5DEPENDS = "clutter cairo" 5DEPENDS = "cairo"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
6 8
7PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
8FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" 10FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb
index 1084c1cc16..5059bb518f 100644
--- a/meta/packages/clutter/clutter-cairo_svn.bb
+++ b/meta/packages/clutter/clutter-cairo_svn.bb
@@ -1,6 +1,7 @@
1require clutter-cairo.inc 1require clutter-cairo.inc
2 2
3PV = "0.8.0+svnr${SRCREV}" 3PV = "0.8.0+svnr${SRCREV}"
4PR = "r1"
4 5
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ 6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
6 file://enable_examples.patch;patch=1" 7 file://enable_examples.patch;patch=1"
diff --git a/meta/packages/clutter/clutter-gst-0.6_svn.bb b/meta/packages/clutter/clutter-gst-0.6_svn.bb
new file mode 100644
index 0000000000..75f6019f5d
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.6_svn.bb
@@ -0,0 +1,10 @@
1require clutter-gst.inc
2
3PV = "0.6.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.6"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-6;proto=http"
8
9
10S = "${WORKDIR}/clutter-gst-0-6"
diff --git a/meta/packages/clutter/clutter-gst-0.8_svn.bb b/meta/packages/clutter/clutter-gst-0.8_svn.bb
new file mode 100644
index 0000000000..0f175b2b1d
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.8_svn.bb
@@ -0,0 +1,10 @@
1require clutter-gst.inc
2
3PV = "0.8.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-8;proto=http"
8
9
10S = "${WORKDIR}/clutter-gst-0-8"
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc
index caaa7559b8..ad921bd0c0 100644
--- a/meta/packages/clutter/clutter-gst.inc
+++ b/meta/packages/clutter/clutter-gst.inc
@@ -2,16 +2,14 @@ DESCRIPTION = "Clutter GStreamer"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5DEPENDS = "clutter gstreamer gst-plugins-base" 5DEPENDS = "gstreamer gst-plugins-base"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-gst"
6 8
7PACKAGES =+ "${PN}-examples" 9PACKAGES =+ "${PN}-examples"
8FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" 10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
9 11
10inherit autotools pkgconfig 12inherit autotools pkgconfig gtk-doc
11
12do_configure_prepend() {
13 touch ${S}/gtk-doc.make
14}
15 13
16do_stage () { 14do_stage () {
17 autotools_stage_all 15 autotools_stage_all
diff --git a/meta/packages/clutter/clutter-gst_0.4svn.bb b/meta/packages/clutter/clutter-gst_0.4svn.bb
deleted file mode 100644
index 1af797888c..0000000000
--- a/meta/packages/clutter/clutter-gst_0.4svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.4.0+svnr${SRCREV}"
4
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \
6 file://autofoo-0.4.patch;patch=1"
7
8
9S = "${WORKDIR}/clutter-gst-0-4"
diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb
index 8ef87236f7..b41e28c8d9 100644
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ b/meta/packages/clutter/clutter-gst_svn.bb
@@ -1,6 +1,7 @@
1require clutter-gst.inc 1require clutter-gst.inc
2 2
3PV = "0.8.0+svnr${SRCREV}" 3PV = "0.8.0+svnr${SRCREV}"
4PR = "r1"
4 5
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ 6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
6 file://autofoo.patch;patch=1" 7 file://autofoo.patch;patch=1"
diff --git a/meta/packages/clutter/clutter-gtk-0.6_svn.bb b/meta/packages/clutter/clutter-gtk-0.6_svn.bb
new file mode 100644
index 0000000000..d89c2873f3
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.6_svn.bb
@@ -0,0 +1,10 @@
1require clutter-gtk.inc
2
3PV = "0.6.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.6"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-6;proto=http"
8
9
10S = "${WORKDIR}/clutter-gtk-0-6"
diff --git a/meta/packages/clutter/clutter-gtk-0.8_svn.bb b/meta/packages/clutter/clutter-gtk-0.8_svn.bb
new file mode 100644
index 0000000000..1767942e5b
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.8_svn.bb
@@ -0,0 +1,10 @@
1require clutter-gtk.inc
2
3PV = "0.8.0+svnr${SRCREV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-8;proto=http"
8
9
10S = "${WORKDIR}/clutter-gtk-0-8"
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc
new file mode 100644
index 0000000000..0545571b44
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk.inc
@@ -0,0 +1,17 @@
1DESCRIPTION = "Clutter GTK+"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "gtk+"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
8
9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
11
12inherit autotools pkgconfig gtk-doc
13
14do_stage () {
15 autotools_stage_all
16}
17
diff --git a/meta/packages/clutter/clutter-gtk_svn.bb b/meta/packages/clutter/clutter-gtk_svn.bb
new file mode 100644
index 0000000000..007aa4ae65
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk_svn.bb
@@ -0,0 +1,9 @@
1require clutter-gst.inc
2
3PV = "0.8.0+svnr${SRCREV}"
4PR = "r0"
5
6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
7 file://autofoo.patch;patch=1"
8
9S = "${WORKDIR}/${PN}"
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 76018b25d1..5ff179c149 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -35,6 +35,8 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" 35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " 36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
37 37
38FILESPATH = "${FILE_DIRNAME}/clutter"
39
38inherit autotools pkgconfig gtk-doc 40inherit autotools pkgconfig gtk-doc
39 41
40PACKAGES =+ "clutter-examples" 42PACKAGES =+ "clutter-examples"
diff --git a/meta/packages/clutter/clutter/enable_tests-0.4.patch b/meta/packages/clutter/clutter/enable_tests-0.4.patch
deleted file mode 100644
index 3178a2cd6c..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-0.4.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: clutter-0-4/tests/Makefile.am
8===================================================================
9--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000
10+++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000
11@@ -1,4 +1,4 @@
12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
14 test-actors test-behave test-text test-entry test-project \
15 test-boxes test-perspective test-rotate test-depth \
16 test-threads test-timeline
17@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c
18 test_threads_SOURCES = test-threads.c
19 test_timeline_SOURCES = test-timeline.c
20
21+test_textdir = $(pkgdatadir)
22+test_text_DATA = test-text.c
23+test_actorsdir = $(pkgdatadir)
24+test_actors_DATA = redhand.png
25+
26 EXTRA_DIST = redhand.png
27Index: clutter-0-4/tests/test-actors.c
28===================================================================
29--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000
30+++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000
31@@ -143,7 +143,7 @@ main (int argc, char *argv[])
32 stage = clutter_stage_get_default ();
33 clutter_actor_set_size (stage, 800, 600);
34
35- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
36+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
37
38 if (!pixbuf)
39 g_error("pixbuf load failed");
40Index: clutter-0-4/tests/test-text.c
41===================================================================
42--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000
43+++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000
44@@ -27,7 +27,7 @@ main (int argc, char *argv[])
45
46 stage = clutter_stage_get_default ();
47
48- if (!g_file_get_contents ("test-text.c", &text, &size, NULL))
49+ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL))
50 g_error("g_file_get_contents() of test-text.c failed");
51
52 clutter_actor_set_size (stage, 800, 600);
diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/packages/clutter/clutter/enable_tests-0.8.patch
new file mode 100644
index 0000000000..4f449b1177
--- /dev/null
+++ b/meta/packages/clutter/clutter/enable_tests-0.8.patch
@@ -0,0 +1,50 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: clutter/tests/Makefile.am
8===================================================================
9--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
10+++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
11@@ -1,4 +1,4 @@
12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
14 test-actors test-behave test-text test-entry test-project \
15 test-perspective test-rotate test-depth \
16 test-threads test-timeline test-timeline-dup-frames \
17@@ -17,8 +17,8 @@
18 test-invariants
19
20 if X11_TESTS
21-noinst_PROGRAMS += test-pixmap
22-noinst_PROGRAMS += test-devices
23+bin_PROGRAMS += test-pixmap
24+bin_PROGRAMS += test-devices
25 endif
26
27 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
28@@ -73,4 +73,9 @@
29 test_invariants_SOURCES = test-invariants.c
30 test_devices_SOURCES = test-devices.c
31
32+test_textdir = $(pkgdatadir)
33+test_text_DATA = test-text.c
34+test_actorsdir = $(pkgdatadir)
35+test_actors_DATA = redhand.png
36+
37 EXTRA_DIST = redhand.png test-script.json
38Index: clutter/tests/test-actors.c
39===================================================================
40--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
41+++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
42@@ -195,7 +195,7 @@
43 /* Create a texture from file, then clone in to same resources */
44 if (i == 0)
45 {
46- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
47+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
48 &error)) == NULL)
49 {
50 g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter_0.4svn.bb b/meta/packages/clutter/clutter_0.4svn.bb
deleted file mode 100644
index fe1fbc29d3..0000000000
--- a/meta/packages/clutter/clutter_0.4svn.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require clutter.inc
2
3PV = "0.4.0+svnr${SRCREV}"
4
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \
6 file://enable_tests-0.4.patch;patch=1 "
7
8S = "${WORKDIR}/clutter-0-4"
9
10do_stage () {
11 cp ${S}/clutter.pc ${S}/clutter-0.4.pc
12 autotools_stage_all
13}
diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index cf88871ae0..150828ce5d 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -1,7 +1,7 @@
1require clutter.inc 1require clutter.inc
2 2
3PV = "0.8.0+svnr${SRCREV}" 3PV = "0.8.0+svnr${SRCREV}"
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ 6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
7 file://enable_tests.patch;patch=1;maxrev=2989 \ 7 file://enable_tests.patch;patch=1;maxrev=2989 \
diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc
index 6ee1672197..b07b39dc1e 100644
--- a/meta/packages/clutter/table.inc
+++ b/meta/packages/clutter/table.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Table Clutter Demo"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5DEPENDS = "clutter-gst gnome-vfs" 5DEPENDS = "clutter-gst-0.6 gnome-vfs"
6 6
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
diff --git a/meta/packages/clutter/table_svn.bb b/meta/packages/clutter/table_svn.bb
index 168ea4dfba..e293ff3ca2 100644
--- a/meta/packages/clutter/table_svn.bb
+++ b/meta/packages/clutter/table_svn.bb
@@ -1,6 +1,7 @@
1require table.inc 1require table.inc
2 2
3PV = "0.3.0+svnr${SRCREV}" 3PV = "0.3.0+svnr${SRCREV}"
4PR = "r1"
4 5
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \ 6SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
6 file://fixes.patch;patch=1" 7 file://fixes.patch;patch=1"
diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc
index bac910a4f4..d1f11976cd 100644
--- a/meta/packages/clutter/tidy.inc
+++ b/meta/packages/clutter/tidy.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5STDDEPENDS = "clutter" 5STDDEPENDS = "clutter-0.8"
6BASE_CONF = "--disable-gtk-doc" 6BASE_CONF = "--disable-gtk-doc"
7 7
8DEPENDS = "${STDDEPENDS}" 8DEPENDS = "${STDDEPENDS}"
diff --git a/meta/packages/clutter/tidy_svn.bb b/meta/packages/clutter/tidy_svn.bb
index 348bba0a8e..8d9f3ac516 100644
--- a/meta/packages/clutter/tidy_svn.bb
+++ b/meta/packages/clutter/tidy_svn.bb
@@ -1,7 +1,7 @@
1require tidy.inc 1require tidy.inc
2 2
3PV = "0.1.0+svnr${SRCREV}" 3PV = "0.1.0+svnr${SRCREV}"
4PR = "6" 4PR = "r7"
5 5
6SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \ 6SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
7 file://tidy-enable-tests.patch;patch=1" 7 file://tidy-enable-tests.patch;patch=1"
diff --git a/meta/packages/tasks/task-poky-clutter.bb b/meta/packages/tasks/task-poky-clutter.bb
index fb5abd500e..4393ec269c 100644
--- a/meta/packages/tasks/task-poky-clutter.bb
+++ b/meta/packages/tasks/task-poky-clutter.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Clutter Tasks for OpenedHand Poky" 5DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
6PR = "r2" 6PR = "r3"
7 7
8PACKAGES = "\ 8PACKAGES = "\
9 task-poky-clutter-core \ 9 task-poky-clutter-core \
@@ -20,14 +20,16 @@ PACKAGES = "\
20ALLOW_EMPTY = "1" 20ALLOW_EMPTY = "1"
21 21
22RDEPENDS_task-poky-clutter-core = "\ 22RDEPENDS_task-poky-clutter-core = "\
23 clutter \ 23 clutter-0.8 \
24 clutter-cairo \ 24 clutter-cairo-0.8 \
25 clutter-gst" 25 clutter-gst-0.8 \
26 clutter-gtk-0.8"
26 27
27RDEPENDS_task-poky-clutter-tests = "\ 28RDEPENDS_task-poky-clutter-tests = "\
28 clutter-examples \ 29 clutter-0.8-examples \
29 clutter-cairo-examples \ 30 clutter-cairo-0.8-examples \
30 clutter-gst-examples" 31 clutter-gst-0.8-examples \
32 clutter-gtk-0.8-examples"
31 33
32RDEPENDS_task-poky-clutter-apps = "\ 34RDEPENDS_task-poky-clutter-apps = "\
33 aaina \ 35 aaina \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-25 12:57:26 +0000