summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-06 23:11:42 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-06 23:11:42 +0000
commitb5fda834416809a5348f6f5e21ddaeb484c4cdc8 (patch)
tree9f22a41520e9fb347a7ea82fe54338d0c18ec838 /meta
parent7277fe10c9404cbbd1df011422974ff7f2053efd (diff)
downloadpoky-b5fda834416809a5348f6f5e21ddaeb484c4cdc8.tar.gz
clutter: Fix so 0.4 versions are default (which matches distro config SRCREVs) and fix up svn trunk versions too.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3084 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/clutter/clutter-gst/autofoo-0.4.patch15
-rw-r--r--meta/packages/clutter/clutter-gst_0.4svn.bb6
-rw-r--r--meta/packages/clutter/clutter-gst_svn.bb6
-rw-r--r--meta/packages/clutter/clutter.inc3
-rw-r--r--meta/packages/clutter/clutter/enable_tests-0.4.patch52
-rw-r--r--meta/packages/clutter/clutter_0.4svn.bb9
-rw-r--r--meta/packages/clutter/clutter_svn.bb4
8 files changed, 84 insertions, 13 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 89993acb76..9fe31ad906 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -126,7 +126,7 @@ SRCREV_pn-fstests ?= "266"
126SRCDATE_abiword ?= "20070130" 126SRCDATE_abiword ?= "20070130"
127SRCREV_pn-xvideo-tests ?= "272" 127SRCREV_pn-xvideo-tests ?= "272"
128SRCREV_pn-clutter ?= "1495" 128SRCREV_pn-clutter ?= "1495"
129SRCREV_pn-clutter-gst ?= "1317" 129SRCREV_pn-clutter-gst ?= "1495"
130SRCDATE_libgsmd ?= "20070917" 130SRCDATE_libgsmd ?= "20070917"
131SRCREV_pn-gaku ?= "286" 131SRCREV_pn-gaku ?= "286"
132SRCREV_pn-gypsy ?= "39" 132SRCREV_pn-gypsy ?= "39"
diff --git a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch b/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
new file mode 100644
index 0000000000..54df63d297
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
@@ -0,0 +1,15 @@
1---
2 doc/reference/Makefile.am | 2 +-
3 examples/Makefile.am | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6Index: clutter-gst/examples/Makefile.am
7===================================================================
8--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000
9+++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000
10@@ -1,4 +1,4 @@
11-noinst_PROGRAMS = video-player video-sink audio
12+bin_PROGRAMS = video-player video-sink audio
13
14 INCLUDES = -I$(top_srcdir)/
15
diff --git a/meta/packages/clutter/clutter-gst_0.4svn.bb b/meta/packages/clutter/clutter-gst_0.4svn.bb
index fa7afe0f96..1af797888c 100644
--- a/meta/packages/clutter/clutter-gst_0.4svn.bb
+++ b/meta/packages/clutter/clutter-gst_0.4svn.bb
@@ -1,9 +1,9 @@
1require clutter-gst.inc 1require clutter-gst.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5PV = "0.4.0+svnr${SRCREV}" 3PV = "0.4.0+svnr${SRCREV}"
6 4
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http " 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 8
9S = "${WORKDIR}/clutter-gst-0-4" 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 6afb4f52de..b4d41d6830 100644
--- a/meta/packages/clutter/clutter-gst_svn.bb
+++ b/meta/packages/clutter/clutter-gst_svn.bb
@@ -1,10 +1,10 @@
1require clutter-gst.inc 1require clutter-gst.inc
2 2
3PV = "0.4.0+svnr${SRCREV}" 3DEFAULT_PREFERENCE = "-1"
4
5PV = "0.5.0+svnr${SRCREV}"
4 6
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ 7SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
6 file://autofoo.patch;patch=1" 8 file://autofoo.patch;patch=1"
7 9
8S = "${WORKDIR}/${PN}" 10S = "${WORKDIR}/${PN}"
9
10
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 8cb44b28f8..ac633dc74a 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -34,7 +34,6 @@ do_configure_prepend() {
34} 34}
35 35
36do_stage () { 36do_stage () {
37 cp ${S}/clutter.pc ${S}/clutter-0.4.pc 37 cp ${S}/clutter.pc ${S}/clutter-0.5.pc
38 autotools_stage_all 38 autotools_stage_all
39} 39}
40
diff --git a/meta/packages/clutter/clutter/enable_tests-0.4.patch b/meta/packages/clutter/clutter/enable_tests-0.4.patch
new file mode 100644
index 0000000000..3178a2cd6c
--- /dev/null
+++ b/meta/packages/clutter/clutter/enable_tests-0.4.patch
@@ -0,0 +1,52 @@
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_0.4svn.bb b/meta/packages/clutter/clutter_0.4svn.bb
index 0bd32b6124..fe1fbc29d3 100644
--- a/meta/packages/clutter/clutter_0.4svn.bb
+++ b/meta/packages/clutter/clutter_0.4svn.bb
@@ -1,10 +1,13 @@
1require clutter.inc 1require clutter.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5PV = "0.4.0+svnr${SRCREV}" 3PV = "0.4.0+svnr${SRCREV}"
6 4
7SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ 5SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \
8 file://enable_tests.patch;patch=1 " 6 file://enable_tests-0.4.patch;patch=1 "
9 7
10S = "${WORKDIR}/clutter-0-4" 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 0a6ff0d688..a0015ba42e 100644
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -1,6 +1,8 @@
1require clutter.inc 1require clutter.inc
2 2
3PV = "0.4.0+svnr${SRCREV}" 3DEFAULT_PREFERENCE = "-1"
4
5PV = "0.5.0+svnr${SRCREV}"
4 6
5SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ 7SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
6 file://enable_tests.patch;patch=1 " 8 file://enable_tests.patch;patch=1 "