[PATCH 00/10] Clutter tidy up & fixes

[PATCH 00/10] Clutter tidy up & fixes

[Joshua Lock]

The theme of this series is removing some of the stale clutter recipes.

It also includes fixes for the cogl and clutter_git recipes.

Poky maintainers note: this series requires action; either merging my RFC series
to drop clutter bbappends or a separate patch to remove the 1.6 bbappend.

Cheers,
Joshua

The following changes since commit 381c7857a5b303bf9eadd7fffc39d17a2b8e31f2:

  matchbox-wm: Fix variable type in _NET_WORKAREA setting (2011-11-22 15:13:16 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib josh/clutter
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter

Joshua Lock (10):
  mutter: switch to clutter-1.8 to satisfy dependency
  multilib.conf: update clutter
  task-core-clutter: use clutter-1.8
  distro-tracking-fields: add entries for clutter-1.8 recipes
  clutter-*-1.6: drop clutter 1.6 recipes
  clutter: PROVIDES clutter-1.6
  multilibs: remove clutter-1.6 recipes
  distro_tracking_fields: tidy up and claim clutter recipes
  cogl: add missing depends on libxcomposite
  clutter: move STDDEPENDS to inc

 .../conf/distro/include/distro_tracking_fields.inc |   59 +++++++------------
 meta/conf/multilib.conf                            |    4 +-
 .../recipes-graphics/clutter/clutter-1.6_1.6.18.bb |   26 ---------
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |    4 +-
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   21 -------
 meta/recipes-graphics/clutter/clutter.inc          |    3 +-
 meta/recipes-graphics/clutter/clutter_git.bb       |    4 +-
 meta/recipes-graphics/clutter/cogl.inc             |    2 +-
 meta/recipes-graphics/mutter/mutter.inc            |    2 +-
 meta/recipes-graphics/tasks/task-core-clutter.bb   |    9 ++-
 10 files changed, 37 insertions(+), 97 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
 delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb

-- 
1.7.7.3

[PATCH 01/10] mutter: switch to clutter-1.8 to satisfy dependency

[Joshua Lock]

It's API and ABI compatible with 1.6 so just update the DEPENDS entry.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/mutter/mutter.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index d87c30e..4b73d97 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
 LICENSE = "GPLv2"
-DEPENDS = "startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter-1.8 gdk-pixbuf-native intltool glib-2.0-native"
 # gobject-introspection
 inherit gnome update-alternatives
 
-- 
1.7.7.3

[PATCH 02/10] multilib.conf: update clutter

[Joshua Lock]

Add clutter-1.8 recipes

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/conf/multilib.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index de53540..ce7c01c 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -43,6 +43,9 @@ BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-chkconfig = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-clutter-1.6 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-clutter-1.8 = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-clutter-gst-1.8 = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}"
-- 
1.7.7.3

[PATCH 03/10] task-core-clutter: use clutter-1.8

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/tasks/task-core-clutter.bb |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb
index 970970c..4044131 100644
--- a/meta/recipes-graphics/tasks/task-core-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-core-clutter.bb
@@ -24,13 +24,14 @@ PACKAGES = "\
 ALLOW_EMPTY = "1"
 
 RDEPENDS_task-core-clutter-core = "\
-    clutter-1.6 \
-    clutter-gst-1.6 \
+    clutter-1.8 \
+    clutter-gst-1.8 \
+    clutter-gtk-1.8 \
     "
 
 #RDEPENDS_task-core-clutter-tests = "\
-#    clutter-gst-1.6-examples \
-#    clutter-gtk-1.6-examples"
+#    clutter-gst-1.8-examples \
+#    clutter-gtk-1.8-examples"
 
 #RDEPENDS_task-core-clutter-apps = "\
 #    clutter-box2d "
-- 
1.7.7.3

[PATCH 04/10] distro-tracking-fields: add entries for clutter-1.8 recipes

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   36 ++++++++++++--------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 7dc6f27..3eaf3e6 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2678,10 +2678,10 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libmusicbrainz="2 years"
 RECIPE_LAST_UPDATE_pn-libmusicbrainz = "Nov 16, 2010"
 RECIPE_MAINTAINER_pn-libmusicbrainz = "Dongxiao Xu <dongxiao.xu@intel.com>"
 
-RECIPE_STATUS_pn-clutter-gst-1.6 = "red"
-DISTRO_PN_ALIAS_pn-clutter-gst-1.6 = "Fedora=clutter-gst Debian=libclutter-gst"
-RECIPE_LATEST_VERSION_pn-clutter-gst-1.6 = "1.3.8"
-RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = "Mar 28, 2011"
+RECIPE_STATUS_pn-clutter-gst-1.8 = "red"
+DISTRO_PN_ALIAS_pn-clutter-gst-1.8 = "Fedora=clutter-gst Debian=libclutter-gst"
+RECIPE_LATEST_VERSION_pn-clutter-gst-1.8 = "1.4.2"
+RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = "Nov 09, 2011"
 RECIPE_MAINTAINER_pn-clutter-gst-1.6 = "Dongxiao Xu <dongxiao.xu@intel.com>"
 
 RECIPE_STATUS_pn-farsight2 = "red"
@@ -5416,10 +5416,12 @@ RECIPE_MAINTAINER_pn-clutter-box2d = "Zhai Edwin <edwin.zhai@intel.com>"
 DISTRO_PN_ALIAS_pn-clutter-box2d = "OpenedHand"
 
 
-RECIPE_STATUS_pn-clutter-gtk-1.4 = "red"
-DISTRO_PN_ALIAS_pn-clutter-gtk-1.4 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
-RECIPE_LATEST_VERSION_pn-clutter-gtk-1.4 = "0.90.0+git0+e8d828ba1d87937baa571e68fdff22f3e2d79ca8"
-RECIPE_MAINTAINER_pn-clutter-gtk-1.4 = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_STATUS_pn-clutter-gtk-1.8 = "red"
+DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
+RECIPE_LATEST_VERSION_pn-clutter-gtk-1.8 = "0.11.4"
+RECIPE_MAINTAINER_pn-clutter-gtk-1.8 = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = "Nov 09, 2011"
+RECIPE_LAST_UPDATE_pn-clutter-box2d = "Nov 09, 2011"
 
 RECIPE_STATUS_pn-tidy = "red"
 RECIPE_LATEST_VERSION_pn-tidy = "0.1.0+git0+e25416e1293e1074bfa6727c80527dcff5b1f3cb"
@@ -5436,12 +5438,18 @@ RECIPE_LATEST_VERSION_pn-libgalago = "0.5.2"
 RECIPE_LAST_UPDATE_pn-libgalago = "Apr 11, 2007"
 RECIPE_MAINTAINER_pn-libgalago = "Zhai Edwin <edwin.zhai@intel.com>"
 
-RECIPE_STATUS_pn-clutter-1.6 = "red"
-DISTRO_PN_ALIAS_pn-clutter-1.6 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"
-RECIPE_LATEST_VERSION_pn-clutter-1.6 = "1.6.14"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.6 = "Jun 28, 2011"
-RECIPE_LAST_UPDATE_pn-clutter-1.6 = "Apr 19, 2011"
-RECIPE_MAINTAINER_pn-clutter-1.6 = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_STATUS_pn-cogl = "green"
+DISTRO_PN_ALIAS_pn-cogl = "Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl"
+RECIPE_LATEST_VERSION_pn-cogl = "1.8.0"
+RECIPE_MANUAL_CHECK_DATE_pn-cogl = "Nov 9, 2011"
+RECIPE_LAST_UPDATE_pn-cogl = "Nov 9, 2011"
+
+RECIPE_STATUS_pn-clutter-1.8 = "green"
+DISTRO_PN_ALIAS_pn-clutter-1.8 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"
+RECIPE_LATEST_VERSION_pn-clutter-1.8 = "1.8.0"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Nov 9, 2011"
+RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Nov 9, 2011"
+RECIPE_MAINTAINER_pn-clutter-1.8 = "Zhai Edwin <edwin.zhai@intel.com>"
 
 RECIPE_STATUS_pn-clutter = "red"
 DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
-- 
1.7.7.3

[PATCH 05/10] clutter-*-1.6: drop clutter 1.6 recipes

[Joshua Lock]

Clutter 1.8 is API and ABI compatible with Clutter 1.6 according to the
release notes so there's no need to keep these recipes around.

www.clutter-project.org/blogs/archive/2011-09/clutter-1.8.0-stable-release

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../recipes-graphics/clutter/clutter-1.6_1.6.18.bb |   26 --------------------
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   21 ----------------
 2 files changed, 0 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
 delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb

diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
deleted file mode 100644
index 9c32efd..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-require recipes-graphics/clutter/clutter.inc
-
-PR = "r2"
-
-# Internal json-glib was removed in Clutter 1.5.2
-STDDEPENDS += "json-glib"
-
-PACKAGES =+ "${PN}-examples"
-FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \
-           file://enable_tests-1.4.patch \
-           file://update_gettext_macro_version.patch"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-S = "${WORKDIR}/clutter-${PV}"
-
-BASE_CONF += "--disable-introspection"
-
-do_configure_prepend () {
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-
-SRC_URI[md5sum] = "7302513c96b00588b7779918fae0b33b"
-SRC_URI[sha256sum] = "d849f92944be193e9d8e707f1371e6bab7fca473e09a492265e2e2296febd749"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb b/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
deleted file mode 100644
index cf1da04..0000000
--- a/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require clutter-gst.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
-                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-
-DEPENDS += "clutter-1.6"
-
-PR = "r1"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.3/clutter-gst-${PV}.tar.bz2 \
-           file://enable_tests.patch"
-
-SRC_URI[md5sum] = "5ec828cd10713c1c32996e5fa65aa956"
-SRC_URI[sha256sum] = "68c79596ae46ed54885409cac1eeeaf6819673e2f41ee3014fe9705dfbbc1b5a"
-
-S = "${WORKDIR}/clutter-gst-${PV}"
-
-do_configure_prepend () {
-       # Disable DOLT
-       sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-- 
1.7.7.3

[PATCH 06/10] clutter: PROVIDES clutter-1.6

[Joshua Lock]

Since the two are API/ABI compatible and this may make things easier for
external layers using clutter.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
index efafbc2..c67ea2a 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
@@ -2,6 +2,9 @@ require recipes-graphics/clutter/clutter.inc
 
 PR = "r2"
 
+# We're API/ABI compatible and this may make things easier for layers
+PROVIDES += "clutter-1.6"
+
 # Internal json-glib was removed in Clutter 1.5.2
 STDDEPENDS += "json-glib cogl atk"
 
-- 
1.7.7.3

[PATCH 07/10] multilibs: remove clutter-1.6 recipes

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/conf/multilib.conf |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index ce7c01c..3689482 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -41,9 +41,8 @@ BBCLASSEXTEND_append_pn-bzip2 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-cairo = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-chkconfig = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-clutter-1.6 = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-clutter-1.8 = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-clutter-box2d-1.6 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-clutter-gst-1.8 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}"
-- 
1.7.7.3

[PATCH 08/10] distro_tracking_fields: tidy up and claim clutter recipes

[Joshua Lock]

As the last to touch them I'm volunteering to look after them unless
there are objections?

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   31 ++-----------------
 1 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 3eaf3e6..acdaaf4 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2366,7 +2366,7 @@ RECIPE_LATEST_VERSION_pn-task-core-clutter="1.0"
 RECIPE_NO_OF_PATCHES_pn-task-core-clutter="0"
 RECIPE_LATEST_RELEASE_DATE_pn-task-core-clutter="n/a"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-clutter="n/a"
-RECIPE_MAINTAINER_pn-task-core-clutter = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_MAINTAINER_pn-task-core-clutter = "Joshua Lock <josh@linux.intel.com>"
 DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core"
 
 RECIPE_STATUS_pn-task-core-boot="green"
@@ -2682,7 +2682,7 @@ RECIPE_STATUS_pn-clutter-gst-1.8 = "red"
 DISTRO_PN_ALIAS_pn-clutter-gst-1.8 = "Fedora=clutter-gst Debian=libclutter-gst"
 RECIPE_LATEST_VERSION_pn-clutter-gst-1.8 = "1.4.2"
 RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = "Nov 09, 2011"
-RECIPE_MAINTAINER_pn-clutter-gst-1.6 = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_MAINTAINER_pn-clutter-gst-1.6 = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-farsight2 = "red"
 RECIPE_LATEST_VERSION_pn-farsight2 = "0.0.20"
@@ -5401,27 +5401,10 @@ RECIPE_LAST_UPDATE_pn-gtk-engines = "Dec 1, 2010"
 RECIPE_NO_UPDATE_REASON_pn-gtk-engines = "Do not upgrade to version: 2.91.1 because prefer stable tree"
 RECIPE_MAINTAINER_pn-gtk-engines = "Zhai Edwin <edwin.zhai@intel.com>"
 
-RECIPE_STATUS_pn-clutter-box2d-1.6 = "red"
-RECIPE_LATEST_VERSION_pn-clutter-box2d-1.6 = "0.10.0"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d-1.6 = "Jun 28, 2011"
-RECIPE_LAST_UPDATE_pn-clutter-box2d-1.6 = "Mar 28, 2011"
-RECIPE_MAINTAINER_pn-clutter-box2d-1.6 = "Zhai Edwin <edwin.zhai@intel.com>"
-DISTRO_PN_ALIAS_pn-clutter-box2d-1.6 = "OpenedHand"
-
-RECIPE_STATUS_pn-clutter-box2d = "red"
-RECIPE_LATEST_VERSION_pn-clutter-box2d = "0.10.0"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = "Jun 28, 2011"
-RECIPE_LAST_UPDATE_pn-clutter-box2d = "Mar 28, 2011"
-RECIPE_MAINTAINER_pn-clutter-box2d = "Zhai Edwin <edwin.zhai@intel.com>"
-DISTRO_PN_ALIAS_pn-clutter-box2d = "OpenedHand"
-
-
 RECIPE_STATUS_pn-clutter-gtk-1.8 = "red"
 DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
 RECIPE_LATEST_VERSION_pn-clutter-gtk-1.8 = "0.11.4"
-RECIPE_MAINTAINER_pn-clutter-gtk-1.8 = "Zhai Edwin <edwin.zhai@intel.com>"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter-box2d = "Nov 09, 2011"
-RECIPE_LAST_UPDATE_pn-clutter-box2d = "Nov 09, 2011"
+RECIPE_MAINTAINER_pn-clutter-gtk-1.8 = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-tidy = "red"
 RECIPE_LATEST_VERSION_pn-tidy = "0.1.0+git0+e25416e1293e1074bfa6727c80527dcff5b1f3cb"
@@ -5449,13 +5432,7 @@ DISTRO_PN_ALIAS_pn-clutter-1.8 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter
 RECIPE_LATEST_VERSION_pn-clutter-1.8 = "1.8.0"
 RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Nov 9, 2011"
 RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Nov 9, 2011"
-RECIPE_MAINTAINER_pn-clutter-1.8 = "Zhai Edwin <edwin.zhai@intel.com>"
-
-RECIPE_STATUS_pn-clutter = "red"
-DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk"
-RECIPE_LATEST_VERSION_pn-clutter = "1.6.14"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter = "Jun 28, 2011"
-RECIPE_MAINTAINER_pn-clutter = "Zhai Edwin <edwin.zhai@intel.com>"
+RECIPE_MAINTAINER_pn-clutter-1.8 = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-libgnomekbd = "red"
 RECIPE_LATEST_VERSION_pn-libgnomekbd = "2.31.1"
-- 
1.7.7.3

[PATCH 09/10] cogl: add missing depends on libxcomposite

[Joshua Lock]

Cogl checks for libxcomposite at configure time.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/clutter/cogl.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index f264151..81317c6 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -5,7 +5,7 @@ LICENSE = "LGPL"
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-DEPENDS = "${STDDEPENDS} virtual/libgl"
+DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
 FILESPATH = "${FILE_DIRNAME}/cogl"
-- 
1.7.7.3

[PATCH 10/10] clutter: move STDDEPENDS to inc

[Joshua Lock]

We only build clutter-1.8 now so move the additional STDDEPENDS from the
recipe to the inc file. This has the added benefit of fixing
clutter_git.

This patch also fixes the LIC_FILES_CHKSUM for clutter_git

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |    3 ---
 meta/recipes-graphics/clutter/clutter.inc          |    3 ++-
 meta/recipes-graphics/clutter/clutter_git.bb       |    4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
index c67ea2a..690a161 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
@@ -5,9 +5,6 @@ PR = "r2"
 # We're API/ABI compatible and this may make things easier for layers
 PROVIDES += "clutter-1.6"
 
-# Internal json-glib was removed in Clutter 1.5.2
-STDDEPENDS += "json-glib cogl atk"
-
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 54f65c5..24cb30d 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "Clutter graphics library"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
+# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
+STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
 DEPENDS = "${STDDEPENDS} virtual/libgl"
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index 897f5ff..db8c712 100644
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
@@ -1,9 +1,7 @@
 require clutter.inc
 require clutter-package.inc
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-DEPENDS += "cogl"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
 PV = "1.8.0+git${SRCPV}"
-- 
1.7.7.3

Re: [PATCH 02/10] multilib.conf: update clutter

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

Am Dienstag, den 22.11.2011, 14:57 -0800 schrieb Joshua Lock:
> Add clutter-1.8 recipes

This line is more suited for the commit summary.

> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  meta/conf/multilib.conf |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

[…]


Thanks,

Paul

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 00/10] Clutter tidy up & fixes

[Saul Wold]

On 11/22/2011 02:57 PM, Joshua Lock wrote:
> The theme of this series is removing some of the stale clutter recipes.
>
> It also includes fixes for the cogl and clutter_git recipes.
>
> Poky maintainers note: this series requires action; either merging my RFC series
> to drop clutter bbappends or a separate patch to remove the 1.6 bbappend.
>
> Cheers,
> Joshua
>
> The following changes since commit 381c7857a5b303bf9eadd7fffc39d17a2b8e31f2:
>
>    matchbox-wm: Fix variable type in _NET_WORKAREA setting (2011-11-22 15:13:16 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib josh/clutter
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter
>
> Joshua Lock (10):
>    mutter: switch to clutter-1.8 to satisfy dependency
>    multilib.conf: update clutter
>    task-core-clutter: use clutter-1.8
>    distro-tracking-fields: add entries for clutter-1.8 recipes
>    clutter-*-1.6: drop clutter 1.6 recipes
>    clutter: PROVIDES clutter-1.6
There still seems to be a problem with clutter-box2d-1.6 recipe, not 
sure if it got dropped or modified properly.

Sau!

>    multilibs: remove clutter-1.6 recipes
>    distro_tracking_fields: tidy up and claim clutter recipes
>    cogl: add missing depends on libxcomposite
>    clutter: move STDDEPENDS to inc
>
>   .../conf/distro/include/distro_tracking_fields.inc |   59 +++++++------------
>   meta/conf/multilib.conf                            |    4 +-
>   .../recipes-graphics/clutter/clutter-1.6_1.6.18.bb |   26 ---------
>   meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |    4 +-
>   .../clutter/clutter-gst-1.6_1.3.6.bb               |   21 -------
>   meta/recipes-graphics/clutter/clutter.inc          |    3 +-
>   meta/recipes-graphics/clutter/clutter_git.bb       |    4 +-
>   meta/recipes-graphics/clutter/cogl.inc             |    2 +-
>   meta/recipes-graphics/mutter/mutter.inc            |    2 +-
>   meta/recipes-graphics/tasks/task-core-clutter.bb   |    9 ++-
>   10 files changed, 37 insertions(+), 97 deletions(-)
>   delete mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
>   delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
>