From 72567733033347b662d9baa07432985fd2da3efa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 21 Apr 2011 14:32:45 +0100 Subject: Remove machine-specific metadata for machines no longer in oe-core Signed-off-by: Paul Eggleton --- meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb | 2 +- .../recipes-graphics/clutter/clutter-1.6_1.6.14.bb | 2 +- meta/recipes-graphics/clutter/clutter.inc | 35 ---------------------- meta/recipes-graphics/clutter/clutter_git.bb | 2 +- 4 files changed, 3 insertions(+), 38 deletions(-) (limited to 'meta/recipes-graphics/clutter') 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 998545ab2..b73684603 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 @@ require clutter.inc -PR = "r0" +PR = "r1" PACKAGES =+ "${PN}-examples" FILES_${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 ab9e0e056..938a30ceb 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 @@ require recipes-graphics/clutter/clutter.inc -PR = "r0" +PR = "r1" # Internal json-glib was removed in Clutter 1.5.2 STDDEPENDS += "json-glib" diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc index 2f9a55cab..54f65c535 100644 --- a/meta/recipes-graphics/clutter/clutter.inc +++ b/meta/recipes-graphics/clutter/clutter.inc @@ -2,47 +2,12 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|atom-pc|menlow)" - STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" DEPENDS = "${STDDEPENDS} virtual/libgl" EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" -DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" -EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative" -PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}" -LDFLAGS_append_zylonite = " -lnws -lstdc++ " - -DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib" -EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative" -PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}" -LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ " - -DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib" -# The eglx drivers are pretty dire, use eglnative -EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglnative" -PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" - -DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib" -# The eglx drivers are pretty dire, use eglnative -EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglnative" -PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" - -DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" -EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" -PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" -LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " - -DEPENDS_atom-pc = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" -EXTRA_OECONF_atom-pc = "${BASE_CONF} --with-flavour=glx" -PACKAGE_ARCH_atom-pc = "${MACHINE_ARCH}" - -DEPENDS_menlow = "${STDDEPENDS} virtual/xserver-xf86 virtual/libgl" -EXTRA_OECONF_menlow = "${BASE_CONF} --with-flavour=glx" -PACKAGE_ARCH_menlow = "${MACHINE_ARCH}" - FILESPATH = "${FILE_DIRNAME}/clutter" inherit autotools pkgconfig gtk-doc gettext diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb index 6df48e2e6..cb5f47639 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" SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748" PV = "1.0.0+git${SRCPV}" -PR = "r8" +PR = "r9" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=master \ file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;patch=1;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ -- cgit v1.2.3