[PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[Frans Meulenbroeks]

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@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

Re: [PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[Andreas Mueller]

On Saturday 18 September 2010 01:47:08 pm Frans Meulenbroeks wrote:
> 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
Is there any fallout expected by removing COMPATIBLE_MACHINE? 

All machines not having an explicit DEPENDS / EXTRA_OECONF get virtual/libgl (mesa) as depends and --with-flavour=glx as defaults which should build for all (?).

If there is no damage caused by removing COMPATIBLE_MACHINE there is no need to enter (new) machines here in the future..

Andreas

Re: [PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 18-09-10 13:47, Frans Meulenbroeks wrote:
> 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

NAK! Only clutter itself has the need for COMPATIBLE_MACHINE (actually,
only virtual/egl needs it, clutter can drop COMPATIBLE_MACHINE), gst,
gtk and box2d are generic libraries that do NOT need it.


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMldadMkyGM64RGpERAjaQAJ9c42kNNJT3/LejEwE1UTIdKCM/XACfakfn
kHA+my7GTnWyY8XLTls7YfQ=
=EN77
-----END PGP SIGNATURE-----

Re: [PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[Frans Meulenbroeks]

2010/9/19 Koen Kooi <k.kooi@student.utwente.nl>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 18-09-10 13:47, Frans Meulenbroeks wrote:
>> 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
>
> NAK! Only clutter itself has the need for COMPATIBLE_MACHINE (actually,
> only virtual/egl needs it, clutter can drop COMPATIBLE_MACHINE), gst,
> gtk and box2d are generic libraries that do NOT need it.
>

They are not generic as they have a DEPENDS = "clutter".
But I am fine dropping COMPATIBLE_MACHINE from the clutter recipe.

Still that leaves the question posted in a different thread is
COMPATIBLE_MACHINE should propagate upward implicitly.

Frans

Re: [PATCH] clutter: moved COMPATIBLE_MACHINE to clutter-common.inc

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 19-09-10 15:48, Frans Meulenbroeks wrote:
> 2010/9/19 Koen Kooi <k.kooi@student.utwente.nl>:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 18-09-10 13:47, Frans Meulenbroeks wrote:
>>> 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
>>
>> NAK! Only clutter itself has the need for COMPATIBLE_MACHINE (actually,
>> only virtual/egl needs it, clutter can drop COMPATIBLE_MACHINE), gst,
>> gtk and box2d are generic libraries that do NOT need it.
>>
> 
> They are not generic as they have a DEPENDS = "clutter".

They will link against any clutter you throw at it and only depend on
the build arch (e.g. armv7a), so they are generic.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMlhabMkyGM64RGpERAhJeAJ9IdlOH6PlfkUvW5q1rq0Z9L506aACdFE0O
muxfMTetpvVqx+5iLJK9vg0=
=G0j5
-----END PGP SIGNATURE-----