[PATCH 0/4] Recipes for Clutter 1.6

[PATCH 0/4] Recipes for Clutter 1.6

[Joshua Lock]

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

The attached series of patches adds recipes for Clutter 1.6 and versions of
clutter-box2d and clutter-gst which build against it.

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 (4):
  clutter: add 1.6.8
  clutter-gst: add 1.3.6 for use with clutter 1.6
  clutter-box2d: add version 0.10.0 for use with clutter 1.6
  clutter-gtk: remove duplicate gtk+ DEPENDS entry

 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb |   25 +++++++++++++++++
 .../clutter/clutter-box2d-1.6_0.10.0.bb            |   20 ++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d.inc    |    4 +-
 .../clutter-box2d/fix-disable-introspection.patch  |   28 ++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 +++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc      |    3 +-
 .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
 8 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb

-- 
1.7.4

[PATCH 1/4] clutter: add 1.6.8

[Joshua Lock]

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

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

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
new file mode 100644
index 0000000..7ead5f9
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
@@ -0,0 +1,25 @@
+require recipes-graphics/clutter/clutter.inc
+
+PR = "r0"
+
+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"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+S = "${WORKDIR}/clutter-1.6.8"
+
+BASE_CONF += "--disable-introspection"
+
+EXTRA_OECONF += "--with-json=check"
+
+do_configure_prepend () {
+	# Disable DOLT
+	sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "5a3c6d8414d4e286aba0a936f344c9b1""
+SRC_URI[sha256sum] = "cc147b8e7e62ed4b9b8a83df3db9788cf37db0c83970ba876228433f32bda442"
-- 
1.7.4

[PATCH 2/4] clutter-gst: add 1.3.6 for use with clutter 1.6

[Joshua Lock]

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

The inc file should be usable across clutter versions, plus this is already
set in the clutter-box2d-1.4_git.bb recipe

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc      |    3 ++-
 2 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb

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
new file mode 100644
index 0000000..d787b80
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
@@ -0,0 +1,16 @@
+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"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.3/clutter-gst-${PV}.tar.bz2 \
+           file://enable_tests.patch"
+
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 614c62d..b1c8617 100644
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2+"
 
-DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
+DEPENDS = "gstreamer gst-plugins-base"
 
 FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 
@@ -11,3 +11,4 @@ FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
 
 inherit autotools pkgconfig gtk-doc
 
+FILESPATH = "${FILE_DIRNAME}/clutter-gst"
-- 
1.7.4

[PATCH 3/4] clutter-box2d: add version 0.10.0 for use with clutter 1.6

[Joshua Lock]

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

Don't specificy dependant clutter version in inc file, this enables the inc
file to be re-used accross Clutter versions.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../clutter/clutter-box2d-1.6_0.10.0.bb            |   20 ++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d.inc    |    4 +-
 .../clutter-box2d/fix-disable-introspection.patch  |   28 ++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch

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
new file mode 100644
index 0000000..cad8cfc
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
@@ -0,0 +1,20 @@
+require clutter-box2d.inc
+
+PR = "r0"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
+           file://fix-disable-introspection.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.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 0249984..0574db3 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -2,8 +2,6 @@ DESCRIPTION = "Clutter Box2D"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "Catto"
 
-DEPENDS = "clutter-1.4"
-
 # The main clutter lib is machine specific so we need to be too
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -13,3 +11,5 @@ do_install_append () {
 	install -d ${D}${bindir}
 	install ${S}/examples/.libs/blockbox ${D}${bindir}
 }
+
+FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
new file mode 100644
index 0000000..cfb50dc
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
@@ -0,0 +1,28 @@
+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
+
+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_git.bb b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
index 6b718d5..62b5c80 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-box2d_git.bb
@@ -9,4 +9,4 @@ SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-
+DEPENDS += "clutter-1.4"
-- 
1.7.4

[PATCH 4/4] clutter-gtk: remove duplicate gtk+ DEPENDS entry

[Joshua Lock]

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

the inc file already specifies the gtk+ dependancy

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb
index 3822b31..42a1ef2 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb
@@ -12,6 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += "gtk+ clutter-1.4"
+DEPENDS += "clutter-1.4"
 
 EXTRA_OECONF += "--disable-introspection"
-- 
1.7.4

Re: [PATCH 2/4] clutter-gst: add 1.3.6 for use with clutter 1.6

[Richard Purdie]

On Mon, 2011-03-28 at 15:28 +0100, Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
> 
> The inc file should be usable across clutter versions, plus this is already
> set in the clutter-box2d-1.4_git.bb recipe
> 
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
>  meta/recipes-graphics/clutter/clutter-gst.inc      |    3 ++-
>  2 files changed, 18 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
> 
[...]
> diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
> index 614c62d..b1c8617 100644
> --- a/meta/recipes-graphics/clutter/clutter-gst.inc
> +++ b/meta/recipes-graphics/clutter/clutter-gst.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
>  HOMEPAGE = "http://www.clutter-project.org/"
>  LICENSE = "LGPLv2+"
>  
> -DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
> +DEPENDS = "gstreamer gst-plugins-base"
>  
>  FILESPATH = "${FILE_DIRNAME}/clutter-gst"
>  
> @@ -11,3 +11,4 @@ FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
>  
>  inherit autotools pkgconfig gtk-doc
>  
> +FILESPATH = "${FILE_DIRNAME}/clutter-gst"

Why is FILESPATH set twice to the same thing?

Cheers,

Richard

Re: [OE-core] [PATCH 2/4] clutter-gst: add 1.3.6 for use with clutter 1.6

[Richard Purdie]

On Mon, 2011-03-28 at 15:28 +0100, Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
> 
> The inc file should be usable across clutter versions, plus this is already
> set in the clutter-box2d-1.4_git.bb recipe
> 
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
>  .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
>  meta/recipes-graphics/clutter/clutter-gst.inc      |    3 ++-
>  2 files changed, 18 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
> 
[...]
> diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
> index 614c62d..b1c8617 100644
> --- a/meta/recipes-graphics/clutter/clutter-gst.inc
> +++ b/meta/recipes-graphics/clutter/clutter-gst.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
>  HOMEPAGE = "http://www.clutter-project.org/"
>  LICENSE = "LGPLv2+"
>  
> -DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
> +DEPENDS = "gstreamer gst-plugins-base"
>  
>  FILESPATH = "${FILE_DIRNAME}/clutter-gst"
>  
> @@ -11,3 +11,4 @@ FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
>  
>  inherit autotools pkgconfig gtk-doc
>  
> +FILESPATH = "${FILE_DIRNAME}/clutter-gst"

Why is FILESPATH set twice to the same thing?

Cheers,

Richard

Re: [PATCH 0/4] Recipes for Clutter 1.6

[Andreas Mueller]

On Monday 28 March 2011 16:28:23 Joshua Lock wrote:
> From: Joshua Lock <josh@linux.intel.com>
> 
> The attached series of patches adds recipes for Clutter 1.6 and versions of
> clutter-box2d and clutter-gst which build against it.
> 
> 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 (4):
>   clutter: add 1.6.8
>   clutter-gst: add 1.3.6 for use with clutter 1.6
>   clutter-box2d: add version 0.10.0 for use with clutter 1.6
>   clutter-gtk: remove duplicate gtk+ DEPENDS entry
> 
>  meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb |   25
> +++++++++++++++++ .../clutter/clutter-box2d-1.6_0.10.0.bb            |  
> 20 ++++++++++++++ meta/recipes-graphics/clutter/clutter-box2d.inc    |   
> 4 +-
>  .../clutter-box2d/fix-disable-introspection.patch  |   28
> ++++++++++++++++++++ meta/recipes-graphics/clutter/clutter-box2d_git.bb | 
>   2 +-
>  .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 +++++++++++
>  meta/recipes-graphics/clutter/clutter-gst.inc      |    3 +-
>  .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
>  8 files changed, 95 insertions(+), 5 deletions(-)
>  create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
>  create mode 100644
> meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb create mode
> 100644
> meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patc
> h create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
Is version in recipe name really required (it clutters all the dependent 
recipes)?

Andreas

Re: [PATCH 0/4] Recipes for Clutter 1.6

[Joshua Lock]

On Mon, 2011-03-28 at 19:44 +0200, Andreas Mueller wrote:
> On Monday 28 March 2011 16:28:23 Joshua Lock wrote:
> > From: Joshua Lock <josh@linux.intel.com>
> > 
> > The attached series of patches adds recipes for Clutter 1.6 and versions of
> > clutter-box2d and clutter-gst which build against it.
> > 
> > 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 (4):
> >   clutter: add 1.6.8
> >   clutter-gst: add 1.3.6 for use with clutter 1.6
> >   clutter-box2d: add version 0.10.0 for use with clutter 1.6
> >   clutter-gtk: remove duplicate gtk+ DEPENDS entry
> > 
> >  meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb |   25
> > +++++++++++++++++ .../clutter/clutter-box2d-1.6_0.10.0.bb            |  
> > 20 ++++++++++++++ meta/recipes-graphics/clutter/clutter-box2d.inc    |   
> > 4 +-
> >  .../clutter-box2d/fix-disable-introspection.patch  |   28
> > ++++++++++++++++++++ meta/recipes-graphics/clutter/clutter-box2d_git.bb | 
> >   2 +-
> >  .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 +++++++++++
> >  meta/recipes-graphics/clutter/clutter-gst.inc      |    3 +-
> >  .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
> >  8 files changed, 95 insertions(+), 5 deletions(-)
> >  create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
> >  create mode 100644
> > meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb create mode
> > 100644
> > meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patc
> > h create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
> Is version in recipe name really required (it clutters all the dependent 
> recipes)?

I'm just following precedent set by the existing recipes in oe-core. I'm
not particularly fond of it myself either.

I'm not sure if we're able to set a specific recipe version in the
DEPENDS without doing something like this, however. At least if we can
do it I've not seen it.

Regards,
Joshua
-- 
Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Re: [PATCH 2/4] clutter-gst: add 1.3.6 for use with clutter 1.6

[Joshua Lock]

On Mon, 2011-03-28 at 16:58 +0100, Richard Purdie wrote:
> On Mon, 2011-03-28 at 15:28 +0100, Joshua Lock wrote:
> > From: Joshua Lock <josh@linux.intel.com>
> > 
> > The inc file should be usable across clutter versions, plus this is already
> > set in the clutter-box2d-1.4_git.bb recipe
> > 
> > Signed-off-by: Joshua Lock <josh@linux.intel.com>
> > ---
> >  .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
> >  meta/recipes-graphics/clutter/clutter-gst.inc      |    3 ++-
> >  2 files changed, 18 insertions(+), 1 deletions(-)
> >  create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
> > 
> [...]
> > diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
> > index 614c62d..b1c8617 100644
> > --- a/meta/recipes-graphics/clutter/clutter-gst.inc
> > +++ b/meta/recipes-graphics/clutter/clutter-gst.inc
> > @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
> >  HOMEPAGE = "http://www.clutter-project.org/"
> >  LICENSE = "LGPLv2+"
> >  
> > -DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
> > +DEPENDS = "gstreamer gst-plugins-base"
> >  
> >  FILESPATH = "${FILE_DIRNAME}/clutter-gst"
> >  
> > @@ -11,3 +11,4 @@ FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
> >  
> >  inherit autotools pkgconfig gtk-doc
> >  
> > +FILESPATH = "${FILE_DIRNAME}/clutter-gst"
> 
> Why is FILESPATH set twice to the same thing?

Whoops. Because I'm too trusting of patches which apply cleanly. Sorry. 
v2 patchset due shortly...

Cheers,
Joshua
-- 
Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Re: [PATCH 0/4] Recipes for Clutter 1.6

[Richard Purdie]

On Mon, 2011-03-28 at 19:43 +0100, Joshua Lock wrote: 
> On Mon, 2011-03-28 at 19:44 +0200, Andreas Mueller wrote:
> > On Monday 28 March 2011 16:28:23 Joshua Lock wrote:
> > > From: Joshua Lock <josh@linux.intel.com>

> > >  create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
> > >  create mode 100644
> > > meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb create mode
> > > 100644
> > > meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patc
> > > h create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
> > Is version in recipe name really required (it clutters all the dependent 
> > recipes)?
> 
> I'm just following precedent set by the existing recipes in oe-core. I'm
> not particularly fond of it myself either.
> 
> I'm not sure if we're able to set a specific recipe version in the
> DEPENDS without doing something like this, however. At least if we can
> do it I've not seen it.

Clutter is a special case as by design, its meant to be parallel
installable and you need to depend on a specific library version. The
versions are not backwards compatible. We're therefore following the
projects requirements by doing this and don't have much choice.

Cheers,

Richard

[PATCH 2/4] clutter-gst: add 1.3.6 for use with clutter 1.6

[Joshua Lock]

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

The inc file should be usable across clutter versions, plus this is already
set in the clutter-box2d-1.4_git.bb recipe

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc      |    2 +-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb

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
new file mode 100644
index 0000000..d787b80
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
@@ -0,0 +1,16 @@
+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"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.3/clutter-gst-${PV}.tar.bz2 \
+           file://enable_tests.patch"
+
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index 614c62d..702424b 100644
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2+"
 
-DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
+DEPENDS = "gstreamer gst-plugins-base"
 
 FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 
-- 
1.7.4.1