summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-13 19:22:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 14:32:44 +0100
commit0d294877fd45a509947fafcb7606737ff253692a (patch)
treebf66adbfef192c57cb35a7afec009de7be8cb758 /meta
parent3fcdbf9fc147250f15a6092ec1aba911f71ac1d7 (diff)
downloadpoky-0d294877fd45a509947fafcb7606737ff253692a.tar.gz
clutter: Clean up old recipes
clutter-1.4 is moved to meta-extras clutter-box2d is migrated to latest 1.6 version (From OE-Core rev: 5b9786fe10a630bfbb344a6a644171fd4457b657) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb25
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d_git.bb4
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch15
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb19
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb18
5 files changed, 2 insertions, 79 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
deleted file mode 100644
index b736846034..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1require clutter.inc
2
3PR = "r1"
4
5PACKAGES =+ "${PN}-examples"
6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
7
8SRC_URI = "http://source.clutter-project.org/sources/clutter/1.4/clutter-${PV}.tar.bz2 \
9 file://enable_tests-1.4.patch;patch=1 \
10 file://test-conformance-fix.patch;patch=1 "
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
13S = "${WORKDIR}/clutter-1.4.2"
14
15BASE_CONF += "--disable-introspection"
16
17EXTRA_OECONF += "--with-json=check"
18
19do_configure_prepend () {
20 # Disable DOLT
21 sed -i -e 's/^DOLT//' ${S}/configure.ac
22}
23
24SRC_URI[md5sum] = "5a3c6d8414d4e286aba0a936f344c9b1"
25SRC_URI[sha256sum] = "92fd67acce5105c933e54ad0c87d0f5ace1202fd0f87949cb49a3759e6e38892"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 76715307af..4c1c0037a2 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -2,7 +2,7 @@ require clutter-box2d.inc
2 2
3LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b" 3LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b"
4 4
5SRCREV = "92b44f79a8667a31b46b861236392bdf32b7d6c2" 5SRCREV = "4799ac10ae8cb7da936a2b999aba58fe62eb1ee3"
6PV = "0.10.1+git${SRCPV}" 6PV = "0.10.1+git${SRCPV}"
7PR = "r0" 7PR = "r0"
8 8
@@ -10,4 +10,4 @@ SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13DEPENDS += "clutter-1.4" 13DEPENDS += "clutter-1.6"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
deleted file mode 100644
index f1f68ac780..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.4/enable_tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Install example binary needed for core-image-clutter
2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4Index: git/examples/Makefile.am
5===================================================================
6--- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700
7+++ git/examples/Makefile.am 2011-05-04 14:24:38.625984314 -0700
8@@ -1,6 +1,6 @@
9 NULL = #
10
11-noinst_PROGRAMS = video-player video-sink audio-player
12+bin_PROGRAMS = video-player video-sink audio-player
13
14 INCLUDES = -I$(top_srcdir) \
15 $(MAINTAINER_CFLAGS) \
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
deleted file mode 100644
index 1ab867da4d..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.4_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1require clutter-gst.inc
2
3SRCREV = "8a087fabc888a6a4a939760c392109dbb610adbf"
4PV = "1.3.4+git${SRCPV}"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
7 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=3275ae5179d58dccf8852cdad3a44574"
8
9DEPENDS += "clutter-1.4"
10
11SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master \
12 file://enable_tests-1.4.patch"
13
14S = "${WORKDIR}/git"
15
16do_configure_prepend () {
17 # Disable DOLT
18 sed -i -e 's/^DOLT//' ${S}/configure.ac
19}
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb
deleted file mode 100644
index 12822c0000..0000000000
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1require clutter-gtk.inc
2
3SRCREV = "b92329c4c1288019e2dea6567e2b5e98eb0a9992"
4PV = "0.90.0+git${SRCPV}"
5PR = "r0"
6
7SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master \
8 file://disable_deprecated.patch \
9 file://enable_tests.patch \
10 "
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
13
14S = "${WORKDIR}/git"
15
16DEPENDS += "clutter-1.4"
17
18EXTRA_OECONF += "--disable-introspection"