summaryrefslogtreecommitdiffstats
path: root/meta/packages/clutter
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/clutter
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/clutter')
-rw-r--r--meta/packages/clutter/aaina.inc7
-rw-r--r--meta/packages/clutter/aaina_git.bb7
-rw-r--r--meta/packages/clutter/clutter-0.6_git.bb15
-rw-r--r--meta/packages/clutter/clutter-0.8_git.bb13
-rw-r--r--meta/packages/clutter/clutter-1.0_git.bb20
-rw-r--r--meta/packages/clutter/clutter-box2d.inc15
-rw-r--r--meta/packages/clutter/clutter-box2d_git.bb10
-rw-r--r--meta/packages/clutter/clutter-cairo-0.6_git.bb13
-rw-r--r--meta/packages/clutter/clutter-cairo-0.8_git.bb12
-rw-r--r--meta/packages/clutter/clutter-cairo.inc13
-rw-r--r--meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch23
-rw-r--r--meta/packages/clutter/clutter-cairo/enable_examples.patch28
-rw-r--r--meta/packages/clutter/clutter-fpu.inc6
-rw-r--r--meta/packages/clutter/clutter-gst-0.10_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst-0.6_git.bb9
-rw-r--r--meta/packages/clutter/clutter-gst-0.8_git.bb9
-rw-r--r--meta/packages/clutter/clutter-gst-1.0_git.bb14
-rw-r--r--meta/packages/clutter/clutter-gst.inc13
-rw-r--r--meta/packages/clutter/clutter-gst/autofoo-0.4.patch15
-rw-r--r--meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch25
-rw-r--r--meta/packages/clutter/clutter-gst/autofoo.patch27
-rw-r--r--meta/packages/clutter/clutter-gtk-0.10_git.bb12
-rw-r--r--meta/packages/clutter/clutter-gtk-0.6_git.bb9
-rw-r--r--meta/packages/clutter/clutter-gtk-0.8_git.bb9
-rw-r--r--meta/packages/clutter/clutter-gtk-1.0_git.bb12
-rw-r--r--meta/packages/clutter/clutter-gtk.inc13
-rw-r--r--meta/packages/clutter/clutter-helix.inc15
-rw-r--r--meta/packages/clutter/clutter-helix_git.bb8
-rw-r--r--meta/packages/clutter/clutter-mozembed.inc14
-rw-r--r--meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch13
-rw-r--r--meta/packages/clutter/clutter-mozembed/link-with-g++.patch13
-rw-r--r--meta/packages/clutter/clutter-mozembed_git.bb14
-rw-r--r--meta/packages/clutter/clutter-package.inc2
-rw-r--r--meta/packages/clutter/clutter.inc57
-rw-r--r--meta/packages/clutter/clutter/build-fix.patch16
-rw-r--r--meta/packages/clutter/clutter/enable_tests-0.6.patch40
-rw-r--r--meta/packages/clutter/clutter/enable_tests-0.8.patch50
-rw-r--r--meta/packages/clutter/clutter/enable_tests-1.0.patch32
-rw-r--r--meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch32
-rw-r--r--meta/packages/clutter/clutter/enable_tests.patch32
-rw-r--r--meta/packages/clutter/clutter/symconflict.patch31
-rw-r--r--meta/packages/clutter/clutter_git.bb17
-rw-r--r--meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch44
-rw-r--r--meta/packages/clutter/moblin-proto/fix.patch22
-rw-r--r--meta/packages/clutter/moblin-proto/paths.patch15
-rw-r--r--meta/packages/clutter/moblin-proto_git.bb19
-rw-r--r--meta/packages/clutter/table.inc13
-rw-r--r--meta/packages/clutter/table/fixes.patch14
-rw-r--r--meta/packages/clutter/table_git.bb11
-rw-r--r--meta/packages/clutter/tidy.inc20
-rw-r--r--meta/packages/clutter/tidy/autofoo.patch11
-rw-r--r--meta/packages/clutter/tidy/tidy-enable-tests.patch20
-rw-r--r--meta/packages/clutter/tidy_git.bb10
53 files changed, 0 insertions, 948 deletions
diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc
deleted file mode 100644
index afbc022cdb..0000000000
--- a/meta/packages/clutter/aaina.inc
+++ /dev/null
@@ -1,7 +0,0 @@
1DESCRIPTION = "Aaina Clutter Demo"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "GPL"
4
5DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
6
7inherit autotools pkgconfig
diff --git a/meta/packages/clutter/aaina_git.bb b/meta/packages/clutter/aaina_git.bb
deleted file mode 100644
index a348cd3d4d..0000000000
--- a/meta/packages/clutter/aaina_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require aaina.inc
2
3PV = "0.3.0+git${SRCPV}"
4
5SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git"
6
7S = "${WORKDIR}/git/aaina"
diff --git a/meta/packages/clutter/clutter-0.6_git.bb b/meta/packages/clutter/clutter-0.6_git.bb
deleted file mode 100644
index 5a8ccec164..0000000000
--- a/meta/packages/clutter/clutter-0.6_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require clutter.inc
2
3PV = "0.6.0+gitr${SRCPV}"
4PR = "r5"
5
6PACKAGES =+ "clutter-examples-0.6"
7FILES_clutter-examples-0.6 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8
9
10SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \
11 file://symconflict.patch;patch=1 \
12 file://enable_tests-0.6.patch;patch=1 "
13
14S = "${WORKDIR}/git"
15
diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb
deleted file mode 100644
index 71e6198030..0000000000
--- a/meta/packages/clutter/clutter-0.8_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require clutter.inc
2
3PV = "0.8.0+gitr${SRCREV}"
4PR = "r2"
5
6PACKAGES =+ "clutter-examples-0.8"
7FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8
9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \
10 file://enable_tests-0.8.patch;patch=1 \
11 file://build-fix.patch;patch=1"
12
13S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb
deleted file mode 100644
index 7e62954ee5..0000000000
--- a/meta/packages/clutter/clutter-1.0_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require clutter.inc
2
3PV = "1.0+git${SRCPV}"
4PR = "r3"
5
6PACKAGES =+ "clutter-examples-1.0"
7FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8
9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
10 file://enable_tests-1.0.patch;patch=1 "
11
12S = "${WORKDIR}/git"
13
14BASE_CONF += "--disable-introspection"
15
16
17do_configure_prepend () {
18 # Disable DOLT
19 sed -i -e 's/^DOLT//' ${S}/configure.ac
20}
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc
deleted file mode 100644
index 1a107c3993..0000000000
--- a/meta/packages/clutter/clutter-box2d.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Clutter Box2D"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "GPLv2"
4
5DEPENDS = "clutter-0.8"
6
7# The main clutter lib is machine specific so we need to be too
8PACKAGE_ARCH = "${MACHINE_ARCH}"
9
10inherit autotools pkgconfig gtk-doc
11
12do_install_append () {
13 install -d ${D}${bindir}
14 install ${S}/examples/.libs/blockbox ${D}${bindir}
15}
diff --git a/meta/packages/clutter/clutter-box2d_git.bb b/meta/packages/clutter/clutter-box2d_git.bb
deleted file mode 100644
index 4c74ffeb44..0000000000
--- a/meta/packages/clutter/clutter-box2d_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require clutter-box2d.inc
2
3PV = "0.0+git${SRCPV}"
4PR = "r3"
5
6SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
7
8S = "${WORKDIR}/git"
9
10
diff --git a/meta/packages/clutter/clutter-cairo-0.6_git.bb b/meta/packages/clutter/clutter-cairo-0.6_git.bb
deleted file mode 100644
index 3b7f6a9be5..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.6_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require clutter-cairo.inc
2
3PV = "0.6.0+git${SRCREV}"
4PR = "r1"
5
6DEPENDS += "clutter-0.6"
7
8SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-6 \
9 file://enable_examples-0.6.patch;patch=1"
10
11S = "${WORKDIR}/git"
12
13
diff --git a/meta/packages/clutter/clutter-cairo-0.8_git.bb b/meta/packages/clutter/clutter-cairo-0.8_git.bb
deleted file mode 100644
index cb8482b742..0000000000
--- a/meta/packages/clutter/clutter-cairo-0.8_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require clutter-cairo.inc
2
3PV = "0.8.0+git${SRCPV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-8 \
8 file://enable_examples.patch;patch=1"
9
10S = "${WORKDIR}/git"
11
12
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc
deleted file mode 100644
index ff889899e7..0000000000
--- a/meta/packages/clutter/clutter-cairo.inc
+++ /dev/null
@@ -1,13 +0,0 @@
1DESCRIPTION = "Clutter Cairo"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "cairo"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
8
9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
11
12inherit autotools pkgconfig
13
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch b/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
deleted file mode 100644
index 3baea4c5c9..0000000000
--- a/meta/packages/clutter/clutter-cairo/enable_examples-0.6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Index: clutter-cairo-0-6/examples/Makefile.am
2===================================================================
3--- clutter-cairo-0-6.orig/examples/Makefile.am 2008-10-02 22:03:18.000000000 +0100
4+++ clutter-cairo-0-6/examples/Makefile.am 2008-10-02 22:03:31.000000000 +0100
5@@ -1,4 +1,4 @@
6-noinst_PROGRAMS = clock flowers
7+bin_PROGRAMS = clock flowers
8
9 INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
10 AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la
11Index: clutter-cairo-0-6/examples/flowers.c
12===================================================================
13--- clutter-cairo-0-6.orig/examples/flowers.c 2008-10-02 22:03:23.000000000 +0100
14+++ clutter-cairo-0-6/examples/flowers.c 2008-10-02 22:03:39.000000000 +0100
15@@ -11,7 +11,7 @@
16
17 #define PETAL_MIN 20
18 #define PETAL_VAR 40
19-#define N_FLOWERS 40 /* reduce if you have a small card */
20+#define N_FLOWERS 8 /* reduce if you have a small card */
21
22 typedef struct Flower
23 {
diff --git a/meta/packages/clutter/clutter-cairo/enable_examples.patch b/meta/packages/clutter/clutter-cairo/enable_examples.patch
deleted file mode 100644
index c5ed63ff12..0000000000
--- a/meta/packages/clutter/clutter-cairo/enable_examples.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1---
2 examples/Makefile.am | 2 +-
3 examples/flowers.c | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6Index: clutter-cairo/examples/Makefile.am
7===================================================================
8--- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100
9+++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100
10@@ -1,4 +1,4 @@
11-noinst_PROGRAMS = clock flowers bubbles
12+bin_PROGRAMS = clock flowers bubbles
13
14 INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
15 AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la
16Index: clutter-cairo/examples/flowers.c
17===================================================================
18--- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100
19+++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100
20@@ -11,7 +11,7 @@
21
22 #define PETAL_MIN 20
23 #define PETAL_VAR 40
24-#define N_FLOWERS 40 /* reduce if you have a small card */
25+#define N_FLOWERS 8 /* reduce if you have a small card */
26
27 typedef struct Flower
28 {
diff --git a/meta/packages/clutter/clutter-fpu.inc b/meta/packages/clutter/clutter-fpu.inc
deleted file mode 100644
index 21a16feac2..0000000000
--- a/meta/packages/clutter/clutter-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1
2def get_clutter_fpu_setting(bb, d):
3 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
4 return "--without-fpu"
5 return ""
6
diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/packages/clutter/clutter-gst-0.10_git.bb
deleted file mode 100644
index a0f874db25..0000000000
--- a/meta/packages/clutter/clutter-gst-0.10_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.10.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst-0.6_git.bb b/meta/packages/clutter/clutter-gst-0.6_git.bb
deleted file mode 100644
index 09979f9e0c..0000000000
--- a/meta/packages/clutter/clutter-gst-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.6.0+git${SRCPV}"
4
5DEPENDS += "clutter-0.6"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-6"
8
9S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gst-0.8_git.bb b/meta/packages/clutter/clutter-gst-0.8_git.bb
deleted file mode 100644
index c5348ecefe..0000000000
--- a/meta/packages/clutter/clutter-gst-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.8.0+git${SRCPV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-8"
8
9S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/packages/clutter/clutter-gst-1.0_git.bb
deleted file mode 100644
index 5580596f09..0000000000
--- a/meta/packages/clutter/clutter-gst-1.0_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require clutter-gst.inc
2
3PV = "0.11.0+git${SRCPV}"
4
5DEPENDS += "clutter-1.0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
8
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 # Disable DOLT
13 sed -i -e 's/^DOLT//' ${S}/configure.ac
14}
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc
deleted file mode 100644
index 0a2f261531..0000000000
--- a/meta/packages/clutter/clutter-gst.inc
+++ /dev/null
@@ -1,13 +0,0 @@
1DESCRIPTION = "Clutter GStreamer"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "clutter-1.0 gstreamer gst-plugins-base"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-gst"
8
9PACKAGES =+ "${PN}-examples"
10FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
11
12inherit autotools pkgconfig gtk-doc
13
diff --git a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch b/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
deleted file mode 100644
index 54df63d297..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo-0.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
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/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
deleted file mode 100644
index 569b0d8be9..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
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
16Index: clutter-gst/doc/reference/Makefile.am
17===================================================================
18--- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
19+++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000
20@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
21
22 # Other files to distribute
23 # e.g. EXTRA_DIST += version.xml.in
24-EXTRA_DIST += version.xml.in
25+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gst/autofoo.patch b/meta/packages/clutter/clutter-gst/autofoo.patch
deleted file mode 100644
index ad77d636c1..0000000000
--- a/meta/packages/clutter/clutter-gst/autofoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1---
2 doc/reference/Makefile.am | 2 +-
3 examples/Makefile.am | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6Index: git/examples/Makefile.am
7===================================================================
8--- git.orig/examples/Makefile.am 2009-06-30 16:41:53.000000000 +0100
9+++ git/examples/Makefile.am 2009-06-30 16:43:00.000000000 +0100
10@@ -1,6 +1,6 @@
11 NULL = #
12
13-noinst_PROGRAMS = video-player video-sink audio-player
14+bin_PROGRAMS = video-player video-sink audio-player
15
16 INCLUDES = -I$(top_srcdir) \
17 $(MAINTAINER_CFLAGS) \
18Index: git/doc/reference/Makefile.am
19===================================================================
20--- git.orig/doc/reference/Makefile.am 2009-06-30 16:41:53.000000000 +0100
21+++ git/doc/reference/Makefile.am 2009-06-30 16:41:53.000000000 +0100
22@@ -77,4 +77,4 @@
23
24 # Other files to distribute
25 # e.g. EXTRA_DIST += version.xml.in
26-EXTRA_DIST += version.xml.in
27+EXTRA_DIST = version.xml.in
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/packages/clutter/clutter-gtk-0.10_git.bb
deleted file mode 100644
index d0613277a7..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.10_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require clutter-gtk.inc
2
3PV = "0.10.3+git${SRCPV}"
4PR = "r1"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
7
8S = "${WORKDIR}/git"
9
10DEPENDS += "clutter-1.0"
11
12EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk-0.6_git.bb b/meta/packages/clutter/clutter-gtk-0.6_git.bb
deleted file mode 100644
index d2633ff2d4..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.6_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gtk.inc
2
3PV = "0.6.0+git${SRCPV}"
4
5DEPENDS += "clutter-0.6"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6"
8
9S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gtk-0.8_git.bb b/meta/packages/clutter/clutter-gtk-0.8_git.bb
deleted file mode 100644
index 506d3fb156..0000000000
--- a/meta/packages/clutter/clutter-gtk-0.8_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require clutter-gtk.inc
2
3PV = "0.8.0+git${SRCPV}"
4
5DEPENDS += "clutter-0.8"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8"
8
9S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-gtk-1.0_git.bb b/meta/packages/clutter/clutter-gtk-1.0_git.bb
deleted file mode 100644
index dfabbd56cc..0000000000
--- a/meta/packages/clutter/clutter-gtk-1.0_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require clutter-gtk.inc
2
3PV = "0.90.0+git${SRCPV}"
4PR = "r1"
5
6SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
7
8S = "${WORKDIR}/git"
9
10DEPENDS += "clutter-1.0"
11
12EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc
deleted file mode 100644
index 89ae3e53ca..0000000000
--- a/meta/packages/clutter/clutter-gtk.inc
+++ /dev/null
@@ -1,13 +0,0 @@
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
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc
deleted file mode 100644
index 6bbbb244d7..0000000000
--- a/meta/packages/clutter/clutter-helix.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DESCRIPTION = "Clutter Helix"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "helix-libs"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-helix"
8
9COMPATIBLE_HOST = '(x86_64|i.86.*)-linux'
10
11PACKAGES =+ "${PN}-examples"
12FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
13
14inherit autotools pkgconfig gtk-doc
15
diff --git a/meta/packages/clutter/clutter-helix_git.bb b/meta/packages/clutter/clutter-helix_git.bb
deleted file mode 100644
index 1c272306bf..0000000000
--- a/meta/packages/clutter/clutter-helix_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require clutter-helix.inc
2
3PV = "0.8.0+git${SRCPV}"
4PR = "r0"
5
6SRC_URI = "git://git.clutter-project.org/clutter-helix.git;protocol=git"
7
8S = "${WORKDIR}/git"
diff --git a/meta/packages/clutter/clutter-mozembed.inc b/meta/packages/clutter/clutter-mozembed.inc
deleted file mode 100644
index 72c9412d04..0000000000
--- a/meta/packages/clutter/clutter-mozembed.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Clutter Mozilla Embedded"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "mozilla-headless mozilla-headless-services clutter-1.0"
6
7FILESPATH = "${FILE_DIRNAME}/clutter-mozembed"
8
9FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/"
10
11EXTRA_OECONF = "--enable-plugins"
12
13inherit autotools pkgconfig gtk-doc
14
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
deleted file mode 100644
index 135b9e79f0..0000000000
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: git/cluttermozembed/Makefile.am
2===================================================================
3--- git.orig/cluttermozembed/Makefile.am 2009-06-10 15:04:54.000000000 +0100
4+++ git/cluttermozembed/Makefile.am 2009-06-10 15:10:12.000000000 +0100
5@@ -61,7 +61,7 @@
6 clutter-mozembed-private.h
7 source_c = \
8 clutter-mozembed.c \
9- clutter-mozembed-download.c
10+ clutter-mozembed-download.c dummy.cpp
11
12 bin_PROGRAMS = clutter-mozheadless
13
diff --git a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch b/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
deleted file mode 100644
index cc9d43a674..0000000000
--- a/meta/packages/clutter/clutter-mozembed/link-with-g++.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: git/cluttermozembed/Makefile.am
2===================================================================
3--- git.orig/clutter-mozembed/Makefile.am 2009-07-24 16:58:24.000000000 +0100
4+++ git/clutter-mozembed/Makefile.am 2009-07-24 17:00:53.000000000 +0100
5@@ -66,7 +66,7 @@
6 clutter-mozembed.c \
7 clutter-mozembed-comms.c \
8 clutter-mozembed-comms.h \
9- clutter-mozembed-download.c
10+ clutter-mozembed-download.c dummy.cpp
11
12 bin_PROGRAMS = clutter-mozheadless
13
diff --git a/meta/packages/clutter/clutter-mozembed_git.bb b/meta/packages/clutter/clutter-mozembed_git.bb
deleted file mode 100644
index e2da2d6a7d..0000000000
--- a/meta/packages/clutter/clutter-mozembed_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require clutter-mozembed.inc
2
3PV = "0.8.0+git${SRCPV}"
4PR = "r7"
5
6SRC_URI = "git://git.clutter-project.org/clutter-mozembed.git;protocol=git \
7 file://link-with-g++-da7632f3e2c8d1a70ab01cc7adb63760d8718b41.patch;patch=1;rev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41 \
8 file://link-with-g++.patch;patch=1;notrev=da7632f3e2c8d1a70ab01cc7adb63760d8718b41"
9S = "${WORKDIR}/git"
10
11do_configure_prepend () {
12 touch ${S}/clutter-mozembed/dummy.cpp
13 touch ${S}/clutter-mozembed/dummy2.cpp
14}
diff --git a/meta/packages/clutter/clutter-package.inc b/meta/packages/clutter/clutter-package.inc
deleted file mode 100644
index 22993ffd01..0000000000
--- a/meta/packages/clutter/clutter-package.inc
+++ /dev/null
@@ -1,2 +0,0 @@
1PACKAGES =+ "clutter-examples"
2FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
deleted file mode 100644
index c099309bbb..0000000000
--- a/meta/packages/clutter/clutter.inc
+++ /dev/null
@@ -1,57 +0,0 @@
1DESCRIPTION = "Clutter graphics library"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|netbook|menlow)"
6
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
9
10DEPENDS = "${STDDEPENDS} virtual/libgl"
11EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
12
13DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
14EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
15PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
16LDFLAGS_append_zylonite = " -lnws -lstdc++ "
17
18DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib"
19EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative"
20PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}"
21LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ "
22
23DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib"
24# The eglx drivers are pretty dire, use eglnative
25EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglnative"
26PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
27
28DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib"
29# The eglx drivers are pretty dire, use eglnative
30EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglnative"
31PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
32
33DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
34EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
35PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
36LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
37
38DEPENDS_netbook = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
39EXTRA_OECONF_netbook = "${BASE_CONF} --with-flavour=glx"
40PACKAGE_ARCH_netbook = "${MACHINE_ARCH}"
41
42DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
43EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx"
44PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
45
46FILESPATH = "${FILE_DIRNAME}/clutter"
47
48inherit autotools pkgconfig gtk-doc
49
50#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
51require clutter-fpu.inc
52
53#Fix up some weirdness in the docs
54do_configure_prepend() {
55 sed -i s:doc/reference/Makefile::g ${S}/configure.ac
56 sed -i s:doc::g ${S}/Makefile.am
57}
diff --git a/meta/packages/clutter/clutter/build-fix.patch b/meta/packages/clutter/clutter/build-fix.patch
deleted file mode 100644
index 68cf84ec22..0000000000
--- a/meta/packages/clutter/clutter/build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Installing the same file twice causes an error in Automake 1.11
2
3JL 19/03/10
4
5Index: git/clutter/Makefile.am
6===================================================================
7--- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
8+++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000
9@@ -219,7 +219,6 @@
10 $(source_h) \
11 clutter-json.h \
12 clutter-enum-types.h \
13- clutter-version.h \
14 clutter.h
15
16 DISTCLEANFILES = \
diff --git a/meta/packages/clutter/clutter/enable_tests-0.6.patch b/meta/packages/clutter/clutter/enable_tests-0.6.patch
deleted file mode 100644
index 544a7e588c..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-0.6.patch
+++ /dev/null
@@ -1,40 +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-6/tests/Makefile.am
8===================================================================
9--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
10+++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.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 test-score test-script
17@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c
18 test_score_SOURCES = test-score.c
19 test_script_SOURCES = test-script.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 test-script.json
27Index: clutter-0-6/tests/test-actors.c
28===================================================================
29--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000
30+++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.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");
40
diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/packages/clutter/clutter/enable_tests-0.8.patch
deleted file mode 100644
index 4f449b1177..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-0.8.patch
+++ /dev/null
@@ -1,50 +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/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/enable_tests-1.0.patch b/meta/packages/clutter/clutter/enable_tests-1.0.patch
deleted file mode 100644
index 953edf6bbc..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-1.0.patch
+++ /dev/null
@@ -1,32 +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: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
11@@ -77,7 +77,7 @@
12 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
13 AM_LDFLAGS = $(CLUTTER_LIBS)
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = \
19 test-main.c \
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
24@@ -182,7 +182,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
29+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
30 if (real_hand == NULL)
31 {
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
deleted file mode 100644
index 953edf6bbc..0000000000
--- a/meta/packages/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ /dev/null
@@ -1,32 +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: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
11@@ -77,7 +77,7 @@
12 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
13 AM_LDFLAGS = $(CLUTTER_LIBS)
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = \
19 test-main.c \
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
24@@ -182,7 +182,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
29+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
30 if (real_hand == NULL)
31 {
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/enable_tests.patch b/meta/packages/clutter/clutter/enable_tests.patch
deleted file mode 100644
index f4af7c94f6..0000000000
--- a/meta/packages/clutter/clutter/enable_tests.patch
+++ /dev/null
@@ -1,32 +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: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
11@@ -88,7 +88,7 @@
12
13 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
19 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
24@@ -178,7 +178,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
29+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
30 real_hand = clutter_texture_new_from_file (file, &error);
31 if (real_hand == NULL)
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/packages/clutter/clutter/symconflict.patch b/meta/packages/clutter/clutter/symconflict.patch
deleted file mode 100644
index 7685c21161..0000000000
--- a/meta/packages/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Index: git/tests/test-depth.c
2===================================================================
3--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
4+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
5@@ -11,13 +11,13 @@
6 clutter_timeline_start (timeline);
7 }
8
9-static ClutterActor *raise[2];
10+static ClutterActor *clutterraise[2];
11 static gboolean raise_no = 0;
12
13 static gboolean
14 raise_top (gpointer ignored)
15 {
16- clutter_actor_raise_top (raise[raise_no]);
17+ clutter_actor_raise_top (clutterraise[raise_no]);
18 raise_no = !raise_no;
19 return TRUE;
20 }
21@@ -202,8 +202,8 @@
22
23 clutter_timeline_start (timeline);
24
25- raise[0] = rect;
26- raise[1] = hand;
27+ clutterraise[0] = rect;
28+ clutterraise[1] = hand;
29 g_timeout_add (2000, raise_top, NULL);
30
31 clutter_main ();
diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb
deleted file mode 100644
index a20515ec5e..0000000000
--- a/meta/packages/clutter/clutter_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require clutter.inc
2require clutter-package.inc
3
4PV = "1.0.0+git${SRCPV}"
5PR = "r8"
6
7SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
8 file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
9 file://enable_tests.patch;patch=1;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
10S = "${WORKDIR}/git"
11
12BASE_CONF += "--disable-introspection"
13
14do_configure_prepend () {
15 # Disable DOLT
16 sed -i -e 's/^DOLT//' ${S}/configure.ac
17} \ No newline at end of file
diff --git a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch b/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch
deleted file mode 100644
index 4a3eddb8cd..0000000000
--- a/meta/packages/clutter/moblin-proto/fix-shader-and-callbacks.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1diff --git a/Makefile b/Makefile
2index e05b5b7..c348a1e 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -64,7 +64,7 @@ HFILES = $(wildcard *.h)
6 %.o: %.c $(HFILES)
7 $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
8 $(BINARY): $(OBJECTS)
9- $(CXX) -o $@ $(OBJECTS) $(LIBS)
10+ $(CXX) -rdynamic -o $@ $(OBJECTS) $(LIBS)
11
12 #$(BINARY): $(CFILES)
13 # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
14diff --git a/moblin-desktop.c b/moblin-desktop.c
15index 6dd4f2c..fb9d231 100644
16--- a/moblin-desktop.c
17+++ b/moblin-desktop.c
18@@ -103,6 +103,8 @@ void moblin_blur (void)
19 if (desktop->maincopy)
20 return;
21
22+ if (clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
23+ {
24 #if 0
25 desktop->maincopy = clutter_texture_new_from_actor (desktop->mainstuff);
26 #else
27@@ -158,6 +160,17 @@ void moblin_blur (void)
28 1.0f / moblin_desktop_width ());
29 }
30 clutter_actor_set_shader_param (desktop->maincopy, "radius", 3.0);
31+ }
32+ else
33+ {
34+ ClutterColor clr= { 0x44, 0x44, 0x44, 0x77 };
35+ guint w, h;
36+
37+ desktop->maincopy = clutter_rectangle_new_with_color (&clr);
38+ clutter_actor_get_size (desktop->mainstuff, &w, &h);
39+ clutter_actor_set_size (desktop->maincopy, w, h);
40+ clutter_group_add (desktop->copyholder, desktop->maincopy);
41+ }
42 }
43
44 void moblin_unblur (void)
diff --git a/meta/packages/clutter/moblin-proto/fix.patch b/meta/packages/clutter/moblin-proto/fix.patch
deleted file mode 100644
index 8bde67762c..0000000000
--- a/meta/packages/clutter/moblin-proto/fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Index: git/Makefile
2===================================================================
3--- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100
4+++ git/Makefile 2008-08-12 12:16:52.000000000 +0100
5@@ -15,7 +15,7 @@
6
7 SCP_DESTINATION=pug.vpn:tmp
8
9-BINARY=$(shell basename `pwd`)#
10+BINARY=moblin-proto
11 PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here
12
13 #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d
14@@ -61,7 +61,7 @@
15 %.o: %.c $(HFILES)
16 $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
17 $(BINARY): $(OBJECTS)
18- $(CC) -o $@ $(OBJECTS) $(LIBS)
19+ $(CXX) -o $@ $(OBJECTS) $(LIBS)
20
21 #$(BINARY): $(CFILES)
22 # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
diff --git a/meta/packages/clutter/moblin-proto/paths.patch b/meta/packages/clutter/moblin-proto/paths.patch
deleted file mode 100644
index d241c8ff71..0000000000
--- a/meta/packages/clutter/moblin-proto/paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1diff --git a/moblin-desktop.h b/moblin-desktop.h
2index 880a9ad..3d51a14 100644
3--- a/moblin-desktop.h
4+++ b/moblin-desktop.h
5@@ -29,8 +29,8 @@
6 #define __MAIN_H__
7
8
9-#define ASSET_ROOT "./assets/"
10-#define JSON_ROOT "./layouts/"
11+#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
12+#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
13
14 typedef struct
15 {
diff --git a/meta/packages/clutter/moblin-proto_git.bb b/meta/packages/clutter/moblin-proto_git.bb
deleted file mode 100644
index b86d622385..0000000000
--- a/meta/packages/clutter/moblin-proto_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1DEPENDS = "clutter-box2d"
2
3PV = "0.0+git${SRCPV}"
4PR = "r2"
5
6SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
7 file://paths.patch;patch=1 \
8 file://fix-shader-and-callbacks.patch;patch=1"
9
10S = "${WORKDIR}/git"
11
12do_install () {
13 install -d ${D}${bindir}
14 install ${S}/moblin-proto ${D}${bindir}
15
16 install -d ${D}${datadir}/moblin-proto/
17 cp -a ${S}/assets ${D}${datadir}/moblin-proto/
18 cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
19}
diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc
deleted file mode 100644
index dc949172b5..0000000000
--- a/meta/packages/clutter/table.inc
+++ /dev/null
@@ -1,13 +0,0 @@
1DESCRIPTION = "Table Clutter Demo"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5DEPENDS = "clutter-gst-0.6 gnome-vfs"
6
7inherit autotools pkgconfig
8
9do_install() {
10 install -d ${D}${bindir}
11 install -m 0755 ${S}/table ${D}${bindir}/table
12}
13
diff --git a/meta/packages/clutter/table/fixes.patch b/meta/packages/clutter/table/fixes.patch
deleted file mode 100644
index a7cdc43713..0000000000
--- a/meta/packages/clutter/table/fixes.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: table/Makefile
2===================================================================
3--- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100
4+++ table/Makefile 2007-07-10 13:28:10.000000000 +0100
5@@ -8,7 +8,7 @@ all: table
6
7
8 table: table.o clutter-dominatrix.o clutter-video-player.o
9- $(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
10+ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
11
12 clean:
13 rm -fr *.o table
14\ No newline at end of file
diff --git a/meta/packages/clutter/table_git.bb b/meta/packages/clutter/table_git.bb
deleted file mode 100644
index 5aa4153c1a..0000000000
--- a/meta/packages/clutter/table_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require table.inc
2
3PV = "0.3.0+git${SRCPV}"
4PR = "r1"
5
6SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git \
7 file://fixes.patch;patch=1"
8
9S = "${WORKDIR}/git/table"
10
11
diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc
deleted file mode 100644
index 3fa387c049..0000000000
--- a/meta/packages/clutter/tidy.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Tidy library"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL"
4
5STDDEPENDS = "clutter-0.8"
6BASE_CONF = "--disable-gtk-doc"
7
8DEPENDS = "${STDDEPENDS}"
9EXTRA_OECONF = "${BASE_CONF}"
10
11inherit autotools pkgconfig
12
13PACKAGES =+ "tidy-examples"
14FILES_tidy-examples = "${bindir}/test-*"
15
16do_configure_prepend() {
17 touch ${S}/gtk-doc.make
18 sed -i s:docs/reference/Makefile::g ${S}/configure.ac
19 sed -i s:docs::g ${S}/Makefile.am
20}
diff --git a/meta/packages/clutter/tidy/autofoo.patch b/meta/packages/clutter/tidy/autofoo.patch
deleted file mode 100644
index 7f54a3372a..0000000000
--- a/meta/packages/clutter/tidy/autofoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
1Index: tidy/doc/reference/Makefile.am
2===================================================================
3--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
4+++ tidy/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000
5@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
6
7 # Other files to distribute
8 # e.g. EXTRA_DIST += version.xml.in
9-EXTRA_DIST += version.xml.in
10+EXTRA_DIST = version.xml.in
11
diff --git a/meta/packages/clutter/tidy/tidy-enable-tests.patch b/meta/packages/clutter/tidy/tidy-enable-tests.patch
deleted file mode 100644
index c5e1660c54..0000000000
--- a/meta/packages/clutter/tidy/tidy-enable-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Index: trunk/tests/Makefile.am
2===================================================================
3--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000
4+++ trunk/tests/Makefile.am 2008-03-04 12:23:46.000000000 +0000
5@@ -1,4 +1,4 @@
6-noinst_PROGRAMS = \
7+bin_PROGRAMS = \
8 test-button \
9 test-finger-scroll \
10 test-list-view \
11@@ -14,6 +14,9 @@
12 test-grow \
13 test-viewport
14
15+test_texture_framedir = $(pkgdatadir)
16+test_texture_frame_DATA = frame.png
17+
18 INCLUDES = -I$(top_srcdir)
19 LDADD = $(top_builddir)/tidy/libtidy-1.0.la
20
diff --git a/meta/packages/clutter/tidy_git.bb b/meta/packages/clutter/tidy_git.bb
deleted file mode 100644
index 178526027e..0000000000
--- a/meta/packages/clutter/tidy_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require tidy.inc
2
3PV = "0.1.0+git${SRCPV}"
4PR = "r7"
5
6SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
7 file://tidy-enable-tests.patch;patch=1"
8
9S = "${WORKDIR}/git"
10
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 02:45:11 +0000