[PATCH 0/7] Tidy Clutter recipes

[PATCH 0/7] Tidy Clutter recipes

[Joshua Lock]

This series tidies up the Clutter recipes by dropping the -1.6 recipes, as
Clutter 1.8 is API/ABI compatible with 1.6.

I added a PROVIDES += "clutter-1.6" to the clutter-1.8 recipe to ease the
pain for layers using Clutter but I'm not wed to the idea - RFC?

Further the clutter-box2d recipe doesn't build due to, I think, stricter
warnings and -Werror with gcc 4.6 - I haven't had time to look into this
yet but I'm not sure the upstream is very active.

Thoughts on dropping or keeping this recipe?

Cheers,
Joshua

The following changes since commit 25fae81538a92e15eab3fc169ebce44505f67839:

  python: skip setup.py 'import check' when cross-compiling (2011-11-08 21:44:23 +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 (7):
  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

 .../conf/distro/include/distro_tracking_fields.inc |   36 ++++++++++++--------
 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 |    3 ++
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   21 -----------
 meta/recipes-graphics/mutter/mutter.inc            |    2 +-
 meta/recipes-graphics/tasks/task-core-clutter.bb   |    9 +++--
 7 files changed, 34 insertions(+), 67 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

[PATCH 1/7] 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

[PATCH 2/7] 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 5e4b435..53c0bbb 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

[PATCH 3/7] 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

[PATCH 4/7] 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 c4d33a7..28dc081 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2667,10 +2667,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"
@@ -5401,10 +5401,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"
@@ -5421,12 +5423,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

[PATCH 5/7] 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

[PATCH 6/7] 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

[PATCH 7/7] 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 53c0bbb..6cbac8c 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

Re: [PATCH 5/7] clutter-*-1.6: drop clutter 1.6 recipes

[Saul Wold]

On 11/09/2011 05:29 PM, Joshua Lock wrote:
> 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
>
Is there a corresponding patch for meta-yocto to drop the 
clutter-1.6_1.6.18.bbappend?

I hit this right away, what kind of tests are you building for this?

Sau!


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