diff options
| author | Hadrien Boutteville <hadrien.boutteville@gmail.com> | 2014-07-08 15:57:05 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-15 23:19:33 +0200 |
| commit | 08d3ec14d4250caa487d2f144c3deea85479e6d3 (patch) | |
| tree | 4aa05374a0692f3b5a11c51601bf5bf631eacc9b /package/pango/pango.mk | |
| parent | b39abd4589597992b418f8b53e9b837054269c2c (diff) | |
| download | buildroot-08d3ec14d4250caa487d2f144c3deea85479e6d3.tar.gz buildroot-08d3ec14d4250caa487d2f144c3deea85479e6d3.zip | |
pango: bump to version 1.36.3
Note: HarfBuzz is needed to build Pango. Configure does not return an
error if HarfBuzz is missing, but without HarfBuzz it can't enable any
backends.
Remove patch pango-no-const-return because it is applied upstream in
this version.
Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pango/pango.mk')
| -rw-r--r-- | package/pango/pango.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 7e5f9a7e1a..ce1a4f3f40 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -4,9 +4,9 @@ # ################################################################################ -PANGO_VERSION_MAJOR = 1.28 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).4 -PANGO_SOURCE = pango-$(PANGO_VERSION).tar.bz2 +PANGO_VERSION_MAJOR = 1.36 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_AUTORECONF = YES PANGO_INSTALL_STAGING = YES @@ -40,26 +40,27 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_use_included_regex=no gl_cv_c_restrict=no \ ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config -PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug +PANGO_CONF_OPT = --enable-explicit-deps=no \ + --disable-debug \ + --disable-gtk-doc-html PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ host-pkgconf \ libglib2 \ cairo \ + harfbuzz \ fontconfig \ freetype ifeq ($(BR2_PACKAGE_XORG7),y) - PANGO_CONF_OPT += --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest + PANGO_CONF_OPT += --x-includes=$(STAGING_DIR)/usr/include/X11 \ + --x-libraries=$(STAGING_DIR)/usr/lib PANGO_DEPENDENCIES += xlib_libX11 -else - PANGO_CONF_OPT += --without-x endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy) PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender + PANGO_CONF_OPT += --with-xft endif define PANGO_INSTALL_INITSCRIPT |
