summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-04 10:42:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 23:10:44 +0000
commitedfaa04ce3e190ddb9be747c0e5537587a93a465 (patch)
tree2b05a4d626cb81384a37fd1e4816486ac3fb6b87
parent00ccf51f175c469f35cba63e1cca2d96bcc1e804 (diff)
downloadpoky-edfaa04ce3e190ddb9be747c0e5537587a93a465.tar.gz
pango: merge bb and inc
(From OE-Core rev: 71e374aa5b6c466cc6ddfffeaa7cee9a6b3d2f0e) 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.inc43
-rw-r--r--meta/recipes-graphics/pango/pango_1.38.1.bb47
2 files changed, 44 insertions, 46 deletions
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 @@
1SUMMARY = "Framework for layout and rendering of internationalized text"
2DESCRIPTION = "Pango is a library for laying out and rendering of text, \
3with an emphasis on internationalization. Pango can be used anywhere \
4that text layout is needed, though most of the work on Pango so far has \
5been done in the context of the GTK+ widget toolkit. Pango forms the \
6core of text and font handling for GTK+-2.x."
7HOMEPAGE = "http://www.pango.org/"
8BUGTRACKER = "http://bugzilla.gnome.org"
9SECTION = "libs"
10LICENSE = "LGPLv2.0+"
11
12DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
13
14PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
15PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
16
17inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even
18
19EXTRA_AUTORECONF = ""
20
21EXTRA_OECONF = "--disable-introspection \
22 --disable-debug \
23 "
24
25LEAD_SONAME = "libpango-1.0*"
26LIBV = "1.8.0"
27
28# This binary needs to be compiled for the host architecture. This isn't pretty!
29do_compile_prepend_class-target () {
30 if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
31 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
32 fi
33}
34
35FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
36FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
37
38RDEPENDS_${PN}-ptest += "liberation-fonts"
39
40RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
41 pango-module-basic-fc pango-module-arabic-lang"
42
43BBCLASSEXTEND = "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 @@
1require pango.inc 1SUMMARY = "Framework for layout and rendering of internationalized text"
2DESCRIPTION = "Pango is a library for laying out and rendering of text, \
3with an emphasis on internationalization. Pango can be used anywhere \
4that text layout is needed, though most of the work on Pango so far has \
5been done in the context of the GTK+ widget toolkit. Pango forms the \
6core of text and font handling for GTK+-2.x."
7HOMEPAGE = "http://www.pango.org/"
8BUGTRACKER = "http://bugzilla.gnome.org"
9SECTION = "libs"
10LICENSE = "LGPLv2.0+"
2 11
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 12LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 13
5SRC_URI += "file://run-ptest \ 14SRC_URI += "file://run-ptest"
6"
7 15
8SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" 16SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d"
9SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" 17SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7"
18
19DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz"
20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
22PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft"
23
24inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even
25
26EXTRA_AUTORECONF = ""
27
28EXTRA_OECONF = "--disable-introspection \
29 --disable-debug \
30 "
31
32LEAD_SONAME = "libpango-1.0*"
33LIBV = "1.8.0"
34
35# This binary needs to be compiled for the host architecture. This isn't pretty!
36do_compile_prepend_class-target () {
37 if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
38 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
39 fi
40}
41
42FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
43FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
44
45RDEPENDS_${PN}-ptest += "liberation-fonts"
46
47RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
48 pango-module-basic-fc pango-module-arabic-lang"
49
50BBCLASSEXTEND = "native"