summaryrefslogtreecommitdiff
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
parent92026fcdb0d01359d72e81c8adda03271c417992 (diff)
downloadopenembedded-core-1489f00aacb737e2d2ea22ccf575b13148ba98e8.tar.gz
openembedded-core-1489f00aacb737e2d2ea22ccf575b13148ba98e8.tar.bz2
openembedded-core-1489f00aacb737e2d2ea22ccf575b13148ba98e8.tar.xz
openembedded-core-1489f00aacb737e2d2ea22ccf575b13148ba98e8.zip
pango: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@665 311d38ba-8fff-0310-9ca6-ca027cbcb966
-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 000000000..9f68420bc
--- /dev/null
+++ b/meta/packages/pango/pango-1.13.3/opentype-makefile.patch
@@ -0,0 +1,20 @@
+--- pango/opentype/Makefile.am~ 2006-07-05 14:49:28.000000000 +0200
++++ pango/opentype/Makefile.am 2006-07-05 14:49:28.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ noinst_LTLIBRARIES = libharfbuzz-1.la
+
+-SOURCES = \
++MAIN_SOURCES = \
+ ftglue.c \
+ harfbuzz-buffer.c \
+ harfbuzz-dump.c \
+@@ -34,7 +34,7 @@
+ harfbuzz-open-private.h
+
+ libharfbuzz_1_la_SOURCES = \
+- $(SOURCES) \
++ $(MAIN_SOURCES) \
+ $(PUBLICHEADERS) \
+ $(PRIVATEHEADERS)
+
diff --git a/meta/packages/pango/pango_1.10.1.bb b/meta/packages/pango/pango_1.10.2.bb
index 869b146d5..74730e18d 100644
--- a/meta/packages/pango/pango_1.10.1.bb
+++ b/meta/packages/pango/pango_1.10.2.bb
@@ -1,12 +1,14 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
@@ -24,11 +26,7 @@ FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
LIBV = "1.4.0"
do_stage () {
- for lib in pango pangox pangoft2 pangoxft pangocairo; do
- oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
- done
- install -d ${STAGING_INCDIR}/pango
- install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
+autotools_stage_all
}
postinst_prologue() {
diff --git a/meta/packages/pango/pango_1.12.0.bb b/meta/packages/pango/pango_1.12.0.bb
index e06e659b7..a28ef055d 100644
--- a/meta/packages/pango/pango_1.12.0.bb
+++ b/meta/packages/pango/pango_1.12.0.bb
@@ -1,12 +1,14 @@
LICENSE = "LGPL"
SECTION = "x11/libs"
# Xt needed to keep autoconf's check for X11 happy
-DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft libxt gtk-doc cairo"
DESCRIPTION = "The goal of the Pango project is to provide an \
Open Source framework for the layout and rendering of \
internationalized text."
PR = "r0"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"