summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-08-27 23:04:35 +0000
committerRichard Purdie <richard@openedhand.com>2006-08-27 23:04:35 +0000
commit1489f00aacb737e2d2ea22ccf575b13148ba98e8 (patch)
tree3ed1443ccfedd89abad6f2063e6a183342918593 /meta
parent92026fcdb0d01359d72e81c8adda03271c417992 (diff)
downloadpoky-1489f00aacb737e2d2ea22ccf575b13148ba98e8.tar.gz
pango: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@665 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/pango/pango-1.13.3/opentype-makefile.patch20
-rw-r--r--meta/packages/pango/pango_1.10.2.bb (renamed from meta/packages/pango/pango_1.10.1.bb)10
-rw-r--r--meta/packages/pango/pango_1.12.0.bb4
3 files changed, 27 insertions, 7 deletions
diff --git a/meta/packages/pango/pango-1.13.3/opentype-makefile.patch b/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
new file mode 100644
index 0000000000..9f68420bc5
--- /dev/null
+++ b/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
@@ -0,0 +1,20 @@
1--- pango/opentype/Makefile.am~ 2006-07-05 14:49:28.000000000 +0200
2+++ pango/opentype/Makefile.am 2006-07-05 14:49:28.000000000 +0200
3@@ -5,7 +5,7 @@
4
5 noinst_LTLIBRARIES = libharfbuzz-1.la
6
7-SOURCES = \
8+MAIN_SOURCES = \
9 ftglue.c \
10 harfbuzz-buffer.c \
11 harfbuzz-dump.c \
12@@ -34,7 +34,7 @@
13 harfbuzz-open-private.h
14
15 libharfbuzz_1_la_SOURCES = \
16- $(SOURCES) \
17+ $(MAIN_SOURCES) \
18 $(PUBLICHEADERS) \
19 $(PRIVATEHEADERS)
20
diff --git a/meta/packages/pango/pango_1.10.1.bb b/meta/packages/pango/pango_1.10.2.bb
index 869b146d56..74730e18db 100644
--- a/meta/packages/pango/pango_1.10.1.bb
+++ b/meta/packages/pango/pango_1.10.2.bb
@@ -1,12 +1,14 @@
1LICENSE = "LGPL" 1LICENSE = "LGPL"
2SECTION = "x11/libs" 2SECTION = "x11/libs"
3# Xt needed to keep autoconf's check for X11 happy 3# Xt needed to keep autoconf's check for X11 happy
4DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" 4DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
5DESCRIPTION = "The goal of the Pango project is to provide an \ 5DESCRIPTION = "The goal of the Pango project is to provide an \
6Open Source framework for the layout and rendering of \ 6Open Source framework for the layout and rendering of \
7internationalized text." 7internationalized text."
8PR = "r0" 8PR = "r0"
9 9
10RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
11
10# seems to go wrong with default cflags 12# seems to go wrong with default cflags
11FULL_OPTIMIZATION_arm = "-O2" 13FULL_OPTIMIZATION_arm = "-O2"
12 14
@@ -24,11 +26,7 @@ FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
24LIBV = "1.4.0" 26LIBV = "1.4.0"
25 27
26do_stage () { 28do_stage () {
27 for lib in pango pangox pangoft2 pangoxft pangocairo; do 29autotools_stage_all
28 oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
29 done
30 install -d ${STAGING_INCDIR}/pango
31 install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
32} 30}
33 31
34postinst_prologue() { 32postinst_prologue() {
diff --git a/meta/packages/pango/pango_1.12.0.bb b/meta/packages/pango/pango_1.12.0.bb
index e06e659b7b..a28ef055d9 100644
--- a/meta/packages/pango/pango_1.12.0.bb
+++ b/meta/packages/pango/pango_1.12.0.bb
@@ -1,12 +1,14 @@
1LICENSE = "LGPL" 1LICENSE = "LGPL"
2SECTION = "x11/libs" 2SECTION = "x11/libs"
3# Xt needed to keep autoconf's check for X11 happy 3# Xt needed to keep autoconf's check for X11 happy
4DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo" 4DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
5DESCRIPTION = "The goal of the Pango project is to provide an \ 5DESCRIPTION = "The goal of the Pango project is to provide an \
6Open Source framework for the layout and rendering of \ 6Open Source framework for the layout and rendering of \
7internationalized text." 7internationalized text."
8PR = "r0" 8PR = "r0"
9 9
10RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
11
10# seems to go wrong with default cflags 12# seems to go wrong with default cflags
11FULL_OPTIMIZATION_arm = "-O2" 13FULL_OPTIMIZATION_arm = "-O2"
12 14