pango: version bump 1.29.4 -> 1.42.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 17 insertions, 72 deletions

diff --git a/rules/pango.in b/rules/pango.in
index f9c4810b3..6aead868b 100644
--- a/rules/pango.in
+++ b/rules/pango.in
@@ -6,10 +6,11 @@ menuconfig PANGO
 	select LIBC_M
 	select CAIRO
 	select CAIRO_FREETYPE
-	select GOBJECT_INTROSPECTION	if PANGO_INTROSPECTION
 	select CAIRO_GOBJECT		if PANGO_INTROSPECTION
+	select FRIBIDI
 	select GLIB
-	select WINE if PANGO__WINE
+	select GOBJECT_INTROSPECTION	if PANGO_INTROSPECTION
+	select HARFBUZZ
 
 if PANGO
 
@@ -17,50 +18,4 @@ config PANGO_INTROSPECTION
 	bool
 	default GOBJECT_INTROSPECTION_HELPER
 
-config PANGO_TARGET_X11
-	bool
-	default GTK_TARGET_X11
-
-
-config PANGO__WINE
-	bool "extra dep for MINGW"
-
-
-config PANGO_ARABIC
-	bool
-	prompt "arabic"
-
-config PANGO_BASIC
-	bool
-	default y
-	prompt "basic"
-
-config PANGO_HANGUL
-	bool
-	prompt "hangul"
-
-config PANGO_HEBREW
-	bool
-	prompt "hebrew"
-
-config PANGO_INDIC
-	bool
-	prompt "indic"
-
-config PANGO_KHMER
-	bool
-	prompt "khmer"
-
-config PANGO_SYRIAC
-	bool
-	prompt "syriac"
-
-config PANGO_THAI
-	bool
-	prompt "thai"
-
-config PANGO_TIBETAN
-	bool
-	prompt "tibetan"
-
 endif
diff --git a/rules/pango.make b/rules/pango.make
index 113e241c7..a8506df04 100644
--- a/rules/pango.make
+++ b/rules/pango.make
@@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_PANGO) += pango
 #
 # Paths and names
 #
-PANGO_VERSION	:= 1.29.4
-PANGO_MD5	:= a5ee785f4f31d6bdd8625a09ea3f8b4b
+PANGO_VERSION	:= 1.42.1
+PANGO_MD5	:= d66d2f29e92d33b6da5e19c563520f7c
 PANGO		:= pango-$(PANGO_VERSION)
-PANGO_SUFFIX	:= tar.bz2
-PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/$(PANGO).$(PANGO_SUFFIX)
+PANGO_SUFFIX	:= tar.xz
+PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/$(basename $(PANGO_VERSION))/$(PANGO).$(PANGO_SUFFIX)
 PANGO_SOURCE	:= $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
 PANGO_DIR	:= $(BUILDDIR)/$(PANGO)
 PANGO_LICENSE	:= LGPL-2.0-or-later
@@ -31,35 +31,21 @@ PANGO_LICENSE	:= LGPL-2.0-or-later
 # Prepare
 # ----------------------------------------------------------------------------
 
-PANGO_PATH	:= PATH=$(CROSS_PATH)
-PANGO_ENV 	:= $(CROSS_ENV)
-
 #
 # autoconf
 #
-PANGO_MODULES-$(PTXCONF_PANGO_BASIC)	+= basic-fc,basic-win32,basic-x,basic-atsui
-PANGO_MODULES-$(PTXCONF_PANGO_ARABIC)	+= arabic-fc
-PANGO_MODULES-$(PTXCONF_PANGO_HANGUL)	+= hangul-fc
-PANGO_MODULES-$(PTXCONF_PANGO_HEBREW)	+= hebrew-fc
-PANGO_MODULES-$(PTXCONF_PANGO_INDIC)	+= indic-fc,indic-lang
-PANGO_MODULES-$(PTXCONF_PANGO_KHMER)	+= khmer-fc
-PANGO_MODULES-$(PTXCONF_PANGO_SYRIAC)	+= syriac-fc
-PANGO_MODULES-$(PTXCONF_PANGO_THAI)	+= thai-fc
-PANGO_MODULES-$(PTXCONF_PANGO_TIBETAN)	+= tibetan-fc
-
 PANGO_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--x-includes=$(XORG_PREFIX)/include \
-	--x-libraries=$(XORG_LIBDIR) \
+	--disable-debug \
+	--disable-rebuilds \
+	--$(call ptx/endis, PTXCONF_PANGO_INTROSPECTION)-introspection \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
-	--disable-man \
 	--disable-doc-cross-references \
-	--enable-explicit-deps=no \
-	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-x \
-	--with-included-modules=$(subst $(space),$(comma),$(PANGO_MODULES-y)) \
-	--without-dynamic-modules
+	--disable-installed-tests \
+	--without-xft \
+	--with-cairo
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -77,6 +63,10 @@ $(STATEDIR)/pango.targetinstall:
 	@$(call install_lib, pango, 0, 0, 0644, libpango-1.0)
 	@$(call install_lib, pango, 0, 0, 0644, libpangoft2-1.0)
 	@$(call install_lib, pango, 0, 0, 0644, libpangocairo-1.0)
+ifdef PTXCONF_PANGO_INTROSPECTION
+	@$(call install_copy, pango, 0, 0, 644, -, \
+		/usr/lib/girepository-1.0/Pango-1.0.typelib)
+endif
 
 	@$(call install_finish, pango)