summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/clutter')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc35
-rw-r--r--meta/recipes-graphics/clutter/clutter_git.bb2
4 files changed, 3 insertions, 38 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
index 998545ab21..b736846034 100644
--- a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
@@ -1,6 +1,6 @@
1require clutter.inc 1require clutter.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5PACKAGES =+ "${PN}-examples" 5PACKAGES =+ "${PN}-examples"
6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
index ab9e0e0560..938a30ceb1 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
@@ -1,6 +1,6 @@
1require recipes-graphics/clutter/clutter.inc 1require recipes-graphics/clutter/clutter.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5# Internal json-glib was removed in Clutter 1.5.2 5# Internal json-glib was removed in Clutter 1.5.2
6STDDEPENDS += "json-glib" 6STDDEPENDS += "json-glib"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 2f9a55cab5..54f65c5357 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -2,47 +2,12 @@ DESCRIPTION = "Clutter graphics library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4 4
5COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)"
6
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" 5STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 6BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
9 7
10DEPENDS = "${STDDEPENDS} virtual/libgl" 8DEPENDS = "${STDDEPENDS} virtual/libgl"
11EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
12 10
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_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl"
39EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx"
40PACKAGE_ARCH_atom-pc = "${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" 11FILESPATH = "${FILE_DIRNAME}/clutter"
47 12
48inherit autotools pkgconfig gtk-doc gettext 13inherit autotools pkgconfig gtk-doc gettext
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index 6df48e2e69..cb5f47639b 100644
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
5 5
6SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748" 6SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748"
7PV = "1.0.0+git${SRCPV}" 7PV = "1.0.0+git${SRCPV}"
8PR = "r8" 8PR = "r9"
9 9
10SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ 10SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \
11 file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ 11 file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \