diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-29 14:08:49 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-31 13:29:48 +0000 |
commit | 691f7e4fa2897168abc4ddd59b1dd0eed045c8d4 (patch) | |
tree | 7178847a91ac9e7ece7d727aa437e90a4f35ab36 | |
parent | 70efb8d66163f4341b35f95e3fa6490d162bb092 (diff) | |
download | poky-691f7e4fa2897168abc4ddd59b1dd0eed045c8d4.tar.gz |
pango.inc: misc dependency fixes
- Add glib-2.0-native dependency for target
- Add fontconfig-native and freetype-native dependencies for native
- Drop unnecessary dependency on zlib for all
(From OE-Core rev: 5174b53b33fe6b2f9d71f7c414e2c83bda9f6c94)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 63c7d1e1c0..ffa38d8995 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc | |||
@@ -9,14 +9,10 @@ BUGTRACKER = "http://bugzilla.gnome.org" | |||
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | LICENSE = "LGPLv2.0+" | 10 | LICENSE = "LGPLv2.0+" |
11 | 11 | ||
12 | X11DEPENDS = "virtual/libx11 libxft" | 12 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" |
13 | DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz" | ||
14 | 13 | ||
15 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | 14 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
16 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" | 15 | PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" |
17 | |||
18 | BBCLASSEXTEND = "native" | ||
19 | DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" | ||
20 | 16 | ||
21 | inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even | 17 | inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even |
22 | 18 | ||
@@ -43,3 +39,5 @@ RDEPENDS_${PN}-ptest += "liberation-fonts" | |||
43 | 39 | ||
44 | RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ | 40 | RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ |
45 | pango-module-basic-fc pango-module-arabic-lang" | 41 | pango-module-basic-fc pango-module-arabic-lang" |
42 | |||
43 | BBCLASSEXTEND = "native" | ||