summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/pango
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-02-27 13:33:41 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-28 10:29:01 +0100
commit6ef60f762e96a81996cd016a09381d5443676d1f (patch)
treede413903e7b3d563042bf660ed19eeaf2e2b526f /meta-oe/recipes-graphics/pango
parent767492efaa06c526f5526f5b47373299ebfd04d4 (diff)
downloadmeta-openembedded-6ef60f762e96a81996cd016a09381d5443676d1f.tar.gz
pango: use pango.inc from oe-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics/pango')
-rw-r--r--meta-oe/recipes-graphics/pango/pango.inc53
-rw-r--r--meta-oe/recipes-graphics/pango/pango/no-tests.patch15
-rw-r--r--meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch79
-rw-r--r--meta-oe/recipes-graphics/pango/pango_1.29.4.bb9
4 files changed, 7 insertions, 149 deletions
diff --git a/meta-oe/recipes-graphics/pango/pango.inc b/meta-oe/recipes-graphics/pango/pango.inc
deleted file mode 100644
index 341d0e3e2..000000000
--- a/meta-oe/recipes-graphics/pango/pango.inc
+++ /dev/null
@@ -1,53 +0,0 @@
1DESCRIPTION = "The goal of the Pango project is to provide an \
2Open Source framework for the layout and rendering of \
3internationalized text."
4LICENSE = "LGPL"
5
6inherit gnome
7EXTRA_AUTORECONF = ""
8
9SECTION = "x11/libs"
10
11DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc cairo"
12
13DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
14BBCLASSEXTEND = "native"
15
16PACKAGES_DYNAMIC = "pango-module-*"
17PACKAGES_DYNAMIC_virtclass-native = ""
18
19RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
20
21INC_PR = "r2"
22
23# seems to go wrong with default cflags
24FULL_OPTIMIZATION_arm = "-O2"
25
26SRC_URI += "file://no-tests.patch \
27 "
28
29EXTRA_OECONF += "--disable-glibtest \
30 --enable-explicit-deps=no \
31 --disable-debug"
32
33LEAD_SONAME = "libpango-1.0*"
34LIBV = "1.6.0"
35
36FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
37FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
38FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
39
40postinst_prologue() {
41if [ "x$D" != "x" ]; then
42 exit 1
43fi
44
45}
46
47python populate_packages_prepend () {
48 prologue = bb.data.getVar("postinst_prologue", d, 1)
49
50 modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
51
52 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
53}
diff --git a/meta-oe/recipes-graphics/pango/pango/no-tests.patch b/meta-oe/recipes-graphics/pango/pango/no-tests.patch
deleted file mode 100644
index b38212612..000000000
--- a/meta-oe/recipes-graphics/pango/pango/no-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- pango-1.2.5/Makefile.am~no-tests 2003-01-30 22:43:47.000000000 +0100
7+++ pango-1.2.5/Makefile.am 2004-03-11 11:31:25.000000000 +0100
8@@ -1,6 +1,6 @@
9 ## Process this file with automake to create Makefile.in.
10
11-SUBDIRS= pango modules examples docs tools tests
12+SUBDIRS= pango modules examples docs tools
13
14 EXTRA_DIST = \
15 pango.pc.in \
diff --git a/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch b/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch
deleted file mode 100644
index f021591a9..000000000
--- a/meta-oe/recipes-graphics/pango/pango/pkgconfig_fixes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1Index: pango-1.18.1/configure.in
2===================================================================
3--- pango-1.18.1.orig/configure.in 2007-08-28 00:29:54.000000000 +0000
4+++ pango-1.18.1/configure.in 2007-11-12 19:21:22.000000000 +0000
5@@ -226,13 +226,9 @@
6 #
7 # Checks for FreeType
8 #
9- FREETYPE_LIBS=
10- FREETYPE_CFLAGS=
11- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
12- if test "x$FREETYPE_CONFIG" != "xno" ; then
13- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
14- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
15+ PKG_CHECK_MODULES(FREETYPE, freetype2 >= 1.0.1, have_freetype=true, AC_MSG_RESULT([no]))
16
17+ if $have_freetype ; then
18 pango_save_ldflags=$LDFLAGS
19 LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
20 AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :)
21Index: pango-1.18.1/pangoft2-uninstalled.pc.in
22===================================================================
23--- pango-1.18.1.orig/pangoft2-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000
24+++ pango-1.18.1/pangoft2-uninstalled.pc.in 2007-11-12 19:23:44.000000000 +0000
25@@ -1,7 +1,7 @@
26 Name: Pango FT2 Uninstalled
27 Description: Freetype 2.0 font support for Pango, Not Installed
28 Version: @VERSION@
29-Requires: pango
30-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la @FREETYPE_LIBS@
31-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
32+Requires: pango freetype2
33+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la
34+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
35
36Index: pango-1.18.1/pangoft2.pc.in
37===================================================================
38--- pango-1.18.1.orig/pangoft2.pc.in 2007-07-05 21:30:28.000000000 +0000
39+++ pango-1.18.1/pangoft2.pc.in 2007-11-12 19:27:05.000000000 +0000
40@@ -6,7 +6,7 @@
41 Name: Pango FT2
42 Description: Freetype 2.0 font support for Pango
43 Version: @VERSION@
44-Requires: pango
45-Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
46-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
47+Requires: pango freetype2 fontconfig
48+Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@
49+Cflags: -I${includedir}/pango-1.0
50
51Index: pango-1.18.1/pangoxft-uninstalled.pc.in
52===================================================================
53--- pango-1.18.1.orig/pangoxft-uninstalled.pc.in 2007-07-05 21:30:28.000000000 +0000
54+++ pango-1.18.1/pangoxft-uninstalled.pc.in 2007-11-12 19:22:24.000000000 +0000
55@@ -1,7 +1,7 @@
56 Name: Pango Xft Uninstalled
57 Description: Xft font support for Pango, Not Installed
58 Version: @VERSION@
59-Requires: pango
60-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@
61-Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
62+Requires: pango xft
63+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la
64+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@
65
66Index: pango-1.18.1/pangoxft.pc.in
67===================================================================
68--- pango-1.18.1.orig/pangoxft.pc.in 2007-07-05 21:30:28.000000000 +0000
69+++ pango-1.18.1/pangoxft.pc.in 2007-11-12 19:21:57.000000000 +0000
70@@ -6,6 +6,6 @@
71 Name: Pango Xft
72 Description: Xft font support for Pango
73 Version: @VERSION@
74-Requires: pango pangoft2
75-Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
76-Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@
77+Requires: pango pangoft2 xft
78+Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@
79+Cflags: -I${includedir}/pango-1.0
diff --git a/meta-oe/recipes-graphics/pango/pango_1.29.4.bb b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
index 70f881502..65c402837 100644
--- a/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
+++ b/meta-oe/recipes-graphics/pango/pango_1.29.4.bb
@@ -1,9 +1,14 @@
1require pango.inc 1require recipes-graphics/pango/pango.inc
2
3BBCLASSEXTEND = "native"
4DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
2 5
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 7
5SRC_URI[archive.md5sum] = "a5ee785f4f31d6bdd8625a09ea3f8b4b" 8SRC_URI[archive.md5sum] = "a5ee785f4f31d6bdd8625a09ea3f8b4b"
6SRC_URI[archive.sha256sum] = "f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b" 9SRC_URI[archive.sha256sum] = "f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b"
7 10
8PR = "${INC_PR}.1" 11SRC_URI += "file://no-tests.patch"
12
13PR = "r3"
9 14