[oe-commits] org.oe.dev clutter: sync with poky
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 18:34:40 UTC 2008
clutter: sync with poky
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7000bf51bcab54e068be6b45179d50bcdfb7b71c
ViewMTN: http://monotone.openembedded.org/revision/info/7000bf51bcab54e068be6b45179d50bcdfb7b71c
Files:
1
packages/clutter/clutter
packages/clutter/clutter-cairo
packages/clutter/clutter-gst
packages/clutter/moblin-proto
packages/clutter/table
packages/clutter/tidy
packages/clutter/aaina.inc
packages/clutter/aaina_svn.bb
packages/clutter/clutter/enable-tests-r2990.patch
packages/clutter/clutter/enable_tests-0.4.patch
packages/clutter/clutter/enable_tests-0.6.patch
packages/clutter/clutter/enable_tests.patch
packages/clutter/clutter-box2d.inc
packages/clutter/clutter-box2d_svn.bb
packages/clutter/clutter-cairo/enable_examples.patch
packages/clutter/clutter-cairo.inc
packages/clutter/clutter-cairo_svn.bb
packages/clutter/clutter-gst/autofoo-0.4.patch
packages/clutter/clutter-gst/autofoo.patch
packages/clutter/clutter-gst.inc
packages/clutter/clutter-gst_0.4svn.bb
packages/clutter/clutter-gst_svn.bb
packages/clutter/clutter_0.4svn.bb
packages/clutter/clutter_0.6svn.bb
packages/clutter/clutter_svn.bb
packages/clutter/moblin-proto/fix.patch
packages/clutter/moblin-proto/paths.patch
packages/clutter/moblin-proto_git.bb
packages/clutter/table/fixes.patch
packages/clutter/table.inc
packages/clutter/table_svn.bb
packages/clutter/tidy/autofoo.patch
packages/clutter/tidy/tidy-enable-tests.patch
packages/clutter/tidy.inc
packages/clutter/tidy_svn.bb
packages/clutter/clutter.inc
Diffs:
#
# mt diff -rd8905dd029dc18f9af66dc54e8a11a3c608bd036 -r7000bf51bcab54e068be6b45179d50bcdfb7b71c
#
#
#
# add_dir "packages/clutter/clutter"
#
# add_dir "packages/clutter/clutter-cairo"
#
# add_dir "packages/clutter/clutter-gst"
#
# add_dir "packages/clutter/moblin-proto"
#
# add_dir "packages/clutter/table"
#
# add_dir "packages/clutter/tidy"
#
# add_file "packages/clutter/aaina.inc"
# content [bc249b320d2c09fafec382ea992b061a53602731]
#
# add_file "packages/clutter/aaina_svn.bb"
# content [aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af]
#
# add_file "packages/clutter/clutter/enable-tests-r2990.patch"
# content [966254bc832aaedeb5875a2e72e8095df2bf71b1]
#
# add_file "packages/clutter/clutter/enable_tests-0.4.patch"
# content [853e565bcea51be7b3ec9c536d537f7883268637]
#
# add_file "packages/clutter/clutter/enable_tests-0.6.patch"
# content [686cb824c28f61344827e5e412a79a25b0db7708]
#
# add_file "packages/clutter/clutter/enable_tests.patch"
# content [905a94aac0993709d284ebaaf0c00d73a34eddba]
#
# add_file "packages/clutter/clutter-box2d.inc"
# content [7c1983377e9c27e1fb3a402b3e17223f82ac32a3]
#
# add_file "packages/clutter/clutter-box2d_svn.bb"
# content [1fb625dc239ad8580efa47dc75948ed6567b359f]
#
# add_file "packages/clutter/clutter-cairo/enable_examples.patch"
# content [f6ef7b5d5a34b2dfcf39504db490345abc7ec154]
#
# add_file "packages/clutter/clutter-cairo.inc"
# content [cf8f5dbefd7794d1ad86abc4897052b632e877aa]
#
# add_file "packages/clutter/clutter-cairo_svn.bb"
# content [514931fe21e7521724614b42730c114c808a6c5d]
#
# add_file "packages/clutter/clutter-gst/autofoo-0.4.patch"
# content [1ac70534e2388c80f40e4af02e40f2c61cca43a0]
#
# add_file "packages/clutter/clutter-gst/autofoo.patch"
# content [85a60bf11393a1bf64909f55cb6596c6e928b248]
#
# add_file "packages/clutter/clutter-gst.inc"
# content [d9a754ee52a97c60567291b23f486a6c60ec2e99]
#
# add_file "packages/clutter/clutter-gst_0.4svn.bb"
# content [b695755cdaa1623a865238e5e96dbda2508d4a49]
#
# add_file "packages/clutter/clutter-gst_svn.bb"
# content [55f783dc761528e6eb302f4c7128c8c2466c1840]
#
# add_file "packages/clutter/clutter_0.4svn.bb"
# content [870ab6e6f3d207bd08c793c68653a28497f46119]
#
# add_file "packages/clutter/clutter_0.6svn.bb"
# content [81632b8c58de4341896b3371c8932826f115c579]
#
# add_file "packages/clutter/clutter_svn.bb"
# content [592e1062bcda8ab79a1c8979430870033a95d942]
#
# add_file "packages/clutter/moblin-proto/fix.patch"
# content [ea065704404168aa9eb0cf1c92ee5b8e3eeb02e8]
#
# add_file "packages/clutter/moblin-proto/paths.patch"
# content [3a1b267025433f73bd3ab26f16c0a03a6da23e23]
#
# add_file "packages/clutter/moblin-proto_git.bb"
# content [064a16e0061bab0e3fb72a07f8e135b0218cc6d5]
#
# add_file "packages/clutter/table/fixes.patch"
# content [22db0b4a763f91daf2d92943cd9134ad02d3ed64]
#
# add_file "packages/clutter/table.inc"
# content [5ade70e9dbf19b3c274e82e750625eb4e0d4030b]
#
# add_file "packages/clutter/table_svn.bb"
# content [9acf283fb724913bc08402f1e14edbea50f57cb6]
#
# add_file "packages/clutter/tidy/autofoo.patch"
# content [3ac397981741139af6f2773250364a8a3889490a]
#
# add_file "packages/clutter/tidy/tidy-enable-tests.patch"
# content [e9b56fb96aa38bf9fa19058a7e16f4671d8998f9]
#
# add_file "packages/clutter/tidy.inc"
# content [1d340f46c524662824eff9397200fbd31d5b4a14]
#
# add_file "packages/clutter/tidy_svn.bb"
# content [5e82cf17591e5afbe19c1b0afd1b80279a1077c1]
#
# patch "packages/clutter/clutter.inc"
# from [71a3128c8bc71e49422ab7557abefe27ef87295d]
# to [8157361a0697e11b7ffa62ba3f4c9e9ca68f36bf]
#
============================================================
--- packages/clutter/aaina.inc bc249b320d2c09fafec382ea992b061a53602731
+++ packages/clutter/aaina.inc bc249b320d2c09fafec382ea992b061a53602731
@@ -0,0 +1,12 @@
+DESCRIPTION = "Aaina Clutter Demo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "GPL"
+
+DEPENDS = "clutter libxml2 gtk+ neon"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
============================================================
--- packages/clutter/aaina_svn.bb aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af
+++ packages/clutter/aaina_svn.bb aa8d62a2fe86afdfd2af55e8cb0c62f77b9e47af
@@ -0,0 +1,7 @@
+require aaina.inc
+
+PV = "0.3.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
+
+S = "${WORKDIR}/aaina"
============================================================
--- packages/clutter/clutter/enable-tests-r2990.patch 966254bc832aaedeb5875a2e72e8095df2bf71b1
+++ packages/clutter/clutter/enable-tests-r2990.patch 966254bc832aaedeb5875a2e72e8095df2bf71b1
@@ -0,0 +1,50 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-perspective test-rotate test-depth \
+ test-threads test-timeline test-timeline-dup-frames \
+@@ -17,8 +17,8 @@
+ test-invariants
+
+ if X11_TESTS
+-noinst_PROGRAMS += test-pixmap
+-noinst_PROGRAMS += test-devices
++bin_PROGRAMS += test-pixmap
++bin_PROGRAMS += test-devices
+ endif
+
+ INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
+@@ -73,4 +73,9 @@
+ test_invariants_SOURCES = test-invariants.c
+ test_devices_SOURCES = test-devices.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
+@@ -195,7 +195,7 @@
+ /* Create a texture from file, then clone in to same resources */
+ if (i == 0)
+ {
+- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
+ &error)) == NULL)
+ {
+ g_error ("image load failed: %s", error->message);
============================================================
--- packages/clutter/clutter/enable_tests-0.4.patch 853e565bcea51be7b3ec9c536d537f7883268637
+++ packages/clutter/clutter/enable_tests-0.4.patch 853e565bcea51be7b3ec9c536d537f7883268637
@@ -0,0 +1,52 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-4/tests/Makefile.am
+===================================================================
+--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-boxes test-perspective test-rotate test-depth \
+ test-threads test-timeline
+@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c
+ test_threads_SOURCES = test-threads.c
+ test_timeline_SOURCES = test-timeline.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png
+Index: clutter-0-4/tests/test-actors.c
+===================================================================
+--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000
+@@ -143,7 +143,7 @@ main (int argc, char *argv[])
+ stage = clutter_stage_get_default ();
+ clutter_actor_set_size (stage, 800, 600);
+
+- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
+
+ if (!pixbuf)
+ g_error("pixbuf load failed");
+Index: clutter-0-4/tests/test-text.c
+===================================================================
+--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000
++++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000
+@@ -27,7 +27,7 @@ main (int argc, char *argv[])
+
+ stage = clutter_stage_get_default ();
+
+- if (!g_file_get_contents ("test-text.c", &text, &size, NULL))
++ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL))
+ g_error("g_file_get_contents() of test-text.c failed");
+
+ clutter_actor_set_size (stage, 800, 600);
============================================================
--- packages/clutter/clutter/enable_tests-0.6.patch 686cb824c28f61344827e5e412a79a25b0db7708
+++ packages/clutter/clutter/enable_tests-0.6.patch 686cb824c28f61344827e5e412a79a25b0db7708
@@ -0,0 +1,40 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-6/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-boxes test-perspective test-rotate test-depth \
+ test-threads test-timeline test-score test-script
+@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c
+ test_score_SOURCES = test-score.c
+ test_script_SOURCES = test-script.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter-0-6/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000
+@@ -143,7 +143,7 @@ main (int argc, char *argv[])
+ stage = clutter_stage_get_default ();
+ clutter_actor_set_size (stage, 800, 600);
+
+- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
+
+ if (!pixbuf)
+ g_error("pixbuf load failed");
+
============================================================
--- packages/clutter/clutter/enable_tests.patch 905a94aac0993709d284ebaaf0c00d73a34eddba
+++ packages/clutter/clutter/enable_tests.patch 905a94aac0993709d284ebaaf0c00d73a34eddba
@@ -0,0 +1,48 @@
+---
+ tests/Makefile.am | 7 ++++++-
+ tests/test-actors.c | 2 +-
+ tests/test-text.c | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100
++++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
+ test-actors test-behave test-text test-entry test-project \
+ test-perspective test-rotate test-depth \
+ test-threads test-timeline test-timeline-dup-frames \
+@@ -14,7 +14,7 @@
+ test-cogl-tex-polygon test-stage-read-pixels
+
+ if X11_TESTS
+-noinst_PROGRAMS += test-pixmap
++bin_PROGRAMS += test-pixmap
+ endif
+
+ INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
+@@ -61,4 +61,9 @@
+ test_cogl_offscreen_SOURCES = test-cogl-offscreen.c
+ test_stage_read_pixels_SOURCES = test-stage-read-pixels.c
+
++test_textdir = $(pkgdatadir)
++test_text_DATA = test-text.c
++test_actorsdir = $(pkgdatadir)
++test_actors_DATA = redhand.png
++
+ EXTRA_DIST = redhand.png test-script.json
+Index: clutter/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
++++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100
+@@ -184,7 +184,7 @@
+ /* Create a texture from file, then clone in to same resources */
+ if (i == 0)
+ {
+- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
+ &error)) == NULL)
+ {
+ g_error ("image load failed: %s", error->message);
============================================================
--- packages/clutter/clutter-box2d.inc 7c1983377e9c27e1fb3a402b3e17223f82ac32a3
+++ packages/clutter/clutter-box2d.inc 7c1983377e9c27e1fb3a402b3e17223f82ac32a3
@@ -0,0 +1,19 @@
+DESCRIPTION = "Clutter Box2D"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "GPLv2"
+
+DEPENDS = "clutter"
+
+# The main clutter lib is machine specific so we need to be too
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit autotools pkgconfig gtk-doc
+
+do_stage () {
+ autotools_stage_all
+}
+
+do_install_append () {
+ install -d ${D}${bindir}
+ install ${S}/examples/.libs/blockbox ${D}${bindir}
+}
============================================================
--- packages/clutter/clutter-box2d_svn.bb 1fb625dc239ad8580efa47dc75948ed6567b359f
+++ packages/clutter/clutter-box2d_svn.bb 1fb625dc239ad8580efa47dc75948ed6567b359f
@@ -0,0 +1,10 @@
+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"
+
+S = "${WORKDIR}/${PN}"
+
+
============================================================
--- packages/clutter/clutter-cairo/enable_examples.patch f6ef7b5d5a34b2dfcf39504db490345abc7ec154
+++ packages/clutter/clutter-cairo/enable_examples.patch f6ef7b5d5a34b2dfcf39504db490345abc7ec154
@@ -0,0 +1,28 @@
+---
+ examples/Makefile.am | 2 +-
+ examples/flowers.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: clutter-cairo/examples/Makefile.am
+===================================================================
+--- 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 bubbles
++bin_PROGRAMS = clock flowers bubbles
+
+ INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
+ AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo- at CLUTTER_CAIRO_MAJORMINOR@.la
+Index: clutter-cairo/examples/flowers.c
+===================================================================
+--- 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
+ #define PETAL_VAR 40
+-#define N_FLOWERS 40 /* reduce if you have a small card */
++#define N_FLOWERS 8 /* reduce if you have a small card */
+
+ typedef struct Flower
+ {
============================================================
--- packages/clutter/clutter-cairo.inc cf8f5dbefd7794d1ad86abc4897052b632e877aa
+++ packages/clutter/clutter-cairo.inc cf8f5dbefd7794d1ad86abc4897052b632e877aa
@@ -0,0 +1,15 @@
+DESCRIPTION = "Clutter Cairo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "clutter cairo"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ autotools_stage_all
+}
+
=========================%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list