pango: Sync with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@665 311d38ba-8fff-0310-9ca6-ca027cbcb966

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 @@
+--- 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 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 @@
 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 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 @@
 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"