[PATCH v2 0/3] Fix and update clutter-1.6

[PATCH v2 0/3] Fix and update clutter-1.6

[Joshua Lock]

From: Joshua Lock <josh@linux.intel.com>

Same as the v1 patch set only with an extra patch to update to the latest
release in the Clutter 1.6 stable series.

With a recent patchset I changed clutter to depend on a json-glib recipe then
promptly didn't include that recipe in the patch series - apologies.

Further I've removed a patch from the 1.6 recipe which is no longer required.

Finally, Clutter 1.6.14 - hurrah!

Pull URL: git://git.openembedded.org/openembedded-core-contrib
  Branch: josh/clutter
  Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter

Thanks,
    Joshua Lock <josh@linux.intel.com>
---


Joshua Lock (3):
  json-glib: new recipe required by clutter
  clutter-1.6: drop no longer required patch
  clutter-1.6: update to 1.6.14

 meta/recipes-gnome/json-glib/json-glib_0.12.2.bb   |   20 ++++++++++++++++++++
 ...{clutter-1.6_1.6.8.bb => clutter-1.6_1.6.14.bb} |    9 ++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-gnome/json-glib/json-glib_0.12.2.bb
 rename meta/recipes-graphics/clutter/{clutter-1.6_1.6.8.bb => clutter-1.6_1.6.14.bb} (66%)

-- 
1.7.4.4

[PATCH v2 1/3] json-glib: new recipe required by clutter

[Joshua Lock]

From: Joshua Lock <josh@linux.intel.com>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-gnome/json-glib/json-glib_0.12.2.bb |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-gnome/json-glib/json-glib_0.12.2.bb

diff --git a/meta/recipes-gnome/json-glib/json-glib_0.12.2.bb b/meta/recipes-gnome/json-glib/json-glib_0.12.2.bb
new file mode 100644
index 0000000..58dcde9
--- /dev/null
+++ b/meta/recipes-gnome/json-glib/json-glib_0.12.2.bb
@@ -0,0 +1,20 @@
+SUMMARY = "JSON-GLib implements a full JSON parser using GLib and GObject."
+DESCRIPTION = "Use JSON-GLib it is possible to parse and generate valid JSON\
+ data structures, using a DOM-like API. JSON-GLib also offers GObject \
+integration, providing the ability to serialize and deserialize GObject \
+instances to and from JSON data types."
+HOMEPAGE = "http://live.gnome.org/JsonGlib"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+DEPENDS = "glib-2.0"
+
+SRC_URI[archive.md5sum] = "71f911329c9f742543b378c3494490da"
+SRC_URI[archive.sha256sum] = "89fa9b870dfe2d8b7b00210be76cdbb2d46a8d2cc77ca7cbe5d081bdf8cad780"
+
+PR = "r0"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-introspection"
-- 
1.7.4.4

[PATCH v2 2/3] clutter-1.6: drop no longer required patch

[Joshua Lock]

From: Joshua Lock <josh@linux.intel.com>

The test-conformance-fix.patch is no longer required for clutter-1.6

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

diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
index ffcc42d..f30398d 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/clutter/clutter.inc
 
-PR = "r0"
+PR = "r1"
 
 # Internal json-glib was removed in Clutter 1.5.2
 STDDEPENDS += "json-glib"
@@ -9,8 +9,7 @@ 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://test-conformance-fix.patch"
+           file://enable_tests-1.4.patch"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 S = "${WORKDIR}/clutter-1.6.8"
-- 
1.7.4.4

[PATCH v2 3/3] clutter-1.6: update to 1.6.14

[Joshua Lock]

From: Joshua Lock <josh@linux.intel.com>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 ...{clutter-1.6_1.6.8.bb => clutter-1.6_1.6.14.bb} |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-1.6_1.6.8.bb => clutter-1.6_1.6.14.bb} (75%)

diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
similarity index 75%
rename from meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
rename to meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
index f30398d..ab9e0e0 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/clutter/clutter.inc
 
-PR = "r1"
+PR = "r0"
 
 # Internal json-glib was removed in Clutter 1.5.2
 STDDEPENDS += "json-glib"
@@ -12,7 +12,7 @@ SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.t
            file://enable_tests-1.4.patch"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-S = "${WORKDIR}/clutter-1.6.8"
+S = "${WORKDIR}/clutter-${PV}"
 
 BASE_CONF += "--disable-introspection"
 
@@ -21,5 +21,5 @@ do_configure_prepend () {
 	sed -i -e 's/^DOLT//' ${S}/configure.ac
 }
 
-SRC_URI[md5sum] = "9eedac4216f709a9f144940d24bfbb3e"
-SRC_URI[sha256sum] = "cc147b8e7e62ed4b9b8a83df3db9788cf37db0c83970ba876228433f32bda442"
+SRC_URI[md5sum] = "1da9f983115f9bd28b0be8176e53fe36"
+SRC_URI[sha256sum] = "0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d"
-- 
1.7.4.4

Re: [PATCH v2 0/3] Fix and update clutter-1.6

[Richard Purdie]

On Tue, 2011-04-19 at 15:49 -0700, Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
> 
> Same as the v1 patch set only with an extra patch to update to the latest
> release in the Clutter 1.6 stable series.
> 
> With a recent patchset I changed clutter to depend on a json-glib recipe then
> promptly didn't include that recipe in the patch series - apologies.
> 
> Further I've removed a patch from the 1.6 recipe which is no longer required.
> 
> Finally, Clutter 1.6.14 - hurrah!
> 
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
>   Branch: josh/clutter
>   Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter
> 
> Thanks,
>     Joshua Lock <josh@linux.intel.com>
> ---
> 
> 
> Joshua Lock (3):
>   json-glib: new recipe required by clutter
>   clutter-1.6: drop no longer required patch
>   clutter-1.6: update to 1.6.14

Merged to master, thanks.

Richard