[gimp] build: Add HarfBuzz dependency
- From: Mukund Sivaraman <muks src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build: Add HarfBuzz dependency
- Date: Fri, 2 May 2014 18:58:04 +0000 (UTC)
commit 81e955ed1b9cff022d14e0f6f621e42f48e9549d
Author: Mukund Sivaraman <muks banu com>
Date: Sat May 3 00:01:07 2014 +0530
build: Add HarfBuzz dependency
INSTALL.in | 5 +++++
app/Makefile.am | 1 +
app/tests/Makefile.am | 1 +
app/text/Makefile.am | 1 +
configure.ac | 5 +++++
devel-docs/app/Makefile.am | 1 +
6 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/INSTALL.in b/INSTALL.in
index fa4f1ad..2ec5410 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -57,6 +57,11 @@ header files installed.
and fontconfig @FONTCONFIG_REQUIRED_VERSION@ or newer. Older versions are known to have
bugs that seriously affect the stability of GIMP.
+ We also require HarfBuzz @HARFBUZZ_REQUIRED_VERSION@ or newer, an
+ OpenType text shaping tool. As this is a dependency for Pango, you
+ will likely have it installed, but you may have to install a
+ development package for the headers.
+
7. Access of remote files is implemented in the URI plug-in. There
are several possible implementations for this. The implementation
used is determined when you configure GIMP. By default the
diff --git a/app/Makefile.am b/app/Makefile.am
index 2931f8b..b145419 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -175,6 +175,7 @@ gimpconsoleldadd = \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
$(PANGOCAIRO_LIBS) \
+ $(HARFBUZZ_LIBS) \
$(CAIRO_LIBS) \
$(GEGL_LIBS) \
$(GLIB_LIBS) \
diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
index fe584c0..13ccd03 100644
--- a/app/tests/Makefile.am
+++ b/app/tests/Makefile.am
@@ -122,6 +122,7 @@ LDADD = \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS) \
$(PANGOCAIRO_LIBS) \
+ $(HARFBUZZ_LIBS) \
$(CAIRO_LIBS) \
$(GEGL_LIBS) \
$(GIO_LIBS) \
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
index 4e9c2e3..9af241b 100644
--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(PANGOCAIRO_CFLAGS) \
+ $(HARFBUZZ_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
diff --git a/configure.ac b/configure.ac
index fa8cbd5..405d727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ m4_define([cairo_pdf_required_version], [1.12.2])
m4_define([pangocairo_required_version], [1.29.4])
m4_define([fontconfig_required_version], [2.2.0])
m4_define([freetype2_required_version], [2.1.7])
+m4_define([harfbuzz_required_version], [0.9.27])
m4_define([gtkdoc_required_version], [1.0])
m4_define([webkit_required_version], [1.6.1])
m4_define([alsa_required_version], [1.0.0])
@@ -130,6 +131,7 @@ PANGOCAIRO_REQUIRED_VERSION=pangocairo_required_version
BABL_REQUIRED_VERSION=babl_required_version
FONTCONFIG_REQUIRED_VERSION=fontconfig_required_version
FREETYPE2_REQUIRED_VERSION=freetype2_required_version
+HARFBUZZ_REQUIRED_VERSION=harfbuzz_required_version
ATK_REQUIRED_VERSION=atk_required_version
INTLTOOL_REQUIRED_VERSION=intltool_required_version
AC_SUBST(GLIB_REQUIRED_VERSION)
@@ -142,6 +144,7 @@ AC_SUBST(PANGOCAIRO_REQUIRED_VERSION)
AC_SUBST(BABL_REQUIRED_VERSION)
AC_SUBST(FONTCONFIG_REQUIRED_VERSION)
AC_SUBST(FREETYPE2_REQUIRED_VERSION)
+AC_SUBST(HARFBUZZ_REQUIRED_VERSION)
AC_SUBST(ATK_REQUIRED_VERSION)
AC_SUBST(INTLTOOL_REQUIRED_VERSION)
@@ -624,6 +627,8 @@ if test "x$FREETYPE_CONFIG" != "xno" ; then
fi
AC_SUBST(FREETYPE_LIBS)
+PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= harfbuzz_required_version)
+
PKG_CHECK_MODULES(GEXIV2, gexiv2 >= gexiv2_required_version)
##########################################
diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am
index d6fd158..322d125 100644
--- a/devel-docs/app/Makefile.am
+++ b/devel-docs/app/Makefile.am
@@ -97,6 +97,7 @@ GTKDOC_LIBS = \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
+ $(HARFBUZZ_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GEGL_LIBS) \
$(RT_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]