[Libreoffice-commits] core.git: external/libgltf

[Michael Meeks]

 external/libgltf/UnpackedTarball_libgltf.mk   |    1 +
 external/libgltf/patches/openmp-disable.patch |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 42f2f473305372050f012aa952ef21b5596fd1cc
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat May 24 20:33:19 2014 +0100

    libgltf: turn off openMP usage without any detection code.
    
    Change-Id: Ic823109b812a3d99d8462cf67cd9aa87094bba06

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index d8434b6..33889fb 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/openmp-disable.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/openmp-disable.patch b/external/libgltf/patches/openmp-disable.patch
new file mode 100644
index 0000000..c084183
--- /dev/null
+++ b/external/libgltf/patches/openmp-disable.patch
@@ -0,0 +1,12 @@
+--- libgltf/src/RenderScene.h
++++ libgltf/src/RenderScene.h
+@@ -16,7 +16,8 @@
+ #include "FPSCounter.h"
+ #include "Timer.h"
+ 
+-#define OPENMPENABLE   1
++// Needs a configure / etc. detection to see if omp.h is on the system ...
++#define OPENMPENABLE   0
+ #if OPENMPENABLE
+ #include <omp.h>
+ #define WAVESIZE 4