* [PATCH 01/11] multilib.conf: remove clutter-1.6 and add clutter-1.8
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 02/11] clutter: PROVIDES clutter-1.6 Joshua Lock
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
clutter-1.8 is the future here.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/conf/multilib.conf | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index de53540..3689482 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -41,8 +41,10 @@ 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-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}"
BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}"
--
1.7.7.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 02/11] clutter: PROVIDES clutter-1.6
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
2011-11-30 0:33 ` [PATCH 01/11] multilib.conf: remove clutter-1.6 and add clutter-1.8 Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 03/11] task-core-clutter: use clutter-1.8 Joshua Lock
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] task-core-clutter: use clutter-1.8
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
2011-11-30 0:33 ` [PATCH 01/11] multilib.conf: remove clutter-1.6 and add clutter-1.8 Joshua Lock
2011-11-30 0:33 ` [PATCH 02/11] clutter: PROVIDES clutter-1.6 Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 04/11] mutter: switch to clutter-1.8 to satisfy dependency Joshua Lock
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] mutter: switch to clutter-1.8 to satisfy dependency
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (2 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 03/11] task-core-clutter: use clutter-1.8 Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 05/11] clutter-*-1.6: drop clutter 1.6 recipes Joshua Lock
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/11] clutter-*-1.6: drop clutter 1.6 recipes
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (3 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 04/11] mutter: switch to clutter-1.8 to satisfy dependency Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 06/11] cogl: add missing depends on libxcomposite Joshua Lock
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] cogl: add missing depends on libxcomposite
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (4 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 05/11] clutter-*-1.6: drop clutter 1.6 recipes Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 07/11] clutter: move STDDEPENDS to inc Joshua Lock
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] clutter: move STDDEPENDS to inc
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (5 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 06/11] cogl: add missing depends on libxcomposite Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 08/11] clutter-box2d: Update git recipe Joshua Lock
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/11] clutter-box2d: Update git recipe
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (6 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 07/11] clutter: move STDDEPENDS to inc Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 09/11] clutter-box2d: fix LICENSE field - LGPL-2.1 Joshua Lock
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
Several changes and fixes exist unreleased in git with version 0.12.1,
update to build the latest available.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-graphics/clutter/clutter-box2d_git.bb | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-box2d_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index bfd46b2..554ce81 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -2,12 +2,13 @@ require clutter-box2d.inc
LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b"
-SRCREV = "4799ac10ae8cb7da936a2b999aba58fe62eb1ee3"
-PV = "0.10.1+git${SRCPV}"
+SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2"
+PV = "0.12.1+git${SRCPV}"
PR = "r0"
SRC_URI = "git://git.gnome.org/clutter-box2d.git"
S = "${WORKDIR}/git"
-DEPENDS += "clutter-1.6"
+DEPENDS += "clutter-1.8"
+PROVIDES = "clutter-box2d-1.6"
--
1.7.7.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] clutter-box2d: fix LICENSE field - LGPL-2.1
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (7 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 08/11] clutter-box2d: Update git recipe Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 10/11] clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0 Joshua Lock
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
clutter-box2d has had the same COPYING file since 2008-04-03, therefore
update the license field in the inc file to reflect its contents.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/recipes-graphics/clutter/clutter-box2d.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 0574db3..599b467 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -1,6 +1,6 @@
DESCRIPTION = "Clutter Box2D"
HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "Catto"
+LICENSE = "LGPL-2.1"
# The main clutter lib is machine specific so we need to be too
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.7.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (8 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 09/11] clutter-box2d: fix LICENSE field - LGPL-2.1 Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 0:33 ` [PATCH 11/11] distro-tracking-fields: update entries for clutter recipes Joshua Lock
2011-11-30 15:52 ` [PATCH 00/11] Clutter tidy-up and fixes Richard Purdie
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
It's very old at this point and doesn't build with recent clutter
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/conf/multilib.conf | 2 +-
meta/recipes-core/tasks/task-core-tools.bb | 4 +-
.../clutter/clutter-box2d-1.6_0.10.0.bb | 24 ----------------
.../clutter-box2d/fix-disable-introspection.patch | 30 --------------------
.../clutter/clutter-box2d/isfinite.patch | 19 ------------
5 files changed, 3 insertions(+), 76 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
delete mode 100644 meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
delete mode 100644 meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 3689482..1540f9c 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -42,9 +42,9 @@ BBCLASSEXTEND_append_pn-cairo = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-calibrateproto = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-chkconfig = " ${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-clutter-box2d = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-compositeproto = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-connman-gnome = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-connman = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools.bb
index 3159e06..12d4ff9 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r12"
+PR = "r13"
PACKAGES = "\
task-core-tools-debug \
@@ -97,5 +97,5 @@ RDEPENDS_task-core-tools-testapps = "\
xwininfo \
xprop \
xvideo-tests \
- clutter-box2d-1.6 \
+ clutter-box2d \
"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb b/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
deleted file mode 100644
index a0024d0..0000000
--- a/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require clutter-box2d.inc
-
-PR = "r1"
-
-DEPENDS += "clutter-1.6"
-
-SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
- file://fix-disable-introspection.patch \
- file://isfinite.patch \
- "
-
-S = "${WORKDIR}/clutter-box2d-${PV}"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-BASE_CONF += "--disable-introspection"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-
-SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d"
-SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
deleted file mode 100644
index 58f2729..0000000
--- a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Even with introspection disabled clutter-box2d would try to install the gir
-files.
-This patch ignored the while introspection related section of the Makefile if
-introspection is disabled.
-
-JL 28/03/11
-josh@linux.intel.com
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
-===================================================================
---- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am
-+++ clutter-box2d-0.10.0/clutter-box2d/Makefile.am
-@@ -41,6 +41,8 @@ EXTRA_DIST = \
-
- BUILT_GIRSOURCES =
-
-+if HAVE_INTROSPECTION
-+
- ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-box2d-@CLUTTER_BOX2D_API_VERSION@.la
- $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
-@@ -70,3 +72,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
-
- CLEANFILES=
- CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-+
-+endif
-\ No newline at end of file
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch b/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
deleted file mode 100644
index bcdbe24..0000000
--- a/meta/recipes-graphics/clutter/clutter-box2d/isfinite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-_finite is obsoleted and C99 has isfinite instead so we should use it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h
-===================================================================
---- clutter-box2d-0.10.0.orig/box2d/Source/Common/b2Math.h 2008-12-16 06:42:10.000000000 -0800
-+++ clutter-box2d-0.10.0/box2d/Source/Common/b2Math.h 2011-07-20 16:41:02.046430743 -0700
-@@ -60,7 +60,7 @@
- #ifdef _MSC_VER
- return _finite(x) != 0;
- #else
-- return finite(x) != 0;
-+ return std::isfinite(x) != 0;
- #endif
- }
-
--
1.7.7.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] distro-tracking-fields: update entries for clutter recipes
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (9 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 10/11] clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0 Joshua Lock
@ 2011-11-30 0:33 ` Joshua Lock
2011-11-30 15:52 ` [PATCH 00/11] Clutter tidy-up and fixes Richard Purdie
11 siblings, 0 replies; 13+ messages in thread
From: Joshua Lock @ 2011-11-30 0:33 UTC (permalink / raw)
To: openembedded-core
Tidy up entries for clutter related recipes
* Update to 1.8 namespace
* Move to same section of file for easier maintenance as a unit
* Update for recent recipe upgrades
* Assign myself as maintainer
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 68 ++++++++-----------
1 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index c07341e..4661264 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2391,7 +2391,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"
@@ -2705,12 +2705,6 @@ 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_MAINTAINER_pn-clutter-gst-1.6 = "Dongxiao Xu <dongxiao.xu@intel.com>"
-
RECIPE_STATUS_pn-farsight2 = "red"
RECIPE_LATEST_VERSION_pn-farsight2 = "0.0.20"
RECIPE_LAST_UPDATE_pn-farsight2 = "Aug 19, 2009"
@@ -5445,26 +5439,6 @@ 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.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-tidy = "red"
RECIPE_LATEST_VERSION_pn-tidy = "0.1.0+git0+e25416e1293e1074bfa6727c80527dcff5b1f3cb"
RECIPE_LAST_UPDATE_pn-tidy = "Dec 18, 2008"
@@ -5480,18 +5454,34 @@ 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-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_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 = "Joshua Lock <josh@linux.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 = "Joshua Lock <josh@linux.intel.com>"
+
+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.8 = "Nov 09, 2011"
+RECIPE_MAINTAINER_pn-clutter-gst-1.8 = "Joshua Lock <josh@linux.intel.com>"
+
+RECIPE_STATUS_pn-clutter-box2d = "red"
+RECIPE_LATEST_VERSION_pn-clutter-box2d = "10.0.0"
+RECIPE_LAST_UPDATE_pn-clutter-box2d = "Nov 29, 2011"
+RECIPE_MAINTAINER_pn-clutter-box2d = "Joshua Lock <josh@linux.intel.com>"
RECIPE_STATUS_pn-libgnomekbd = "red"
RECIPE_LATEST_VERSION_pn-libgnomekbd = "2.31.1"
--
1.7.7.3
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 00/11] Clutter tidy-up and fixes
2011-11-30 0:33 [PATCH 00/11] Clutter tidy-up and fixes Joshua Lock
` (10 preceding siblings ...)
2011-11-30 0:33 ` [PATCH 11/11] distro-tracking-fields: update entries for clutter recipes Joshua Lock
@ 2011-11-30 15:52 ` Richard Purdie
11 siblings, 0 replies; 13+ messages in thread
From: Richard Purdie @ 2011-11-30 15:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-29 at 16:33 -0800, Joshua Lock wrote:
> All,
>
> This is the third attempt at this series. Since the v2 I've:
> * Squashed the distro_tracking_fields changes together (Note: I'm claiming
> I maintain clutter* now).
> * Fixed clutter-box2d by dropping the extremely old clutter-box2d-1.6 and
> updating the clutter-box2_git recipe.
>
> Note: Poky maintainers, without my RFC patch to drop the clutter bbappends this
> series will introduce failures at parse time for Poky.
>
> Cheers,
> Joshua
>
> The following changes since commit 177df2c51927f44e3536856f4604364b38695bc2:
>
> qt-mobility: Add missing patch (2011-11-29 14:36:09 +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 (11):
> multilib.conf: remove clutter-1.6 and add clutter-1.8
> clutter: PROVIDES clutter-1.6
> task-core-clutter: use clutter-1.8
> mutter: switch to clutter-1.8 to satisfy dependency
> clutter-*-1.6: drop clutter 1.6 recipes
> cogl: add missing depends on libxcomposite
> clutter: move STDDEPENDS to inc
> clutter-box2d: Update git recipe
> clutter-box2d: fix LICENSE field - LGPL-2.1
> clutter-box2d: drop unbuildable clutter-box2d-1.6_0.10.0
> distro-tracking-fields: update entries for clutter recipes
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 13+ messages in thread