Skip to contentSkip to conversation

Clutter tidy up & fixes

PATCH In review Joshua Lock 3 participants 13 messages Nov 22, 2011 – Nov 28, 2011

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Clutter tidy up & fixes

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
Signature · 1 line
1.7.7.3
author
#1 lore raw

PATCH 1/10 mutter: switch to clutter-1.8 to satisfy dependency

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

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/mutter/mutter.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/mutter/mutter.inc +1 -1
index d87c30e..4b73d97 100644
@@ -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
Signature · 1 line
1.7.7.3
author
#2 lore raw

PATCH 2/10 multilib.conf: update clutter

In reply to Joshua Lock

Add clutter-1.8 recipes

Signed-off-by Joshua Lock <[email protected]>
---
 meta/conf/multilib.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/conf/multilib.conf +3 -0
index de53540..ce7c01c 100644
@@ -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}"
Signature · 1 line
1.7.7.3
author
#4 lore raw

PATCH 3/10 task-core-clutter: use clutter-1.8

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/tasks/task-core-clutter.bb |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
meta/recipes-graphics/tasks/task-core-clutter.bb +5 -4
index 970970c..4044131 100644
@@ -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 "
Signature · 1 line
1.7.7.3
author
#5 lore raw

PATCH 4/10 distro-tracking-fields: add entries for clutter-1.8 recipes

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   36 ++++++++++++--------
 1 files changed, 22 insertions(+), 14 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +22 -14
index 7dc6f27..3eaf3e6 100644
@@ -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 <[email protected]>"
 
-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 <[email protected]>"
 
 RECIPE_STATUS_pn-farsight2 = "red"

@@ -5416,10 +5416,12 @@ RECIPE_MAINTAINER_pn-clutter-box2d = "Zhai Edwin <[email protected]>"
 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 <[email protected]>"
+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 <[email protected]>"
+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 <[email protected]>"
 
-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 <[email protected]>"
+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 <[email protected]>"
 
 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"
Signature · 1 line
1.7.7.3
author
#6 lore raw

PATCH 5/10 clutter-*-1.6: drop clutter 1.6 recipes

In reply to 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 <[email protected]>
---
 .../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
meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb deleted +0 -26
deleted file mode 100644
index 9c32efd..0000000
@@ -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"
meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb deleted +0 -21
deleted file mode 100644
index cf1da04..0000000
@@ -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
-}
Signature · 1 line
1.7.7.3
author
#7 lore raw

PATCH 6/10 clutter: PROVIDES clutter-1.6

In reply to 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 <[email protected]>
---
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb +3 -0
index efafbc2..c67ea2a 100644
@@ -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"
Signature · 1 line
1.7.7.3
author
#8 lore raw

PATCH 7/10 multilibs: remove clutter-1.6 recipes

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/conf/multilib.conf |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
meta/conf/multilib.conf +1 -2
index ce7c01c..3689482 100644
@@ -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}"
Signature · 1 line
1.7.7.3
author
#9 lore raw

PATCH 8/10 distro_tracking_fields: tidy up and claim clutter recipes

In reply to Joshua Lock

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

Signed-off-by Joshua Lock <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   31 ++-----------------
 1 files changed, 4 insertions(+), 27 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +4 -27
index 3eaf3e6..acdaaf4 100644
@@ -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 <[email protected]>"
+RECIPE_MAINTAINER_pn-task-core-clutter = "Joshua Lock <[email protected]>"
 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 <[email protected]>"
+RECIPE_MAINTAINER_pn-clutter-gst-1.6 = "Joshua Lock <[email protected]>"
 
 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 <[email protected]>"
 
-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 <[email protected]>"
-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 <[email protected]>"
-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 <[email protected]>"
-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 <[email protected]>"
 
 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 <[email protected]>"
-
-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 <[email protected]>"
+RECIPE_MAINTAINER_pn-clutter-1.8 = "Joshua Lock <[email protected]>"
 
 RECIPE_STATUS_pn-libgnomekbd = "red"
 RECIPE_LATEST_VERSION_pn-libgnomekbd = "2.31.1"
Signature · 1 line
1.7.7.3
author
#10 lore raw

PATCH 9/10 cogl: add missing depends on libxcomposite

In reply to Joshua Lock

Cogl checks for libxcomposite at configure time.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/cogl.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/clutter/cogl.inc +1 -1
index f264151..81317c6 100644
@@ -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"
Signature · 1 line
1.7.7.3
author
#11 lore raw

PATCH 10/10 clutter: move STDDEPENDS to inc

In reply to 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 <[email protected]>
---
 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(-)
meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb +0 -3
index c67ea2a..690a161 100644
@@ -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"
meta/recipes-graphics/clutter/clutter.inc +2 -1
index 54f65c5..24cb30d 100644
@@ -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"
meta/recipes-graphics/clutter/clutter_git.bb +1 -3
index 897f5ff..db8c712 100644
@@ -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}"
Signature · 1 line
1.7.7.3
#3 lore raw

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

In reply to Joshua Lock

Am Dienstag, den 22.11.2011, 14:57 -0800 schrieb Joshua Lock:

Quoted 1 line

Add clutter-1.8 recipes

This line is more suited for the commit summary.

Quoted 4 lines
Signed-off-by Joshua Lock <[email protected]>
---
 meta/conf/multilib.conf |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

[…]

Thanks,

Paul

#12 lore raw
In reply to Joshua Lock
Quoted 18 lines · 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

Quoted 7 lines

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!

Quoted 19 lines

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