From edfaa04ce3e190ddb9be747c0e5537587a93a465 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 4 Feb 2016 10:42:33 +0000 Subject: pango: merge bb and inc (From OE-Core rev: 71e374aa5b6c466cc6ddfffeaa7cee9a6b3d2f0e) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango.inc | 43 -------------------------- meta/recipes-graphics/pango/pango_1.38.1.bb | 47 +++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango.inc (limited to 'meta/recipes-graphics/pango') diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc deleted file mode 100644 index ffa38d8995..0000000000 --- a/meta/recipes-graphics/pango/pango.inc +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" - -inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even - -EXTRA_AUTORECONF = "" - -EXTRA_OECONF = "--disable-introspection \ - --disable-debug \ - " - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi -} - -FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -RDEPENDS_${PN}-ptest += "liberation-fonts" - -RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ - pango-module-basic-fc pango-module-arabic-lang" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb index d85c17bd25..d408ef00e1 100644 --- a/meta/recipes-graphics/pango/pango_1.38.1.bb +++ b/meta/recipes-graphics/pango/pango_1.38.1.bb @@ -1,9 +1,50 @@ -require pango.inc +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -SRC_URI += "file://run-ptest \ -" +SRC_URI += "file://run-ptest" SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" + +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" + +inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even + +EXTRA_AUTORECONF = "" + +EXTRA_OECONF = "--disable-introspection \ + --disable-debug \ + " + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +# This binary needs to be compiled for the host architecture. This isn't pretty! +do_compile_prepend_class-target () { + if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + make CC="${BUILD_CC}" CFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode + fi +} + +FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +RDEPENDS_${PN}-ptest += "liberation-fonts" + +RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ + pango-module-basic-fc pango-module-arabic-lang" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf