summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-18 10:10:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:07 +0000
commitc19036abc020a99bb2faa70df6c11ad42884b47d (patch)
tree63d2abaafb54316038b9f9469520aed9f8e74401
parent43b29d9d07200396545dfdefd079794ca5074478 (diff)
downloadpoky-c19036abc020a99bb2faa70df6c11ad42884b47d.tar.gz
pango: use ptest-gnome
Instead of hand-coding the ptest integration, use the ptest-gnome class. (From OE-Core rev: 70674d4ee2a24971d1bab048906fa8d0d2ba2e75) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango.inc13
1 files changed, 3 insertions, 10 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 04143bdca5..78cd560af7 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -12,16 +12,13 @@ LICENSE = "LGPLv2.0+"
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native"
14 14
15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}"
17
18PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
19PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native"
20 17
21BBCLASSEXTEND = "native" 18BBCLASSEXTEND = "native"
22DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" 19DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
23 20
24inherit gnomebase gtk-doc qemu ptest 21inherit gnomebase gtk-doc qemu ptest-gnome
25 22
26EXTRA_AUTORECONF = "" 23EXTRA_AUTORECONF = ""
27 24
@@ -46,11 +43,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
46FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" 43FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
47FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" 44FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
48 45
49FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \ 46RDEPENDS_${PN}-ptest += "liberation-fonts"
50 ${datadir}/installed-tests/pango"
51FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug"
52
53RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts"
54 47
55RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ 48RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
56 pango-module-basic-fc pango-module-arabic-lang" 49 pango-module-basic-fc pango-module-arabic-lang"