Patchwork weston: add harfbuzz dependency

login
register
mail settings
Submitter Alexandru DAMIAN
Date July 23, 2013, 11:01 a.m.
Message ID <1374577279-21342-1-git-send-email-alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/54213/
State New
Headers show

Comments

Alexandru DAMIAN - July 23, 2013, 11:01 a.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

Weston 1.1.0 has a build time dependency on libharfbuzz,
so we add it.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---
 meta/recipes-graphics/wayland/weston_1.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - July 23, 2013, 12:44 p.m.
On Tue, Jul 23, 2013 at 12:01:19PM +0100, Alex DAMIAN wrote:
> From: Alexandru DAMIAN <alexandru.damian@intel.com>
> 
> Weston 1.1.0 has a build time dependency on libharfbuzz,
> so we add it.

I don't see that dependency in weston/master repo, are you sure it isn't
pulled by cairo/pango?

> 
> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
> ---
>  meta/recipes-graphics/wayland/weston_1.1.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/wayland/weston_1.1.0.bb b/meta/recipes-graphics/wayland/weston_1.1.0.bb
> index 7327b98..e324134 100644
> --- a/meta/recipes-graphics/wayland/weston_1.1.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
> @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa5
>  inherit autotools pkgconfig useradd
>  
>  DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
> -DEPENDS += "wayland mesa virtual/egl"
> +DEPENDS += "wayland mesa virtual/egl harfbuzz"
>  
>  EXTRA_OECONF = "--disable-android-compositor \
>                  --enable-setuid-install \
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Alexandru DAMIAN - July 23, 2013, 1:06 p.m.
weston.spec clearly describes the dependency.

And I found it while trying to compile. It's needed.


On Tue, Jul 23, 2013 at 1:44 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Tue, Jul 23, 2013 at 12:01:19PM +0100, Alex DAMIAN wrote:
> > From: Alexandru DAMIAN <alexandru.damian@intel.com>
> >
> > Weston 1.1.0 has a build time dependency on libharfbuzz,
> > so we add it.
>
> I don't see that dependency in weston/master repo, are you sure it isn't
> pulled by cairo/pango?
>
> >
> > Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
> > ---
> >  meta/recipes-graphics/wayland/weston_1.1.0.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/wayland/weston_1.1.0.bbb/meta/recipes-graphics/wayland/
> weston_1.1.0.bb
> > index 7327b98..e324134 100644
> > --- a/meta/recipes-graphics/wayland/weston_1.1.0.bb
> > +++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
> > @@ -18,7 +18,7 @@ SRC_URI[sha256sum] =
> "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa5
> >  inherit autotools pkgconfig useradd
> >
> >  DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
> > -DEPENDS += "wayland mesa virtual/egl"
> > +DEPENDS += "wayland mesa virtual/egl harfbuzz"
> >
> >  EXTRA_OECONF = "--disable-android-compositor \
> >                  --enable-setuid-install \
> > --
> > 1.8.1.2
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
Ross Burton - July 23, 2013, 1:15 p.m.
On 23 July 2013 14:06, Damian, Alexandru <alexandru.damian@intel.com> wrote:
> And I found it while trying to compile. It's needed.

Sure, but it's not a direct link in weston:

$ git describe  HEAD
1.1.0
$ git grep -i harfbuzz
$

However, pangocairo *is* checked for and linked against, and that
isn't in DEPENDS, so the correct fix is to add "pango" to DEPENDS.

Ross

Patch

diff --git a/meta/recipes-graphics/wayland/weston_1.1.0.bb b/meta/recipes-graphics/wayland/weston_1.1.0.bb
index 7327b98..e324134 100644
--- a/meta/recipes-graphics/wayland/weston_1.1.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.1.0.bb
@@ -18,7 +18,7 @@  SRC_URI[sha256sum] = "e7715d2c731f77a729c994a599ffdaebac1307b2dd9336136706869fa5
 inherit autotools pkgconfig useradd
 
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg"
-DEPENDS += "wayland mesa virtual/egl"
+DEPENDS += "wayland mesa virtual/egl harfbuzz"
 
 EXTRA_OECONF = "--disable-android-compositor \
                 --enable-setuid-install \