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

login
register
mail settings
Submitter Joshua Lock
Date March 28, 2011, 2:28 p.m.
Message ID <7049c8b55628f8d6269cefe4a06f994cc60d49c2.1301322225.git.josh@linux.intel.com>
Download mbox | patch
Permalink /patch/1829/
State New, archived
Headers show

Comments

Joshua Lock - March 28, 2011, 2:28 p.m.
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
Richard Purdie - March 28, 2011, 3:58 p.m.
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
Joshua Lock - March 28, 2011, 6:47 p.m.
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

Patch

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"