[oe] [PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc
Frans Meulenbroeks
fransmeulenbroeks at gmail.com
Sat Sep 18 11:47:08 UTC 2010
moved COMPATIBLE_MACHINE from clutter.inc to clutter-common.inc
the other recipes all DEPEND on clutter but do not have a COMPATIBLE_MACHINE
defined, but of course do not work for other machines.
This patch moves COMPATIBLE_MACHINE to clutter-common.inc which is
included by all other inc file and so it applies to all
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
---
recipes/clutter/clutter-box2d.inc | 2 +-
recipes/clutter/clutter-common.inc | 2 ++
recipes/clutter/clutter-gst.inc | 2 +-
recipes/clutter/clutter-gtk.inc | 2 +-
recipes/clutter/clutter.inc | 4 +---
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes/clutter/clutter-box2d.inc b/recipes/clutter/clutter-box2d.inc
index 7541335..e187adf 100644
--- a/recipes/clutter/clutter-box2d.inc
+++ b/recipes/clutter/clutter-box2d.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1"
DEPENDS = "clutter"
-INC_PR = "r1"
+INC_PR = "r2"
# The main clutter lib is machine specific so we need to be too
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/clutter/clutter-common.inc b/recipes/clutter/clutter-common.inc
index 65b490a..e681bf6 100644
--- a/recipes/clutter/clutter-common.inc
+++ b/recipes/clutter/clutter-common.inc
@@ -1,3 +1,5 @@
+COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm37x-evm|am37x-evm|beagleboard|overo|omap3evm|omap5912osk)"
+
# common functions for all clutter-libraries
# all .debug stuff goes to clutter*-dbg
diff --git a/recipes/clutter/clutter-gst.inc b/recipes/clutter/clutter-gst.inc
index b25f31e..d5cbcda 100644
--- a/recipes/clutter/clutter-gst.inc
+++ b/recipes/clutter/clutter-gst.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer integration library"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1"
-INC_PR = "r1"
+INC_PR = "r2"
DEPENDS = "clutter gstreamer gst-plugins-base"
diff --git a/recipes/clutter/clutter-gtk.inc b/recipes/clutter/clutter-gtk.inc
index 6e624c5..d00babb 100644
--- a/recipes/clutter/clutter-gtk.inc
+++ b/recipes/clutter/clutter-gtk.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GTK+ integration library"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1"
-INC_PR = "r1"
+INC_PR = "r2"
DEPENDS = "gtk+ clutter"
require clutter-common.inc
diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
index e29164f..5987aa6 100644
--- a/recipes/clutter/clutter.inc
+++ b/recipes/clutter/clutter.inc
@@ -8,8 +8,6 @@ INC_SRC_URI = "file://sample.desktop \
PARALLEL_MAKE = ""
-COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qemuarm|qemux86|ipodtouch|am3517-evm|dm37x-evm|am37x-evm|beagleboard|overo|omap3evm|omap5912osk)"
-
STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)} --enable-conformance "
@@ -43,7 +41,7 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
-INC_PR = "r2"
+INC_PR = "r3"
inherit autotools pkgconfig gtk-doc
--
1.6.4.2
More information about the Openembedded-devel
mailing list