[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/freetype RepositoryExternal.mk

[Zolnai Tamás]

 RepositoryExternal.mk                         |    2 +-
 config_host.mk.in                             |    1 +
 configure.ac                                  |   17 +++++++++++++++++
 external/freetype/ExternalProject_freetype.mk |   20 ++++++++++----------
 external/freetype/Module_freetype.mk          |    2 +-
 external/freetype/README                      |    4 +---
 6 files changed, 31 insertions(+), 15 deletions(-)

New commits:
commit b6cbb15026e2df1e985f19c5bb723f64a26f2658
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Apr 18 10:10:39 2014 +0200

    Freetype is needed by libgltf on all platforms
    
    Change-Id: I042cbc5f4cabfa7ec387594189e2f86be6ec7fbf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 722e22f..a371f2f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1254,7 +1254,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else ifeq ($(OS),ANDROID)
+else ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF)))
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
diff --git a/config_host.mk.in b/config_host.mk.in
index f798ce3..0b4595d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -126,6 +126,7 @@ export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_ORCUS=@ENABLE_ORCUS@
 export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
+export ENABLE_GLTF=@ENABLE_GLTF@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
 export ENABLE_GTK3=@ENABLE_GTK3@
diff --git a/configure.ac b/configure.ac
index 3a294ca..50c8117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10359,6 +10359,23 @@ fi
 
 AC_SUBST(ENABLE_OPENCL)
 
+dnl ===================================================================
+dnl Check whether to enable glTF support
+dnl ===================================================================
+
+ENABLE_GLTF=
+AC_MSG_CHECKING([whether to enable glTF support])
+if test "$enable_opengl" = "yes"; then
+    ENABLE_GLTF=TRUE
+    AC_MSG_RESULT([yes])
+    if test "$test_freetype" = "no"; then
+        BUILD_TYPE="$BUILD_TYPE FREETYPE"
+    fi
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_GLTF)
+
 # pdf import?
 AC_MSG_CHECKING([whether to build the PDF import feature])
 ENABLE_PDFIMPORT=
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index aa9a1b7..11fcba5 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -14,16 +14,16 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\
 ))
 
 $(call gb_ExternalProject_get_state_target,freetype,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
+	$(call gb_ExternalProject_run,build,\
 		./configure \
-		--disable-shared \
-		--without-zlib \
-		--without-bzip2 \
-		--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
-		--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-	&& chmod +x builds/unix/freetype-config \
-	&& $(MAKE) install \
-	&& touch $@
+			--disable-shared \
+			--without-zlib \
+			--without-bzip2 \
+			--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
+			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+			CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
+		&& chmod +x builds/unix/freetype-config \
+		&& $(MAKE) install \
+		&& touch $@	)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk
index 51badc8..9ff2582 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Module_Module,freetype))
 
-ifeq ($(OS),ANDROID)
+ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF)))
 
 $(eval $(call gb_Module_add_targets,freetype,\
 	ExternalProject_freetype \
diff --git a/external/freetype/README b/external/freetype/README
index c90f950..4814664 100644
--- a/external/freetype/README
+++ b/external/freetype/README
@@ -1,8 +1,6 @@
-This "bundled" freetype is built only in an Android build
-
 FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable,
 and portable while capable of producing high-quality output (glyph images). It can be
 used in graphics libraries, display servers, font conversion tools, text image generation
 tools, and many other products as well.
 
-From [http://freetype.sourceforge.net/freetype2/index.html]
\ No newline at end of file
+From [http://freetype.sourceforge.net/freetype2/index.html]