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

2017-09-07 Thread Caolán McNamara 
 external/libgltf/UnpackedTarball_libgltf.mk   |3 +
 external/libgltf/libgltf-add-a-vao.1  |   49 ++
 external/libgltf/libgltf-disable-non-core.1   |   28 ++
 external/libgltf/libgltf-quads-to-triangles.1 |   69 ++
 4 files changed, 149 insertions(+)

New commits:
commit 9f28a9e6593fcb9031cd1f80b073c62e624eddd8
Author: Caolán McNamara 
Date:   Wed Sep 6 14:48:31 2017 +0100

Related: tdf#103884 poke libgltf towards core profile

poke libgltf towards working with a core profile as available under gtk3

Change-Id: I48a5a33c6d401e0aa3e6d18f93a498465eda8634
Reviewed-on: https://gerrit.libreoffice.org/41999
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 89a06da8d2db..8f677ab62a0a 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,6 +18,9 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/libgltf-msvc-disable-sse2.patch.1 \
external/libgltf/libgltf-msvc-x64.patch.1 \
+   external/libgltf/libgltf-quads-to-triangles.1 \
+   external/libgltf/libgltf-add-a-vao.1 \
+   external/libgltf/libgltf-disable-non-core.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/libgltf-add-a-vao.1 
b/external/libgltf/libgltf-add-a-vao.1
new file mode 100644
index ..0013d4796399
--- /dev/null
+++ b/external/libgltf/libgltf-add-a-vao.1
@@ -0,0 +1,49 @@
+From b260dd9f337af262a48054f3ff537df38083513a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 6 Sep 2017 14:40:16 +0100
+Subject: [PATCH] add a vao
+
+Change-Id: I48879f7450d1ed5ad216276f2b9b92d8f5f784fb
+---
+ src/RenderScene.cpp | 5 -
+ src/RenderScene.h   | 1 +
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/RenderScene.cpp b/src/RenderScene.cpp
+index 09670b5..6d5e8ae 100644
+--- a/src/RenderScene.cpp
 b/src/RenderScene.cpp
+@@ -700,7 +700,8 @@ unsigned int RenderShader::getRenderPrimSize() const
+ }
+ 
+ RenderScene::RenderScene()
+-: maCamera()
++: mVAO(0)
++, maCamera()
+ , cCamera(0)
+ , vCameraIndex()
+ , mOrbitInitViewMatrix(0.0)
+@@ -979,6 +980,8 @@ void RenderScene::initOpengl()
+ glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHT0);
+ glDepthFunc(GL_LESS);
++glGenVertexArrays(1, );
++glBindVertexArray(mVAO);
+ }
+ 
+ void RenderScene::createDefaultCamera()
+diff --git a/src/RenderScene.h b/src/RenderScene.h
+index ebc44c3..fa01859 100644
+--- a/src/RenderScene.h
 b/src/RenderScene.h
+@@ -286,6 +286,7 @@ private:
+ int initSSAAFrameBuf(glTFViewport* pViewport);
+ void setModelBoundaryValue();
+ 
++GLuint mVAO;
+ CPhysicalCamera maCamera;
+ ParseCamera* cCamera;
+ std::vector vCameraIndex;
+-- 
+2.9.4
+
diff --git a/external/libgltf/libgltf-disable-non-core.1 
b/external/libgltf/libgltf-disable-non-core.1
new file mode 100644
index ..c6251a01ffb1
--- /dev/null
+++ b/external/libgltf/libgltf-disable-non-core.1
@@ -0,0 +1,28 @@
+From f944ca8d14feee3787937bff0ba5b47e47f1d04f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 6 Sep 2017 14:47:22 +0100
+Subject: [PATCH] remove non-core opengl glenables
+
+Change-Id: I28306eaf9fb8ac6705242ecb74de7c19bca65ff4
+---
+ src/RenderScene.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/RenderScene.cpp b/src/RenderScene.cpp
+index 6d5e8ae..c0e8a62 100644
+--- a/src/RenderScene.cpp
 b/src/RenderScene.cpp
+@@ -975,10 +975,7 @@ void RenderScene::initOpengl()
+ {
+ glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+-glEnable(GL_TEXTURE_2D);
+ glEnable(GL_DEPTH_TEST);
+-glEnable(GL_LIGHTING);
+-glEnable(GL_LIGHT0);
+ glDepthFunc(GL_LESS);
+ glGenVertexArrays(1, );
+ glBindVertexArray(mVAO);
+-- 
+2.9.4
+
diff --git a/external/libgltf/libgltf-quads-to-triangles.1 
b/external/libgltf/libgltf-quads-to-triangles.1
new file mode 100644
index ..94361e19663e
--- /dev/null
+++ b/external/libgltf/libgltf-quads-to-triangles.1
@@ -0,0 +1,69 @@
+From b01a2afeac2749ade7fac96b663a684aa988b28f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Wed, 6 Sep 2017 14:31:36 +0100
+Subject: [PATCH] Related: tdf#103884 convert GL_QUADS to GL_TRIANGLES
+
+---
+ src/RenderScene.cpp | 12 +---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/RenderScene.cpp b/src/RenderScene.cpp
+index f4b1c24..09670b5 100644
+--- a/src/RenderScene.cpp
 b/src/RenderScene.cpp
+@@ -141,13 +141,15 @@ void

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

2015-09-02 Thread David Ostrovsky 
 external/libgltf/ExternalProject_libgltf.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aae9c47270fed82c2f53f3d2cf701991c9c4a4a3
Author: David Ostrovsky 
Date:   Mon Aug 31 21:20:15 2015 +0200

Fix libgltf on MSVC 14.0

Change-Id: I3fda18b1d26e8c7ff509cdd33e44e75671c6157d
Reviewed-on: https://gerrit.libreoffice.org/18212
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 877092c..ce4aced 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,8 +43,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
msbuild.exe libgltf.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
-   /p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+   $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
'/p:AdditionalIncludeDirectories=$(subst 
$(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-02-19 Thread David Ostrovsky 
 RepositoryExternal.mk   |2 
 external/libgltf/ExternalProject_libgltf.mk |2 
 external/libgltf/UnpackedTarball_libgltf.mk |1 
 external/libgltf/libgltf-msvc-x64.patch.1   |  110 
 4 files changed, 113 insertions(+), 2 deletions(-)

New commits:
commit ac06ab26389ef6910b9cd52001b56df2fdc5cef1
Author: David Ostrovsky da...@ostrovsky.org
Date:   Wed Feb 18 22:17:49 2015 +0100

libgltf: Fix build on windows x64 bit

Change-Id: Ie467540f17b9c7240cada6b55daa96820c6c02a1
Reviewed-on: https://gerrit.libreoffice.org/14542
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9789959..6c146eb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3419,7 +3419,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call gb_UnpackedTarball_get_dir,libgltf)/build/win32/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/libgltf.lib,Release/libgltf.lib) \
+   $(call 
gb_UnpackedTarball_get_dir,libgltf)/build/win32/$(wnt_arch_subdir_optional)$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug/libgltf.lib,Release/libgltf.lib) \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 4fd3809..877092c 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -40,7 +40,7 @@ endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
-   msbuild.exe libgltf.vcxproj \
+   msbuild.exe libgltf.vcxproj /p:Platform=$(if $(filter 
INTEL,$(CPUNAME)),Win32,x64) \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 749d74a..89a06da 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/libgltf-msvc-disable-sse2.patch.1 \
+   external/libgltf/libgltf-msvc-x64.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/libgltf-msvc-x64.patch.1 
b/external/libgltf/libgltf-msvc-x64.patch.1
new file mode 100644
index 000..86417a7
--- /dev/null
+++ b/external/libgltf/libgltf-msvc-x64.patch.1
@@ -0,0 +1,110 @@
+diff -ur libgltf.org/build/win32/libgltf.vcxproj 
libgltf/build/win32/libgltf.vcxproj
+--- libgltf.org/build/win32/libgltf.vcxproj2015-02-18 21:36:34.059042700 
+0100
 libgltf/build/win32/libgltf.vcxproj2015-02-18 21:38:07.969414000 
+0100
+@@ -5,10 +5,18 @@
+   ConfigurationDebug/Configuration
+   PlatformWin32/Platform
+ /ProjectConfiguration
++ProjectConfiguration Include=Debug|x64
++  ConfigurationDebug/Configuration
++  Platformx64/Platform
++/ProjectConfiguration
+ ProjectConfiguration Include=Release|Win32
+   ConfigurationRelease/Configuration
+   PlatformWin32/Platform
+ /ProjectConfiguration
++ProjectConfiguration Include=Release|x64
++  ConfigurationRelease/Configuration
++  Platformx64/Platform
++/ProjectConfiguration
+   /ItemGroup
+   ItemGroup
+ ClInclude Include=..\..\inc\libgltf.h /
+@@ -56,6 +64,12 @@
+ CharacterSetMultiByte/CharacterSet
+ PlatformToolsetv110/PlatformToolset
+   /PropertyGroup
++  PropertyGroup Condition='$(Configuration)|$(Platform)'=='Debug|x64' 
Label=Configuration
++ConfigurationTypeStaticLibrary/ConfigurationType
++UseDebugLibrariestrue/UseDebugLibraries
++CharacterSetMultiByte/CharacterSet
++PlatformToolsetv110/PlatformToolset
++  /PropertyGroup
+   PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|Win32' 
Label=Configuration
+ ConfigurationTypeStaticLibrary/ConfigurationType
+ UseDebugLibrariesfalse/UseDebugLibraries
+@@ -63,15 +77,28 @@
+ CharacterSetMultiByte/CharacterSet
+ PlatformToolsetv110/PlatformToolset
+   /PropertyGroup
++  PropertyGroup Condition='$(Configuration)|$(Platform)'=='Release|x64' 
Label=Configuration
++ConfigurationTypeStaticLibrary/ConfigurationType
++UseDebugLibrariesfalse/UseDebugLibraries
++WholeProgramOptimizationtrue/WholeProgramOptimization
++CharacterSetMultiByte/CharacterSet
++PlatformToolsetv110/PlatformToolset
++  /PropertyGroup
+   Import Project=$(VCTargetsPath)\Microsoft.Cpp.props /
+   ImportGroup Label=ExtensionSettings
+

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

2014-08-18 Thread Zolnai Tamás 
 external/libgltf/patches/append_shader_version.patch |   31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 6be202585f201deaf07c57e0f2cf722cce91165e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon Aug 18 09:24:23 2014 +0200

libgltf: check for #version string in the shader before add an own one.

Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf

diff --git a/external/libgltf/patches/append_shader_version.patch 
b/external/libgltf/patches/append_shader_version.patch
index dd79515..27f0cc6 100644
--- a/external/libgltf/patches/append_shader_version.patch
+++ b/external/libgltf/patches/append_shader_version.patch
@@ -1,6 +1,6 @@
 diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
 libgltf.org/src/Shaders.cpp2014-08-17 09:15:17.379255115 +0200
-+++ libgltf/src/Shaders.cpp2014-08-17 09:16:43.323258781 +0200
+--- libgltf.org/src/Shaders.cpp2014-08-18 09:19:48.323955939 +0200
 libgltf/src/Shaders.cpp2014-08-18 09:20:46.711953465 +0200
 @@ -11,6 +11,7 @@
  
  #include GL/glew.h
@@ -9,22 +9,29 @@ diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
  
  namespace libgltf
  {
-@@ -166,7 +167,17 @@
+@@ -166,7 +167,24 @@
unsigned int shaderId)
  {
  GLint iGLSize = iSize;
 -glShaderSource(shaderId, 1, pShader, iGLSize);
-+const GLchar* aSources[] = {
-+#version 130\n,
-+pShader,
-+};
++if( strstr(pShader,#version) == 0 )
++{
++const GLchar* aSources[] = {
++#version 130\n,
++pShader,
++};
 +
-+const GLint aSizes[] = {
-+strlen(#version 130\n),
-+iGLSize,
-+};
++const GLint aSizes[] = {
++strlen(#version 130\n),
++iGLSize,
++};
 +
-+glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++glShaderSource(shaderId, 2, aSources[0], aSizes[0]);
++}
++else
++{
++glShaderSource(shaderId, 1, pShader, iGLSize);
++}
  glCompileShader(shaderId);
  int iStatus = 0;
  glGetShaderiv(shaderId, GL_COMPILE_STATUS, iStatus);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-06 Thread Jan-Marek Glogowski 
 external/libgltf/ExternalProject_libgltf.mk|   10 
 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/autoreconf_run.patch  | 3867 +
 external/libgltf/patches/fix_configure_flags.patch |   54 
 external/liborcus/ExternalProject_liborcus.mk  |2 
 5 files changed, 3930 insertions(+), 5 deletions(-)

New commits:
commit 1f23cc159de5e8584b9354a42d431356530d1ce0
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Wed Aug 6 11:53:25 2014 +0200

Fix libgltf dbgutil build

The libgltf configure.ac script changes the autotools user variables
CFLAGS and CXXFLAGS, which is not allowed and can overwrite user
settings (which it does for the -D_GLIBCXX_DEBUG flag).

So this moves the special compile settings to seperate variables and
passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually
gets compiled with libstdc++ debug objects.

Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index d880c99..cd84dcd 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -52,16 +52,17 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
 
-else
+else # !ifeq($(COM),MSC)
 
-libgltf_CPPFLAGS :=
+libgltf_CPPFLAGS=$(CPPFLAGS)
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
-   libgltf_CPPFLAGS += -D_GLIBCXX_DEBUG
+libgltf_CPPFLAGS+=-D_GLIBCXX_DEBUG
+endif
 endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
-   CPPFLAGS='$(libgltf_CPPFLAGS)' \
export PKG_CONFIG= \
 ./configure \
--disable-shared \
@@ -72,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) 
-I$(BUILDDIR)/config_$(gb_Side) \
GLEW_CFLAGS=$(if 
$(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glew)/include) \
GLM_CFLAGS=$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glm)) \
+   $(if 
$(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
 $(MAKE) \
)
 
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 861eb2e..be83620 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/missing_include.patch \
+   external/libgltf/patches/fix_configure_flags.patch \
+   external/libgltf/patches/autoreconf_run.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/autoreconf_run.patch 
b/external/libgltf/patches/autoreconf_run.patch
new file mode 100644
index 000..4ba0b6d
--- /dev/null
+++ b/external/libgltf/patches/autoreconf_run.patch
@@ -0,0 +1,3867 @@
+diff -ur libgltf-0.0.0.orig/aclocal.m4 libgltf-0.0.0/aclocal.m4
+--- libgltf-0.0.0.orig/aclocal.m4  2014-08-04 15:58:04.0 +0200
 libgltf-0.0.0/aclocal.m4   2014-08-06 11:27:51.435630853 +0200
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+-
+-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+ 
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,14 +12,13 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], 
[])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+-[m4_warning([this file was generated for autoconf 2.69.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system

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

2014-08-06 Thread Jan-Marek Glogowski 
 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/autoreconf_run.patch  | 3867 -
 external/libgltf/patches/fix_configure_flags.patch |   54 
 3 files changed, 3923 deletions(-)

New commits:
commit c7b975c41274233e28fcaf65412031584ee7a497
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Wed Aug 6 13:52:07 2014 +0200

Drop unneeded libgltf autotools changes

For whatever reason the tinderboxes still try to regenerate the
autotools based files, even after applying the generated file
change after the template changes.

These patches aren't needed, as the original problem is the CPPFLAGS
environment visibility, so we drop them.

Change-Id: Idb5caf662c997221337416686313101ad2193e40

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index be83620..861eb2e 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/missing_include.patch \
-   external/libgltf/patches/fix_configure_flags.patch \
-   external/libgltf/patches/autoreconf_run.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/autoreconf_run.patch 
b/external/libgltf/patches/autoreconf_run.patch
deleted file mode 100644
index 4ba0b6d..000
--- a/external/libgltf/patches/autoreconf_run.patch
+++ /dev/null
@@ -1,3867 +0,0 @@
-diff -ur libgltf-0.0.0.orig/aclocal.m4 libgltf-0.0.0/aclocal.m4
 libgltf-0.0.0.orig/aclocal.m4  2014-08-04 15:58:04.0 +0200
-+++ libgltf-0.0.0/aclocal.m4   2014-08-06 11:27:51.435630853 +0200
-@@ -1,7 +1,8 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
--
--# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
- 
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-+# Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +12,13 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], 
[])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
--[m4_warning([this file was generated for autoconf 2.69.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-+[m4_warning([this file was generated for autoconf 2.68.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
--To do so, use the procedure documented by the package, typically 
'autoreconf'.])])
-+To do so, use the procedure documented by the package, typically 
`autoreconf'.])])
- 
- # pkg.m4 - Macros to locate and utilise pkg-config.-*- Autoconf 
-*-
- # serial 1 (pkg-config-0.24)
-@@ -180,77 +180,25 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
--
--# PKG_INSTALLDIR(DIRECTORY)
--# -
--# Substitutes the variable pkgconfigdir as the location where a module
--# should install pkg-config .pc files. By default the directory is
--# $libdir/pkgconfig, but the default can be changed by passing
--# DIRECTORY. The user can override through the --with-pkgconfigdir
--# parameter.
--AC_DEFUN([PKG_INSTALLDIR],
--[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
--m4_pushdef([pkg_description],
--[pkg-config installation directory @:@]pkg_default[@:@])
--AC_ARG_WITH([pkgconfigdir],
--[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
--[with_pkgconfigdir=]pkg_default)
--AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
--m4_popdef([pkg_default])
--m4_popdef([pkg_description])
--]) dnl PKG_INSTALLDIR
--
--
--# PKG_NOARCH_INSTALLDIR(DIRECTORY)
--# -
--# Substitutes the variable noarch_pkgconfigdir as the location where a
--# module should install arch-independent pkg-config .pc files. By
--# default the directory is $datadir/pkgconfig, but the default can be
--# changed by passing DIRECTORY. The user can override through the
--# --with-noarch-pkgconfigdir parameter.
--AC_DEFUN([PKG_NOARCH_INSTALLDIR],
--[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
--m4_pushdef([pkg_description],
--[pkg-config arch-independent installation directory 
@:@]pkg_default[@:@])
--AC_ARG_WITH([noarch-pkgconfigdir],
--[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
--

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

2014-08-05 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit dabfe7dd025f95862e302b3c4526d382eeba19ea
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Tue Aug 5 11:16:58 2014 +0200

libgltf: fix dbgutil build

Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index d68582f..d880c99 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -54,8 +54,14 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 
 else
 
+libgltf_CPPFLAGS :=
+ifneq (,$(gb_ENABLE_DBGUTIL))
+   libgltf_CPPFLAGS += -D_GLIBCXX_DEBUG
+endif
+
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
+   CPPFLAGS='$(libgltf_CPPFLAGS)' \
export PKG_CONFIG= \
 ./configure \
--disable-shared \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-05 Thread Simon Danner 
 external/libgltf/UnpackedTarball_libgltf.mk|2 +-
 external/libgltf/patches/missing_include.patch |   11 +++
 external/libgltf/pathces/missing_include.patch |   11 ---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 4d5ec5a0c3c5a179ef7982c8725c7ceb0732a836
Author: Simon Danner danner.si...@gmail.com
Date:   Tue Aug 5 12:40:15 2014 +0200

libgltf: rename pathces dir to patches

Change-Id: Ibd28dcdab17b1248d62205e5bf94d0c92c3f8841
Reviewed-on: https://gerrit.libreoffice.org/10750
Reviewed-by: Zolnai Tamás tamas.zol...@collabora.com
Tested-by: Zolnai Tamás tamas.zol...@collabora.com

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 3b27c2a..861eb2e 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
-   external/libgltf/pathces/missing_include.patch \
+   external/libgltf/patches/missing_include.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/missing_include.patch 
b/external/libgltf/patches/missing_include.patch
similarity index 100%
rename from external/libgltf/pathces/missing_include.patch
rename to external/libgltf/patches/missing_include.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-11 Thread David Ostrovsky 
 external/libgltf/ExternalProject_libgltf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 705473c9bd787dff7b63f94a3a577b9510cb62af
Author: David Ostrovsky da...@ostrovsky.org
Date:   Tue Jul 8 23:45:53 2014 +0200

VS2013: Adjust libgltf to 12.0 vcproj version

Change-Id: I076c998f5c843b60ac5624381e51271a0924043f
Reviewed-on: https://gerrit.libreoffice.org/10161
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 3e390b9..25f57b8 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+   $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 
/p:VisualStudioVersion=12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-05 Thread Markus Mohrhard 
 external/libgltf/UnpackedTarball_libgltf.mk  |1 
 external/libgltf/patches/wrong_shader_program_delete.patch.1 |   12 +++
 2 files changed, 13 insertions(+)

New commits:
commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Jul 6 03:38:00 2014 +0200

fix OpenGL error in libgltf

The code tried to free a program as a shader

Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index f1e618c..5c46d54 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
external/libgltf/patches/extra_semicolon.patch \
external/libgltf/patches/stop_a_potential_memory_leak.patch \
+   external/libgltf/patches/wrong_shader_program_delete.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/wrong_shader_program_delete.patch.1 
b/external/libgltf/patches/wrong_shader_program_delete.patch.1
new file mode 100644
index 000..b5dbc3b
--- /dev/null
+++ b/external/libgltf/patches/wrong_shader_program_delete.patch.1
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp2014-07-06 03:33:15.205313955 +0200
 libgltf/src/Shaders.cpp2014-07-06 03:34:33.079310767 +0200
+@@ -144,7 +144,7 @@
+ 
+ void ShaderProgram::deleteProgram(unsigned int programId)
+ {
+-glDeleteShader(programId);
++glDeleteProgram(programId);
+ }
+ 
+ void ShaderProgram::useProgram(unsigned int programId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-05 Thread Markus Mohrhard 
 external/libgltf/UnpackedTarball_libgltf.mk  |1 
 external/libgltf/patches/wrong_shader_program_delete.patch.1 |   12 ---
 2 files changed, 13 deletions(-)

New commits:
commit 237426e104d1fe8e9e03296e05576bf411ea7451
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Jul 6 05:05:45 2014 +0200

Revert fix OpenGL error in libgltf

New tarball already contains the fix for it.

This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 5c46d54..f1e618c 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
external/libgltf/patches/extra_semicolon.patch \
external/libgltf/patches/stop_a_potential_memory_leak.patch \
-   external/libgltf/patches/wrong_shader_program_delete.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/wrong_shader_program_delete.patch.1 
b/external/libgltf/patches/wrong_shader_program_delete.patch.1
deleted file mode 100644
index b5dbc3b..000
--- a/external/libgltf/patches/wrong_shader_program_delete.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
 libgltf.org/src/Shaders.cpp2014-07-06 03:33:15.205313955 +0200
-+++ libgltf/src/Shaders.cpp2014-07-06 03:34:33.079310767 +0200
-@@ -144,7 +144,7 @@
- 
- void ShaderProgram::deleteProgram(unsigned int programId)
- {
--glDeleteShader(programId);
-+glDeleteProgram(programId);
- }
- 
- void ShaderProgram::useProgram(unsigned int programId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-04 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk |1 
 external/libgltf/patches/stop_a_potential_memory_leak.patch |   27 
 2 files changed, 28 insertions(+)

New commits:
commit 8ea270213ba95544011fc3a79cc33f0511f6c62e
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jul 4 16:46:23 2014 +0200

libgltf: Stop a memory leak

Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 2e027ad..f1e618c 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/fix_package_file.patch \
external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
external/libgltf/patches/extra_semicolon.patch \
+   external/libgltf/patches/stop_a_potential_memory_leak.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/stop_a_potential_memory_leak.patch 
b/external/libgltf/patches/stop_a_potential_memory_leak.patch
new file mode 100644
index 000..1dff583
--- /dev/null
+++ b/external/libgltf/patches/stop_a_potential_memory_leak.patch
@@ -0,0 +1,27 @@
+changeset:   1068:ef62f9d46016
+branch:  improvement
+parent:  1065:ce62a560f347
+user:LeiQu
+date:Tue Jul 01 14:46:15 2014 +0800
+summary: Fix the bug of memory leak
+
+diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
+--- libgltf.org/src/LoadScene.cpp  2014-07-04 16:35:53.702409179 +0200
 libgltf/src/LoadScene.cpp  2014-07-04 16:35:59.926408911 +0200
+@@ -1052,10 +1052,14 @@
+ std::string nodeId;
+ for (; it != itEnd; ++it)
+ {
+-Animation* pAnimation = new Animation();
+ boost::property_tree::ptree pAnimTree = it-second;
+ nodeId = parseChannel(pAnimTree);
+-parsePara(pAnimTree, pAnimation, nodeId);
++if (nodeId.empty())
++{
++continue;
++}
++Animation* pAnimation = new Animation();
++parsePara(pAnimTree, pAnimation, nodeId); 
+ this-pScene-insertAnimMap(nodeId, pAnimation);
+ }
+ return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-28 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/comma_at_end_of_enumerator_list.patch |   51 
++
 external/libgltf/patches/extra_semicolon.patch |   18 +++
 3 files changed, 71 insertions(+)

New commits:
commit a2648efa6748b782bf739c55cf93fb69d547ead1
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Sat Jun 28 12:35:25 2014 +0200

libgltf: fix Linux-with-check build

It seems some of the warnings are treated as errors
in Linux-with-check builds.

Change-Id: I9ed876ba634d944c022838a625164f06f100a7df

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 174e719..2e027ad 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
external/libgltf/patches/compiler_error_fixes.patch \
external/libgltf/patches/fix_package_file.patch \
+   external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
+   external/libgltf/patches/extra_semicolon.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/comma_at_end_of_enumerator_list.patch 
b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
new file mode 100644
index 000..7e336f7
--- /dev/null
+++ b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
@@ -0,0 +1,51 @@
+diff -ur libgltf.org/src/Common.h libgltf/src/Common.h
+--- libgltf.org/src/Common.h   2014-06-28 12:17:56.880068394 +0200
 libgltf/src/Common.h   2014-06-28 12:22:32.940078647 +0200
+@@ -86,7 +86,7 @@
+ DataType_FLOAT_MAT3 = 0x8B5B,
+ DataType_FLOAT_MAT4 = 0x8B5C,
+ DataType_SAMPLER_2D = 0x8B5E,
+-DataType_SAMPLER_CUBE   = 0x8B60,
++DataType_SAMPLER_CUBE   = 0x8B60
+ } DataType_E;
+ 
+ class Attribute
+@@ -119,7 +119,7 @@
+ LightSource_DIRECTIONAL   = 0x1,
+ LightSource_POINT = 0x2,
+ LightSource_SPOT  = 0x3,
+-LightSource_AMBIET= 0x4,
++LightSource_AMBIET= 0x4
+ } LightSourceType_E;
+ 
+ class Light
+@@ -252,7 +252,7 @@
+ TextureType_DISPLACEMENT = 0x9,
+ TextureType_LIGHTMAP = 0xA,
+ TextureType_REFLECTION = 0xB,
+-TextureType_UNKNOWN = 0xC,
++TextureType_UNKNOWN = 0xC
+ } TextureType_E;
+ 
+ class MaterialProperty
+@@ -449,7 +449,7 @@
+ NodeType_Node= 0x1,
+ NodeType_Mesh= 0x2,
+ NodeType_Camera  = 0x4,
+-NodeType_Light   = 0x8,
++NodeType_Light   = 0x8
+ } NodeType_E;
+ 
+ class Node
+diff -ur libgltf.org/src/Texture.h libgltf/src/Texture.h
+--- libgltf.org/src/Texture.h  2014-06-28 12:17:56.880068394 +0200
 libgltf/src/Texture.h  2014-06-28 12:18:19.740069243 +0200
+@@ -24,7 +24,7 @@
+ TEXTURE_FILTER_MIN_BILINEAR,
+ TEXTURE_FILTER_MIN_NEAREST_MIPMAP,
+ TEXTURE_FILTER_MIN_BILINEAR_MIPMAP,
+-TEXTURE_FILTER_MIN_TRILINEAR,
++TEXTURE_FILTER_MIN_TRILINEAR
+ };
+ 
+ class Texture
diff --git a/external/libgltf/patches/extra_semicolon.patch 
b/external/libgltf/patches/extra_semicolon.patch
new file mode 100644
index 000..42602d6
--- /dev/null
+++ b/external/libgltf/patches/extra_semicolon.patch
@@ -0,0 +1,18 @@
+diff -ur libgltf.org/src/Common.cpp libgltf/src/Common.cpp
+--- libgltf.org/src/Common.cpp 2014-06-28 12:30:58.792097436 +0200
 libgltf/src/Common.cpp 2014-06-28 12:31:13.884097997 +0200
+@@ -550,12 +550,12 @@
+ /* -- Primitives -- */
+ Primitives::Primitives()
+ {
+-};
++}
+ 
+ Primitives::~Primitives()
+ {
+ mAttributeMap.clear();
+-};
++}
+ 
+ void Primitives::setMaterialIndex(std::string materialIndex)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-27 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c7d6541f5daa59d04accb30c727a83d936f02150
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 13:41:36 2014 +0200

libgltf: it seems gb_SPACE is not that we need here

Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 580c010..5c40aa7 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,6 +39,9 @@ ifeq ($(SYSTEM_GLM),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,glm)
 endif
 
+libgltf_empty :=
+libgltf_space := $(libgltf_empty) $(libgltf_empty)
+
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
@@ -47,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
-   '/p:AdditionalIncludeDirectories=$(subst 
$(gb_SPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
+   '/p:AdditionalIncludeDirectories=$(subst 
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-27 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab028bf00e3e5f8424ea5e746815e8438144e4bf
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 14:23:43 2014 +0200

libgltf: fix wrong include path to config_$(gb_Side)

Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 5c40aa7..01f0666 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -28,7 +28,7 @@ libgltf_AdditionalIncludes :=
 
 ifeq ($(SYSTEM_BOOST),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,boost)
-libgltf_AdditionalIncludes += $(SRCDIR)/config_host
+libgltf_AdditionalIncludes += $(BUILDDIR)/config_$(gb_Side)
 endif
 
 ifeq ($(SYSTEM_GLEW),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-27 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit b05b970daaf69b5b491b847375ee07539de9481f
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 15:08:43 2014 +0200

libgltf: use WHITESPACE

Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 01f0666..3e390b9 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,9 +39,6 @@ ifeq ($(SYSTEM_GLM),)
 libgltf_AdditionalIncludes += $(call gb_UnpackedTarball_get_dir,glm)
 endif
 
-libgltf_empty :=
-libgltf_space := $(libgltf_empty) $(libgltf_empty)
-
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
@@ -50,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
-   '/p:AdditionalIncludeDirectories=$(subst 
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
+   '/p:AdditionalIncludeDirectories=$(subst 
$(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-27 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk |1 +
 external/libgltf/patches/fix_package_file.patch |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 4bdbc1c93bb3b7e6b1f2fc9a700977ccfa3daae4
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 27 19:19:46 2014 +0200

libgltf: make 'Requires' valid in libgltf-0.0.pc file

Thanks to Rene Engelhard for help to make it valid.

Plus glu is not used, so remove it.

Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 175fe43..174e719 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\

external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch 
\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
external/libgltf/patches/compiler_error_fixes.patch \
+   external/libgltf/patches/fix_package_file.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/fix_package_file.patch 
b/external/libgltf/patches/fix_package_file.patch
new file mode 100644
index 000..509634d
--- /dev/null
+++ b/external/libgltf/patches/fix_package_file.patch
@@ -0,0 +1,13 @@
+diff -ur libgltf.org/libgltf.pc.in libgltf/libgltf.pc.in
+--- libgltf.org/libgltf.pc.in  2014-06-27 18:52:24.323562505 +0200
 libgltf/libgltf.pc.in  2014-06-27 18:52:48.423561484 +0200
+@@ -6,8 +6,7 @@
+ Name: libgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ Description: Library for rendering glTF models.
+ Version: @VERSION@
+-Requires: glew-1.10.0 glm glu
++Requires: glew
+ Libs: -L${libdir} -lgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ Cflags: -I${includedir}/libgltf-@GLTF_MAJOR_VERSION@.@GLTF_MINOR_VERSION@
+ 
+-Requires.private: boost
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-26 Thread Stephan Bergmann 
 external/libgltf/ExternalProject_libgltf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5da85a21241f09a0b2d7796bc952806a1a863592
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 26 08:47:46 2014 +0200

external/libgltf: Hack in missing -fPIC

Change-Id: Ied0fe5f376bf17bd931f440e57d15b22ab6db86e

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 580c010..3b0bc87 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -63,6 +63,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) 
-I$(BUILDDIR)/config_$(gb_Side) \
GLEW_CFLAGS=$(if 
$(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glew)/include) \
GLM_CFLAGS=$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glm)) \
+   $(if $(filter WNT,$(OS)),,CC=$(CC) -fPIC) \
 $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-26 Thread Stephan Bergmann 
 external/libgltf/ExternalProject_libgltf.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fb48904dfa640e93650264aa9913dea2305dbcc6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 26 08:53:32 2014 +0200

Revert external/libgltf: Hack in missing -fPIC

This reverts commit 5da85a21241f09a0b2d7796bc952806a1a863592,
bb9078e3dee48afc4c2bd8006a892924f8b38b39 libgltf: use --with-pick [sic] 
had
already added --with-pic.

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 3b0bc87..580c010 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -63,7 +63,6 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) 
-I$(BUILDDIR)/config_$(gb_Side) \
GLEW_CFLAGS=$(if 
$(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glew)/include) \
GLM_CFLAGS=$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glm)) \
-   $(if $(filter WNT,$(OS)),,CC=$(CC) -fPIC) \
 $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-26 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk |1 
 external/libgltf/patches/compiler_error_fixes.patch |   41 
 2 files changed, 42 insertions(+)

New commits:
commit 481a17b6a6fb332935c3e41c077cc5f60b751021
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Thu Jun 26 17:14:36 2014 +0200

libgltf: compiler error fixes: missing include and missing namespace

Thanks to Rene Engelhard for the report and the fixes.

Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index e8c5133..175fe43 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/no_animation_in_orbit_mode.patch \

external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch 
\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
+   external/libgltf/patches/compiler_error_fixes.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/compiler_error_fixes.patch 
b/external/libgltf/patches/compiler_error_fixes.patch
new file mode 100644
index 000..a2ff172
--- /dev/null
+++ b/external/libgltf/patches/compiler_error_fixes.patch
@@ -0,0 +1,41 @@
+diff -ur libgltf.org/src/Camera.cpp libgltf/src/Camera.cpp
+--- libgltf.org/src/Camera.cpp 2014-06-26 15:49:57.807687346 +0200
 libgltf/src/Camera.cpp 2014-06-26 15:50:46.195685296 +0200
+@@ -161,7 +161,7 @@
+ }
+ else
+ {
+-if (abs(x)  0.0001 || abs(y)  0.0001 || abs(z)  0.0001)
++if (std::abs(x)  0.0001 || std::abs(y)  0.0001 || std::abs(z)  
0.0001)
+ {
+  bMoveCmeraModel = true;
+ }
+@@ -240,7 +240,7 @@
+ {
+ if (!bAerialView)
+ return;
+-if (abs(horizontal)  planar || abs(vertical)  0.0001)
++if (std::abs(horizontal)  planar || std::abs(vertical)  0.0001)
+ {
+ bRotateCameraModel = true;
+ fRotateCameraXSpeed = 0;
+@@ -275,7 +275,7 @@
+ void CPhysicalCamera::RotateCamera(double horizontal, double vertical,
+double planar)
+ {
+-if (abs(horizontal)  planar || abs(vertical)  0.0001)
++if (std::abs(horizontal)  planar || std::abs(vertical)  0.0001)
+ {
+ bRotateCameraModel = true;
+ }
+diff -ur libgltf.org/src/Font.cpp libgltf/src/Font.cpp
+--- libgltf.org/src/Font.cpp   2014-06-26 15:49:57.807687346 +0200
 libgltf/src/Font.cpp   2014-06-26 15:50:57.619684812 +0200
+@@ -8,6 +8,7 @@
+ #include Font.h
+ 
+ #include glm/gtc/matrix_transform.hpp
++#include cstdio
+ 
+ using namespace std;
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-25 Thread Michael Stahl 
 external/libgltf/ExternalProject_libgltf.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 96ff10449464ae9d869fe21dccf193a6eef670c1
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jun 25 17:05:11 2014 +0200

libgltf: try to fix the MSVC2010 build

Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 9d043cd..46a74d4 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -44,7 +44,9 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if 
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
-   /p:VisualStudioVersion=11.0) \
+   /p:VisualStudioVersion=11.0) \
+   $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
+   /p:VisualStudioVersion=10.0) \
'/p:AdditionalIncludeDirectories=$(subst 
$(gb_SPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes' \
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32) \
,build/win32)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-25 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bb9078e3dee48afc4c2bd8006a892924f8b38b39
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Wed Jun 25 18:29:38 2014 +0200

libgltf: use --with-pick

Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 46a74d4..9545f7e 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -58,6 +58,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
export PKG_CONFIG= \
 autoreconf \
 ./configure \
+   --with-pic \
--disable-debug \
--disable-werror \
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) 
-I$(BUILDDIR)/config_$(gb_Side) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-25 Thread Zolnai Tamás 
 external/libgltf/ExternalProject_libgltf.mk|1 
 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/libgltf_configure.patch   |  102 +
 external/libgltf/patches/libgltf_configure.patch.1 |   40 
 4 files changed, 103 insertions(+), 42 deletions(-)

New commits:
commit c5bb272883e042e38c58847f6eb2a2f94c6ef919
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Wed Jun 25 18:51:23 2014 +0200

libgltf: replace configure patch to avoid using autoreconf

Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 9545f7e..580c010 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -56,7 +56,6 @@ else
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG= \
-autoreconf \
 ./configure \
--with-pic \
--disable-debug \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index e7be312..90f6ee2 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
-   external/libgltf/patches/libgltf_configure.patch.1 \
+   external/libgltf/patches/libgltf_configure.patch \
external/libgltf/patches/init_scene_set_handle.patch \
external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \

external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \
diff --git a/external/libgltf/patches/libgltf_configure.patch 
b/external/libgltf/patches/libgltf_configure.patch
new file mode 100644
index 000..34dc3f7
--- /dev/null
+++ b/external/libgltf/patches/libgltf_configure.patch
@@ -0,0 +1,102 @@
+diff -ur libgltf.org/configure libgltf/configure
+--- libgltf.org/configure  2014-06-25 18:41:32.470228670 +0200
 libgltf/configure  2014-06-25 18:42:03.97337 +0200
+@@ -15581,15 +15581,18 @@
+ # =
+ # Find boost
+ # =
++save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS=$CPPFLAGS $BOOST_CFLAGS
+ 
+ ac_fn_cxx_check_header_mongrel $LINENO 
boost/property_tree/json_parser.hpp 
ac_cv_header_boost_property_tree_json_parser_hpp $ac_includes_default
+ if test x$ac_cv_header_boost_property_tree_json_parser_hpp = xyes; then :
+-  BOOST_CFLAGS=
++
+ else
+   as_fn_error $? boost/property_tree/json_parser.hpp not found. install 
boost $LINENO 5
+ fi
+ 
+ 
++CPPFLAGS=$save_CPPFLAGS
+ 
+ 
+ # =
+@@ -15685,14 +15688,17 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
+ $as_echo yes 6; }
+ 
++ save_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS=$CPPFLAGS $GLEW_CFLAGS
+  ac_fn_cxx_check_header_mongrel $LINENO GL/glew.h 
ac_cv_header_GL_glew_h $ac_includes_default
+ if test x$ac_cv_header_GL_glew_h = xyes; then :
+-  GLEW_CFLAGS=
++
+ else
+   as_fn_error $? GL/glew.h not found. install glew $LINENO 5
+ fi
+ 
+ 
++ CPPFLAGS=$save_CPPFLAGS
+ 
+ fi
+ 
+@@ -15707,14 +15713,17 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS 5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
++save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS=$CPPFLAGS $GLM_CFLAGS
+ ac_fn_cxx_check_header_mongrel $LINENO glm/glm.hpp 
ac_cv_header_glm_glm_hpp $ac_includes_default
+ if test x$ac_cv_header_glm_glm_hpp = xyes; then :
+-  GLM_CFLAGS=
++
+ else
+   as_fn_error $? glm/glm.hpp not found. install glm $LINENO 5
+ fi
+ 
+ 
++CPPFLAGS=$save_CPPFLAGS
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 5'
+diff -ur libgltf.org/configure.ac libgltf/configure.ac
+--- libgltf.org/configure.ac   2014-06-25 18:41:32.470228670 +0200
 libgltf/configure.ac   2014-06-25 18:41:41.186228300 +0200
+@@ -36,16 +36,22 @@
+ # =
+ # Find boost
+ # =
+-AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [BOOST_CFLAGS=],
++save_CPPFLAGS=$CPPFLAGS
++CPPFLAGS=$CPPFLAGS $BOOST_CFLAGS
++AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [],
+  [AC_MSG_ERROR(boost/property_tree/json_parser.hpp not found. install 
boost)], [])
++CPPFLAGS=$save_CPPFLAGS
+ AC_SUBST([BOOST_CFLAGS])
+ 
+ # =
+ # Find glew
+ # =
+ PKG_CHECK_MODULES(GLEW, [glew = 1.9.0], [] [
+- AC_CHECK_HEADER(GL/glew.h, [GLEW_CFLAGS=],
++ save_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS=$CPPFLAGS $GLEW_CFLAGS
++ AC_CHECK_HEADER(GL/glew.h, [],
+  [AC_MSG_ERROR(GL/glew.h not found. install glew)], [])
++ CPPFLAGS=$save_CPPFLAGS
+ ])
+ AC_SUBST([GLEW_CFLAGS])
+ AC_SUBST([GLEW_LIBS])
+@@ -54,8 +60,11 @@
+ # Find glm
+ # =
+ AC_LANG_PUSH([C++])

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

2014-06-25 Thread Zolnai Tamás 
 external/libgltf/patches/libgltf_configure.patch |   41 ---
 1 file changed, 41 deletions(-)

New commits:
commit 211e07c0e02ebfe9cea4b5d97b614a23f8b2012c
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Wed Jun 25 19:23:24 2014 +0200

libgltf: try again with this configure patch

Touch only the configure but not the configure.ac

Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec

diff --git a/external/libgltf/patches/libgltf_configure.patch 
b/external/libgltf/patches/libgltf_configure.patch
index 34dc3f7..d224ab9 100644
--- a/external/libgltf/patches/libgltf_configure.patch
+++ b/external/libgltf/patches/libgltf_configure.patch
@@ -59,44 +59,3 @@ diff -ur libgltf.org/configure libgltf/configure
  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 5'
-diff -ur libgltf.org/configure.ac libgltf/configure.ac
 libgltf.org/configure.ac   2014-06-25 18:41:32.470228670 +0200
-+++ libgltf/configure.ac   2014-06-25 18:41:41.186228300 +0200
-@@ -36,16 +36,22 @@
- # =
- # Find boost
- # =
--AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [BOOST_CFLAGS=],
-+save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS=$CPPFLAGS $BOOST_CFLAGS
-+AC_CHECK_HEADER(boost/property_tree/json_parser.hpp, [],
-  [AC_MSG_ERROR(boost/property_tree/json_parser.hpp not found. install 
boost)], [])
-+CPPFLAGS=$save_CPPFLAGS
- AC_SUBST([BOOST_CFLAGS])
- 
- # =
- # Find glew
- # =
- PKG_CHECK_MODULES(GLEW, [glew = 1.9.0], [] [
-- AC_CHECK_HEADER(GL/glew.h, [GLEW_CFLAGS=],
-+ save_CPPFLAGS=$CPPFLAGS
-+ CPPFLAGS=$CPPFLAGS $GLEW_CFLAGS
-+ AC_CHECK_HEADER(GL/glew.h, [],
-  [AC_MSG_ERROR(GL/glew.h not found. install glew)], [])
-+ CPPFLAGS=$save_CPPFLAGS
- ])
- AC_SUBST([GLEW_CFLAGS])
- AC_SUBST([GLEW_LIBS])
-@@ -54,8 +60,11 @@
- # Find glm
- # =
- AC_LANG_PUSH([C++])
--AC_CHECK_HEADER([glm/glm.hpp], [GLM_CFLAGS=],
-+save_CPPFLAGS=$CPPFLAGS
-+CPPFLAGS=$CPPFLAGS $GLM_CFLAGS
-+AC_CHECK_HEADER([glm/glm.hpp], [],
-  [AC_MSG_ERROR([glm/glm.hpp not found. install glm])], [])
-+CPPFLAGS=$save_CPPFLAGS
- AC_LANG_POP([C++])
- AC_SUBST([GLM_CFLAGS])
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-25 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk|1 
 external/libgltf/patches/remove_config_h_in_dependencies.patch |   12 
++
 2 files changed, 13 insertions(+)

New commits:
commit 3bebda9cd3269d684a3b430e25f17951deaf3d3d
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Wed Jun 25 23:26:49 2014 +0200

libgltf: remove dependencies of config.h.in

It seems something is wrong with the files in the
libgltf tarball (maybe wrong timestamps?), because
config.h.in is always regenerated by make (autoheader).
It causes build problems so just remove the deps for this time.

Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 90f6ee2..e8c5133 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/libgltf_configure.patch \
+   external/libgltf/patches/remove_config_h_in_dependencies.patch \
external/libgltf/patches/init_scene_set_handle.patch \
external/libgltf/patches/extend_get_bitmap_for_rgba_ones.patch \

external/libgltf/patches/wrong_duration_caused_by_uninitialized_member.patch \
diff --git a/external/libgltf/patches/remove_config_h_in_dependencies.patch 
b/external/libgltf/patches/remove_config_h_in_dependencies.patch
new file mode 100644
index 000..fae09e7
--- /dev/null
+++ b/external/libgltf/patches/remove_config_h_in_dependencies.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/Makefile.in libgltf/Makefile.in
+--- libgltf.org/Makefile.in2014-06-25 23:16:52.417528674 +0200
 libgltf/Makefile.in2014-06-25 23:16:56.493528501 +0200
+@@ -419,7 +419,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+   @rm -f stamp-h1
+   cd $(top_builddir)  $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: 
+   ($(am__cd) $(top_srcdir)  $(AUTOHEADER))
+   rm -f stamp-h1
+   touch $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-12 Thread Zolnai Tamás 
 external/libgltf/patches/init_scene_set_handle.patch |   26 +--
 1 file changed, 19 insertions(+), 7 deletions(-)

New commits:
commit fd8cee8c1fb34432b786d54651f33b6c961ca7fe
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Jun 13 01:19:11 2014 +0200

libgltf: fix up this patch, some forgotten changes

Change-Id: I0fe3ee06d8112207f3ae3e0e8e40fa74d043ce11

diff --git a/external/libgltf/patches/init_scene_set_handle.patch 
b/external/libgltf/patches/init_scene_set_handle.patch
index b0dba8e..ef34fe3 100644
--- a/external/libgltf/patches/init_scene_set_handle.patch
+++ b/external/libgltf/patches/init_scene_set_handle.patch
@@ -1,6 +1,6 @@
 diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
 libgltf.org/src/LoadScene.cpp  2014-06-12 12:11:58.945707220 +0200
-+++ libgltf/src/LoadScene.cpp  2014-06-12 12:13:14.129704086 +0200
+--- libgltf.org/src/LoadScene.cpp  2014-06-13 01:13:40.654653289 +0200
 libgltf/src/LoadScene.cpp  2014-06-13 01:15:45.034648018 +0200
 @@ -148,10 +148,14 @@
  return true;
  }
@@ -19,8 +19,8 @@ diff -ur libgltf.org/src/LoadScene.cpp 
libgltf/src/LoadScene.cpp
  {
  TRACE_TIME (parseScene-readBuffers, CPU);
 diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
 libgltf.org/src/LoadScene.h2014-06-12 12:11:58.945707220 +0200
-+++ libgltf/src/LoadScene.h2014-06-12 12:12:11.805706684 +0200
+--- libgltf.org/src/LoadScene.h2014-06-13 01:13:40.654653289 +0200
 libgltf/src/LoadScene.h2014-06-13 01:16:03.886647220 +0200
 @@ -27,7 +27,8 @@
  public:
  glTFHandle* getFileNameInJson(const std::string jsonFile);
@@ -39,8 +39,8 @@ diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
 \ No newline at end of file
 +#endif
 diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
 libgltf.org/src/RenderScene.cpp2014-06-12 12:11:58.949707220 +0200
-+++ libgltf/src/RenderScene.cpp2014-06-12 12:12:13.509706613 +0200
+--- libgltf.org/src/RenderScene.cpp2014-06-13 01:13:40.654653289 +0200
 libgltf/src/RenderScene.cpp2014-06-13 01:15:11.222649451 +0200
 @@ -561,7 +561,7 @@
  {
  return LIBGLTF_PARSE_JSON_ERROR;
@@ -77,7 +77,19 @@ diff -ur libgltf.org/src/RenderScene.cpp 
libgltf/src/RenderScene.cpp
  }
  
  unsigned int RenderScene::bindAttribute(const Attribute* pAttr)
-@@ -1543,4 +1546,4 @@
+@@ -844,11 +847,6 @@
+ 
+ int RenderScene::initRender(glTFHandle* handle)
+ {
+-pScene = new Scene();
+-if(0 == pScene)
+-{
+-return LIBGLTF_MEMORY_ERROR;
+-}
+ int iResult = loadScene(*pScene, handle);
+ if( iResult != LIBGLTF_SUCESS)
+ {
+@@ -1543,4 +1541,4 @@
  int  RenderScene::isAnimPlay()
  {
  return this-mAnimationPlay ? 1 : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-26 Thread Jan Holesovsky 
 external/libgltf/patches/openmp-disable.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 318ffa88240f55adef906df673614123d19f35a3
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon May 26 16:38:53 2014 +0200

libgltf: Update openmp-related patch to newer libgltf.

Change-Id: I6f7e8d974030169bb00fbd81a0e2190640702729

diff --git a/external/libgltf/patches/openmp-disable.patch 
b/external/libgltf/patches/openmp-disable.patch
index c084183..ef8bc2e 100644
--- a/external/libgltf/patches/openmp-disable.patch
+++ b/external/libgltf/patches/openmp-disable.patch
@@ -1,8 +1,8 @@
 --- libgltf/src/RenderScene.h
 +++ libgltf/src/RenderScene.h
 @@ -16,7 +16,8 @@
- #include FPSCounter.h
- #include Timer.h
+ #define TRACE_TIME 
+ #endif
  
 -#define OPENMPENABLE   1
 +// Needs a configure / etc. detection to see if omp.h is on the system ...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-26 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk  |1 
 external/libgltf/patches/free_file_buffers.patch |   58 +++
 2 files changed, 59 insertions(+)

New commits:
commit 37dd6ced1e1763b2da2d08f5dd0df1bf7a6458a9
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Mon May 26 23:40:51 2014 +0200

patching libgltf: stop a huge memory leak

It is ambiguos where we should free file buffers because they
are allocated by the caller code, but since gltfHandle is
deallocated inside libgltf and libgltf has a gltf_renderer_release
method for deallocation it seems better to free them by libgltf.


Conflicts:
external/libgltf/UnpackedTarball_libgltf.mk

Change-Id: If3d9abed0514128c13cde8c1967ea80c4d27bf59

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 33889fb..99609ba 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -19,6 +19,7 @@ $(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 \
+   external/libgltf/patches/free_file_buffers.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/free_file_buffers.patch 
b/external/libgltf/patches/free_file_buffers.patch
new file mode 100644
index 000..9f92da3
--- /dev/null
+++ b/external/libgltf/patches/free_file_buffers.patch
@@ -0,0 +1,58 @@
+diff -ur libgltf.org/src/LoadScene.cpp libgltf/src/LoadScene.cpp
+--- libgltf.org/src/LoadScene.cpp  2014-05-26 21:46:51.986986538 +0200
 libgltf/src/LoadScene.cpp  2014-05-26 21:47:28.206985004 +0200
+@@ -127,7 +127,7 @@
+ return gHandle;
+ }
+ 
+-bool Parser::releaseFileName()
++bool Parser::releaseFiles()
+ {
+ glTFHandle* gHandle = pScene-getGltfHandle();
+ for (int i = (int)gHandle-size - 1 ; i = 0 ; i--)
+@@ -137,6 +137,7 @@
+ free(gHandle-files[i].filename);
+ gHandle-files[i].filename = NULL;
+ }
++delete [] gHandle-files[i].buffer;
+ }
+ 
+ if (gHandle-files != NULL)
+diff -ur libgltf.org/src/LoadScene.h libgltf/src/LoadScene.h
+--- libgltf.org/src/LoadScene.h2014-05-26 21:46:51.986986538 +0200
 libgltf/src/LoadScene.h2014-05-26 21:47:33.170984793 +0200
+@@ -26,7 +26,7 @@
+ {
+ public:
+ glTFHandle* getFileNameInJson(const std::string jsonFile);
+-bool releaseFileName();
++bool releaseFiles();
+ int parseScene(Scene* pscene);
+ bool parseJsonFile();
+ void setJsonInfo(const std::string sbuffer);
+@@ -81,4 +81,4 @@
+ bool is_json_in_buffer;
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
+--- libgltf.org/src/RenderScene.cpp2014-05-26 21:46:51.986986538 +0200
 libgltf/src/RenderScene.cpp2014-05-26 21:47:39.358984531 +0200
+@@ -1426,7 +1426,7 @@
+ 
+ void RenderScene::releaseRender()
+ {
+-mLoadJson.releaseFileName();
++mLoadJson.releaseFiles();
+ fbo.releaseFbo();
+ return;
+ }
+@@ -1543,4 +1543,4 @@
+ int  RenderScene::isAnimPlay()
+ {
+ return this-mAnimationPlay ? 1 : 0;
+-}
+\ No newline at end of file
++}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-24 Thread 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.me...@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 000..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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-06 Thread Stephan Bergmann 
 external/libgltf/patches/extern-C.patch |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 91666033e90d5d4ce4693a015238f4f2b030c007
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 6 18:05:35 2014 +0200

Fix patch

Change-Id: I18608380bf89822ce402e79038f2016af17b2ead

diff --git a/external/libgltf/patches/extern-C.patch 
b/external/libgltf/patches/extern-C.patch
index fd34f8a..a9eadf6 100644
--- a/external/libgltf/patches/extern-C.patch
+++ b/external/libgltf/patches/extern-C.patch
@@ -8,3 +8,13 @@
  glm::vec3 gltf_get_model_center_pos();
  /*get camera position information*/
  extern C
+--- libgltf/src/libgltf.cpp
 /src/libgltf.cpp
+@@ -59,7 +59,6 @@
+ return;
+ }
+ 
+-extern C
+ glm::vec3 gltf_get_model_center_pos()
+ {
+ return cameraScene-getModelCenterPos();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-06 Thread Tor Lillqvist 
 external/libgltf/UnpackedTarball_libgltf.mk |1 +
 external/libgltf/patches/errno.patch|   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit 5de854b4fa125b3e560723410750467ec3de22a1
Author: Tor Lillqvist t...@collabora.com
Date:   Tue May 6 19:15:52 2014 +0300

Include errno.h

Change-Id: I55a5ef14ec75095cfe6a490eedd460f21c1c9625

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index bd2ee0b..3405e86 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/remove_extra_include.patch \
external/libgltf/patches/fmod_error_handling.patch \
external/libgltf/patches/extern-C.patch \
+   external/libgltf/patches/errno.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/errno.patch 
b/external/libgltf/patches/errno.patch
new file mode 100644
index 000..81f47f3
--- /dev/null
+++ b/external/libgltf/patches/errno.patch
@@ -0,0 +1,10 @@
+--- libgltf/src/RenderScene.cpp
 libgltf/src/RenderScene.cpp
+@@ -5,6 +5,7 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
++#include errno.h
+ #include RenderScene.h
+ #include glm/gtx/transform.hpp
+ #include glm/gtc/matrix_inverse.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-06 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk|1 -
 external/libgltf/patches/errno.patch   |   10 --
 external/libgltf/patches/fmod_error_handling.patch |   14 +++---
 3 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 563a83a8cf30327008397913f12e0373b8a1650c
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Tue May 6 18:31:36 2014 +0200

libgltf: include is missing from fmod_error_handling patch, merge patches

Change-Id: I9e0e7816e6d85cb3484105de4ce49db47db72451

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 3405e86..bd2ee0b 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/remove_extra_include.patch \
external/libgltf/patches/fmod_error_handling.patch \
external/libgltf/patches/extern-C.patch \
-   external/libgltf/patches/errno.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/errno.patch 
b/external/libgltf/patches/errno.patch
deleted file mode 100644
index 81f47f3..000
--- a/external/libgltf/patches/errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 libgltf/src/RenderScene.cpp
-+++ libgltf/src/RenderScene.cpp
-@@ -5,6 +5,7 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  */
-+#include errno.h
- #include RenderScene.h
- #include glm/gtx/transform.hpp
- #include glm/gtc/matrix_inverse.hpp
diff --git a/external/libgltf/patches/fmod_error_handling.patch 
b/external/libgltf/patches/fmod_error_handling.patch
index 6b47ca1..3a13291 100644
--- a/external/libgltf/patches/fmod_error_handling.patch
+++ b/external/libgltf/patches/fmod_error_handling.patch
@@ -1,7 +1,15 @@
 diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
 libgltf.org/src/RenderScene.cpp2014-05-06 12:01:08.204238237 +0200
-+++ libgltf/src/RenderScene.cpp2014-05-06 12:21:58.720287272 +0200
-@@ -979,7 +979,9 @@
+--- libgltf.org/src/RenderScene.cpp2014-05-06 18:26:20.097144491 +0200
 libgltf/src/RenderScene.cpp2014-05-06 18:26:26.281144733 +0200
+@@ -11,6 +11,7 @@
+ #include glm/gtc/type_ptr.hpp
+ #include glm/gtc/quaternion.hpp
+ #include glm/gtx/quaternion.hpp
++#include cerrno
+ 
+ RenderPrimitive::RenderPrimitive()
+ : mVerterCount(0), mIndicesCount(0)
+@@ -979,7 +980,9 @@
  
  double RenderScene::getAnimTime()
  {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-18 Thread Zolnai Tamás 
 external/libgltf/UnpackedTarball_libgltf.mk |1 +
 external/libgltf/patches/avoid_c++11.patch  |   12 
 2 files changed, 13 insertions(+)

New commits:
commit 17f082fe00983c3ef1a5f71611c9278cb16dab20
Author: Zolnai Tamás tamas.zol...@collabora.com
Date:   Fri Apr 18 13:53:19 2014 +0200

Avoid C++11 solutions from libgltf code

Change-Id: I097798a52157fc688ae520a7f3a0dda84000e20b

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 44496d1..1fbe09d 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/unneeded_context_handling.patch \
external/libgltf/patches/include_typo_texture.patch \
external/libgltf/patches/adress_of_temporary.patch \
+   external/libgltf/patches/avoid_c++11.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/avoid_c++11.patch 
b/external/libgltf/patches/avoid_c++11.patch
new file mode 100644
index 000..827e4f5
--- /dev/null
+++ b/external/libgltf/patches/avoid_c++11.patch
@@ -0,0 +1,12 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp2014-04-18 13:47:18.006783834 +0200
 libgltf/src/Shaders.cpp2014-04-18 13:49:20.175779328 +0200
+@@ -219,7 +219,7 @@
+ 
+ bool ShaderProgram::readShaderFile(const std::string fileName, std::string 
value)
+ {
+-  std::ifstream shaderStream(fileName, std::ios::in);
++  std::ifstream shaderStream(fileName.c_str(), std::ios::in);
+   if (!shaderStream.is_open())
+   {
+   return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits