From cfe12efb5ec9586dab6961f141d52b103bd8b1d1 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 22 Nov 2010 13:57:13 +0000 Subject: Meta: Recipe Reogranization This is the next stage of recipe reorganization, in this stage many recipes where moved to a new meta-demoapps layer since this is more appropriate for demo usage then the core. Additional some recipes were moved to meta-extras to indicate they may be depercated at a future time. A number of recipes were modified since dependencies need to be corrected. Signed-off-by: Saul Wold --- meta/recipes-graphics/clutter/aaina.inc | 7 ------- meta/recipes-graphics/clutter/aaina_git.bb | 7 ------- meta/recipes-graphics/clutter/clutter-0.6_git.bb | 15 --------------- meta/recipes-graphics/clutter/clutter-0.8_git.bb | 13 ------------- meta/recipes-graphics/clutter/clutter-box2d.inc | 2 +- meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb | 13 ------------- meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb | 12 ------------ meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb | 14 -------------- meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb | 9 --------- meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb | 9 --------- meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb | 12 ------------ meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb | 9 --------- meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb | 9 --------- meta/recipes-graphics/clutter/table/fixes.patch | 14 -------------- meta/recipes-graphics/clutter/tidy.inc | 2 +- 15 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/aaina.inc delete mode 100644 meta/recipes-graphics/clutter/aaina_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-0.6_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-0.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/table/fixes.patch (limited to 'meta/recipes-graphics/clutter') diff --git a/meta/recipes-graphics/clutter/aaina.inc b/meta/recipes-graphics/clutter/aaina.inc deleted file mode 100644 index afbc022cd..000000000 --- a/meta/recipes-graphics/clutter/aaina.inc +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Aaina Clutter Demo" -HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "GPL" - -DEPENDS = "clutter-0.6 libxml2 gtk+ neon" - -inherit autotools pkgconfig diff --git a/meta/recipes-graphics/clutter/aaina_git.bb b/meta/recipes-graphics/clutter/aaina_git.bb deleted file mode 100644 index a348cd3d4..000000000 --- a/meta/recipes-graphics/clutter/aaina_git.bb +++ /dev/null @@ -1,7 +0,0 @@ -require aaina.inc - -PV = "0.3.0+git${SRCPV}" - -SRC_URI = "git://git.clutter-project.org/toys.git;protocol=git" - -S = "${WORKDIR}/git/aaina" diff --git a/meta/recipes-graphics/clutter/clutter-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-0.6_git.bb deleted file mode 100644 index 5a8ccec16..000000000 --- a/meta/recipes-graphics/clutter/clutter-0.6_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -require clutter.inc - -PV = "0.6.0+gitr${SRCPV}" -PR = "r5" - -PACKAGES =+ "clutter-examples-0.6" -FILES_clutter-examples-0.6 = "${bindir}/test-* ${pkgdatadir}/redhand.png" - - -SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-6 \ - file://symconflict.patch;patch=1 \ - file://enable_tests-0.6.patch;patch=1 " - -S = "${WORKDIR}/git" - diff --git a/meta/recipes-graphics/clutter/clutter-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-0.8_git.bb deleted file mode 100644 index 71e619803..000000000 --- a/meta/recipes-graphics/clutter/clutter-0.8_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require clutter.inc - -PV = "0.8.0+gitr${SRCREV}" -PR = "r2" - -PACKAGES =+ "clutter-examples-0.8" -FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png" - -SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \ - file://enable_tests-0.8.patch;patch=1 \ - file://build-fix.patch;patch=1" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc index 1a107c399..08861958c 100644 --- a/meta/recipes-graphics/clutter/clutter-box2d.inc +++ b/meta/recipes-graphics/clutter/clutter-box2d.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "GPLv2" -DEPENDS = "clutter-0.8" +DEPENDS = "clutter-1.0" # The main clutter lib is machine specific so we need to be too PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb deleted file mode 100644 index 3b7f6a9be..000000000 --- a/meta/recipes-graphics/clutter/clutter-cairo-0.6_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require clutter-cairo.inc - -PV = "0.6.0+git${SRCREV}" -PR = "r1" - -DEPENDS += "clutter-0.6" - -SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-6 \ - file://enable_examples-0.6.patch;patch=1" - -S = "${WORKDIR}/git" - - diff --git a/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb deleted file mode 100644 index cb8482b74..000000000 --- a/meta/recipes-graphics/clutter/clutter-cairo-0.8_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require clutter-cairo.inc - -PV = "0.8.0+git${SRCPV}" - -DEPENDS += "clutter-0.8" - -SRC_URI = "git://git.clutter-project.org/clutter-cairo.git;protocol=git;branch=clutter-cairo-0-8 \ - file://enable_examples.patch;patch=1" - -S = "${WORKDIR}/git" - - diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb deleted file mode 100644 index a0f874db2..000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-0.10_git.bb +++ /dev/null @@ -1,14 +0,0 @@ -require clutter-gst.inc - -PV = "0.10.0+git${SRCPV}" - -DEPENDS += "clutter-1.0" - -SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10" - -S = "${WORKDIR}/git" - -do_configure_prepend () { - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac -} diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb deleted file mode 100644 index 09979f9e0..000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-0.6_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gst.inc - -PV = "0.6.0+git${SRCPV}" - -DEPENDS += "clutter-0.6" - -SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-6" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb deleted file mode 100644 index c5348ecef..000000000 --- a/meta/recipes-graphics/clutter/clutter-gst-0.8_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gst.inc - -PV = "0.8.0+git${SRCPV}" - -DEPENDS += "clutter-0.8" - -SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0-8" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb deleted file mode 100644 index d0613277a..000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-0.10_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require clutter-gtk.inc - -PV = "0.10.3+git${SRCPV}" -PR = "r1" - -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10" - -S = "${WORKDIR}/git" - -DEPENDS += "clutter-1.0" - -EXTRA_OECONF += "--disable-introspection" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb deleted file mode 100644 index d2633ff2d..000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-0.6_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gtk.inc - -PV = "0.6.0+git${SRCPV}" - -DEPENDS += "clutter-0.6" - -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb deleted file mode 100644 index 506d3fb15..000000000 --- a/meta/recipes-graphics/clutter/clutter-gtk-0.8_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gtk.inc - -PV = "0.8.0+git${SRCPV}" - -DEPENDS += "clutter-0.8" - -SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8" - -S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/clutter/table/fixes.patch b/meta/recipes-graphics/clutter/table/fixes.patch deleted file mode 100644 index a7cdc4371..000000000 --- a/meta/recipes-graphics/clutter/table/fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: table/Makefile -=================================================================== ---- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100 -+++ table/Makefile 2007-07-10 13:28:10.000000000 +0100 -@@ -8,7 +8,7 @@ all: table - - - table: table.o clutter-dominatrix.o clutter-video-player.o -- $(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) -+ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) - - clean: - rm -fr *.o table -\ No newline at end of file diff --git a/meta/recipes-graphics/clutter/tidy.inc b/meta/recipes-graphics/clutter/tidy.inc index 3fa387c04..7d5862b18 100644 --- a/meta/recipes-graphics/clutter/tidy.inc +++ b/meta/recipes-graphics/clutter/tidy.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -STDDEPENDS = "clutter-0.8" +STDDEPENDS = "clutter-1.0" BASE_CONF = "--disable-gtk-doc" DEPENDS = "${STDDEPENDS}" -- cgit v1.2.3