[PATCH 0/5] Clutter upgrades

[PATCH 0/5] Clutter upgrades

[Joshua Lock]

All,

A fairly boring series. I've upgraded the clutter and cogl recipes to the
recently released 1.8.2 versions.

Further I've updated the SRCREV in the _git recipes to match the tagged
releases and updated the distro tracking file to reflect these changes.

For the clutter curious I'm thinking of sending out an RFC series in the
coming days to drop the namespacing from the clutter recipes.

Cheers,
Joshua

The following changes since commit b9dfccc018f32a47fc045f35d5f53d7269d791ed:

  gdk-pixbuf: Ensure the binaries can be relocated (2011-12-13 18:00:18 +0000)

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

Joshua Lock (5):
  cogl: upgrade to latest stable cogl 1.8.2
  clutter: upgrade to 1.8.2
  cogl: update git recipe to 1.8.2
  clutter_git: update to 1.8.2 tag
  distro_tracking_fields: update cogl and clutter

 .../conf/distro/include/distro_tracking_fields.inc |   13 +++++++------
 .../{clutter-1.8_1.8.0.bb => clutter-1.8_1.8.2.bb} |    4 ++--
 meta/recipes-graphics/clutter/clutter_git.bb       |    5 +++--
 .../clutter/{cogl_1.8.0.bb => cogl_1.8.2.bb}       |    4 ++--
 meta/recipes-graphics/clutter/cogl_git.bb          |    5 +++--
 5 files changed, 17 insertions(+), 14 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.0.bb => clutter-1.8_1.8.2.bb} (83%)
 rename meta/recipes-graphics/clutter/{cogl_1.8.0.bb => cogl_1.8.2.bb} (59%)

-- 
1.7.7.4

[PATCH 1/5] cogl: upgrade to latest stable cogl 1.8.2

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../clutter/{cogl_1.8.0.bb => cogl_1.8.2.bb}       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/clutter/{cogl_1.8.0.bb => cogl_1.8.2.bb} (59%)

diff --git a/meta/recipes-graphics/clutter/cogl_1.8.0.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
similarity index 59%
rename from meta/recipes-graphics/clutter/cogl_1.8.0.bb
rename to meta/recipes-graphics/clutter/cogl_1.8.2.bb
index 02ed67c..d99c443 100644
--- a/meta/recipes-graphics/clutter/cogl_1.8.0.bb
+++ b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
 	   file://macro-versions.patch"
 
-SRC_URI[md5sum] = "cd18c28bf3dd0008b072cb9c5eed7821"
-SRC_URI[sha256sum] = "5ed9ee014367058a63d99a13e3fcc8cb8c6acb19ece00195c6df034fd8d8d8c7"
+SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
+SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"
-- 
1.7.7.4

[PATCH 2/5] clutter: upgrade to 1.8.2

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../{clutter-1.8_1.8.0.bb => clutter-1.8_1.8.2.bb} |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.0.bb => clutter-1.8_1.8.2.bb} (83%)

diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.2.bb
similarity index 83%
rename from meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
rename to meta/recipes-graphics/clutter/clutter-1.8_1.8.2.bb
index 7deac9e..f76201e 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.2.bb
@@ -23,5 +23,5 @@ do_configure_prepend () {
 	sed -i -e 's/^DOLT//' ${S}/configure.ac
 }
 
-SRC_URI[md5sum] = "71454425366d9a49948cdd2af9eafc89"
-SRC_URI[sha256sum] = "79cd42c9a208b1bd2e2a0866ad7eb047a00835beabb401e99737af846812119c"
+SRC_URI[md5sum] = "29a238fa11da2f56c40de0eb04424aaf"
+SRC_URI[sha256sum] = "5e6abf6440e6be8130fd7a6b449e1789e4318f61b17f06323ba1b58dc143bc8b"
-- 
1.7.7.4

[PATCH 3/5] cogl: update git recipe to 1.8.2

[Joshua Lock]

Eventual plan is to start building bleeding git again, so we'd like to keep
the recipe around and relatively up to date.

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

diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 0702302..7a10dd8 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -2,8 +2,9 @@ require cogl.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "0a70a159c65357809740971570b2e301451161b5"
-PV = "1.8.0+git${SRCPV}"
+# the 1.8.2 tag
+SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
+PV = "1.8.2+git${SRCPV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
-- 
1.7.7.4

[PATCH 4/5] clutter_git: update to 1.8.2 tag

[Joshua Lock]

Eventual plan is to start building bleeding git again, so we'd like to keep
the recipe around and relatively up to date.

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

diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index db8c712..d598b4a 100644
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
@@ -3,8 +3,9 @@ require clutter-package.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
-PV = "1.8.0+git${SRCPV}"
+# the 1.8.2 tag
+SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
+PV = "1.8.2+git${SRCPV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
-- 
1.7.7.4

[PATCH 5/5] distro_tracking_fields: update cogl and clutter

[Joshua Lock]

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

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 890340b..f2b7d4b 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5468,15 +5468,16 @@ RECIPE_MAINTAINER_pn-libgalago = "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_LATEST_VERSION_pn-cogl = "1.8.2"
+RECIPE_MANUAL_CHECK_DATE_pn-cogl = "Dec 13, 2011"
+RECIPE_LAST_UPDATE_pn-cogl = "Dec 13, 2011"
+RECIPE_MAINTAINER_pn-cogl = "Joshua Lock <josh@linux.intel.com>"
 
 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_LATEST_VERSION_pn-clutter-1.8 = "1.8.2"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Dec 13, 2011"
+RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Dec 13, 2011"
 RECIPE_MAINTAINER_pn-clutter-1.8 = "Joshua Lock <josh@linux.intel.com>"
 
 RECIPE_STATUS_pn-clutter-gtk-1.8 = "red"
-- 
1.7.7.4

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Khem Raj]

On Tue, Dec 13, 2011 at 12:24 PM, Joshua Lock <josh@linux.intel.com> wrote:
> -SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
> -PV = "1.8.0+git${SRCPV}"
> +# the 1.8.2 tag
> +SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
> +PV = "1.8.2+git${SRCPV}"

you could also use the tag name instead of SHA for SRCREV I think

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Joshua Lock]

On 13/12/11 12:34, Khem Raj wrote:
> On Tue, Dec 13, 2011 at 12:24 PM, Joshua Lock <josh@linux.intel.com> wrote:
>> -SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
>> -PV = "1.8.0+git${SRCPV}"
>> +# the 1.8.2 tag
>> +SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
>> +PV = "1.8.2+git${SRCPV}"
> 
> you could also use the tag name instead of SHA for SRCREV I think

Indeed we can, however we've seen problems which I can't recall the
details of in the past when doing so. Therefore I decided to avoid it
this time.

Cheers,
Joshua
-- 
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Paul Eggleton]

On Tuesday 13 December 2011 12:40:40 Joshua Lock wrote:
> On 13/12/11 12:34, Khem Raj wrote:
> > On Tue, Dec 13, 2011 at 12:24 PM, Joshua Lock <josh@linux.intel.com> 
wrote:
> >> -SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
> >> -PV = "1.8.0+git${SRCPV}"
> >> +# the 1.8.2 tag
> >> +SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
> >> +PV = "1.8.2+git${SRCPV}"
> > 
> > you could also use the tag name instead of SHA for SRCREV I think
> 
> Indeed we can, however we've seen problems which I can't recall the
> details of in the past when doing so. Therefore I decided to avoid it
> this time.

It does work, it just forces a fetch on every parse which is not really 
desirable. It's really no hardship to use the SHA1 especially if it's 
accompanied by a comment with the corresponding tag.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Saul Wold]

On 12/13/2011 01:20 PM, Paul Eggleton wrote:
> On Tuesday 13 December 2011 12:40:40 Joshua Lock wrote:
>> On 13/12/11 12:34, Khem Raj wrote:
>>> On Tue, Dec 13, 2011 at 12:24 PM, Joshua Lock<josh@linux.intel.com>
> wrote:
>>>> -SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
>>>> -PV = "1.8.0+git${SRCPV}"
>>>> +# the 1.8.2 tag
>>>> +SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
>>>> +PV = "1.8.2+git${SRCPV}"
>>>
>>> you could also use the tag name instead of SHA for SRCREV I think
>>
>> Indeed we can, however we've seen problems which I can't recall the
>> details of in the past when doing so. Therefore I decided to avoid it
>> this time.
>
> It does work, it just forces a fetch on every parse which is not really
> desirable. It's really no hardship to use the SHA1 especially if it's
> accompanied by a comment with the corresponding tag.
>
It will also break BB_NO_NETWORK builds with a tag, because of that 
fetch lookup, to it's preferred to use the SHA SRCREV with a Tag Comment.

Sau!

> Cheers,
> Paul
>

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Khem Raj]

On (13/12/11 21:20), Paul Eggleton wrote:
> > > you could also use the tag name instead of SHA for SRCREV I think
> > 
> > Indeed we can, however we've seen problems which I can't recall the
> > details of in the past when doing so. Therefore I decided to avoid it
> > this time.
> 
> It does work, it just forces a fetch on every parse which is not really 
> desirable. It's really no hardship to use the SHA1 especially if it's 
> accompanied by a comment with the corresponding tag.

is this some limitation of fetchers ?

Re: [PATCH 4/5] clutter_git: update to 1.8.2 tag

[Paul Eggleton]

On Tuesday 13 December 2011 14:39:28 Khem Raj wrote:
> is this some limitation of fetchers ?

Not really, it's just we need the actual SHA1 to construct ${PV} at parse 
time, and if the specified SRCREV is not a SHA1 the git fetcher has no way of 
knowing if it refers to a tag or a branch (which may also have changed since 
the last parse) until it can contact the repository, so it has to do that 
immediately.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [PATCH 0/5] Clutter upgrades

[Saul Wold]

On 12/13/2011 12:24 PM, Joshua Lock wrote:
> All,
>
> A fairly boring series. I've upgraded the clutter and cogl recipes to the
> recently released 1.8.2 versions.
>
> Further I've updated the SRCREV in the _git recipes to match the tagged
> releases and updated the distro tracking file to reflect these changes.
>
> For the clutter curious I'm thinking of sending out an RFC series in the
> coming days to drop the namespacing from the clutter recipes.
>
> Cheers,
> Joshua
>
> The following changes since commit b9dfccc018f32a47fc045f35d5f53d7269d791ed:
>
>    gdk-pixbuf: Ensure the binaries can be relocated (2011-12-13 18:00:18 +0000)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib josh/updates
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/updates
>
> Joshua Lock (5):
>    cogl: upgrade to latest stable cogl 1.8.2
>    clutter: upgrade to 1.8.2
>    cogl: update git recipe to 1.8.2
>    clutter_git: update to 1.8.2 tag
>    distro_tracking_fields: update cogl and clutter
>
>   .../conf/distro/include/distro_tracking_fields.inc |   13 +++++++------
>   .../{clutter-1.8_1.8.0.bb =>  clutter-1.8_1.8.2.bb} |    4 ++--
>   meta/recipes-graphics/clutter/clutter_git.bb       |    5 +++--
>   .../clutter/{cogl_1.8.0.bb =>  cogl_1.8.2.bb}       |    4 ++--
>   meta/recipes-graphics/clutter/cogl_git.bb          |    5 +++--
>   5 files changed, 17 insertions(+), 14 deletions(-)
>   rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.0.bb =>  clutter-1.8_1.8.2.bb} (83%)
>   rename meta/recipes-graphics/clutter/{cogl_1.8.0.bb =>  cogl_1.8.2.bb} (59%)
>

Merged into OE-Core

Thanks
	Sau!