libgltf: The FPS counting is not necessary in LibreOffice.

And leaving it out kills the freetype dependency :-)

Change-Id: I1fa33492da9d30a98014bae06aa196a508cedfe7

external/libgltf/StaticLibrary_libgltf.mk

@@ -24,7 +24,6 @@ $(eval $(call gb_StaticLibrary_use_externals,libgltf,\
     mesa_headers \
     glew \
     zlib \
-    freetype \
 ))
 
 $(eval $(call gb_StaticLibrary_set_include,libgltf,\
@@ -35,8 +34,6 @@ $(eval $(call gb_StaticLibrary_set_include,libgltf,\
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,libgltf,\
 	UnpackedTarball/libgltf/src/Camera \
 	UnpackedTarball/libgltf/src/Common \
-	UnpackedTarball/libgltf/src/Font \
-	UnpackedTarball/libgltf/src/FPSCounter \
 	UnpackedTarball/libgltf/src/libgltf \
 	UnpackedTarball/libgltf/src/LoadScene \
 	UnpackedTarball/libgltf/src/RenderScene \

external/libgltf/UnpackedTarball_libgltf.mk

@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/include_path_glew.patch \
 	external/libgltf/patches/include_path_freetype.patch \
+	external/libgltf/patches/disable_fps.patch \
 ))
 
 # vim: set noet sw=4 ts=4:

external/libgltf/patches/disable_fps.patch

+diff --git libgltf/src/FPSCounter.h libgltf/src/FPSCounter.h
+index c6c4279..66f7e2b 100644
+--- libgltf/src/FPSCounter.h
++++ libgltf/src/FPSCounter.h
+@@ -7,6 +7,11 @@
+  */
+ #ifndef FPSCOUNTER_H
+ #define FPSCOUNTER_H
++
++#define ENABLE_FPS    0
++
++#if ENABLE_FPS
++
+ #include "time.h"
+ #include "Font.h"
+ #include "Shaders.h"
+@@ -17,7 +22,6 @@
+ 
+ #define WRITEFPS2FILE 1
+ #define TIMETHRESHOLD 30
+-#define ENABLE_FPS    1
+ #define FPS_FILE      "./FPSCounter.txt"
+ #if WRITEFPS2FILE
+ #include <iostream>
+@@ -136,4 +140,6 @@ private:
+ #endif
+ };
+ 
++#endif // ENABLE_FPS
++
+ #endif