summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-05-21 09:36:36 +0200
committerJan Holesovsky <kendy@collabora.com>2014-05-21 10:36:54 +0200
commitf635aed5b176fc7a305f7571ca67fdb30782665b (patch)
tree8c7d127c2a1a29960f144c012947ec66307761e7
parentf933cb0a646ecebff27e93ddfb0fc2a3e417ce4e (diff)
libgltf: The FPS counting is not necessary in LibreOffice.
And leaving it out kills the freetype dependency :-) Change-Id: I1fa33492da9d30a98014bae06aa196a508cedfe7
-rw-r--r--external/libgltf/StaticLibrary_libgltf.mk3
-rw-r--r--external/libgltf/UnpackedTarball_libgltf.mk1
-rw-r--r--external/libgltf/patches/disable_fps.patch31
3 files changed, 32 insertions, 3 deletions
diff --git a/external/libgltf/StaticLibrary_libgltf.mk b/external/libgltf/StaticLibrary_libgltf.mk
index 4628ebb9760a..3575d1585a62 100644
--- a/external/libgltf/StaticLibrary_libgltf.mk
+++ b/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 \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index d8434b6e7abe..3c96babd46af 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/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:
diff --git a/external/libgltf/patches/disable_fps.patch b/external/libgltf/patches/disable_fps.patch
new file mode 100644
index 000000000000..bc64d90cd462
--- /dev/null
+++ b/external/libgltf/patches/disable_fps.patch
@@ -0,0 +1,31 @@
+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