Upgrade libgltf to 0.0.1

News in this version:
- Solve some limitations of walkthrough mode (fdo#81425)
- Multisampling (better rendering quality, mainly at the edges)
- Better error handling (no crash in case of invalid input file)

Reviewed-on: https://gerrit.libreoffice.org/11179
Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>

Conflicts:
download.lst
external/libgltf/UnpackedTarball_libgltf.mk
external/libgltf/pathces/append_shader_version.patch
external/libgltf/pathces/missing_include.patch
vcl/source/opengl/OpenGLContext.cxx

Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794
Reviewed-on: https://gerrit.libreoffice.org/11194
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

4 files changed, 2 insertions, 50 deletions

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 548487b7edf5..62e25a303f13 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -63,6 +63,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 		export CPPFLAGS='$(libgltf_CPPFLAGS)' \
 		&& export PKG_CONFIG="" \
 		&& ./configure \
+			--disable-shared \
+			--enable-static \
 			--with-pic \
 			--disable-debug \
 			--disable-werror \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 42c821bbe819..176c1d15246b 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,8 +16,6 @@ $(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/pathces/append_shader_version.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/append_shader_version.patch b/external/libgltf/pathces/append_shader_version.patch
deleted file mode 100644
index 27f0cc66ee36..000000000000
--- a/external/libgltf/pathces/append_shader_version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
---- libgltf.org/src/Shaders.cpp	2014-08-18 09:19:48.323955939 +0200
-+++ libgltf/src/Shaders.cpp	2014-08-18 09:20:46.711953465 +0200
-@@ -11,6 +11,7 @@
- 
- #include <GL/glew.h>
- #include <cstdio>
-+#include <cstring>
- 
- namespace libgltf
- {
-@@ -166,7 +167,24 @@
-                                   unsigned int shaderId)
- {
-     GLint iGLSize = iSize;
--    glShaderSource(shaderId, 1, &pShader, &iGLSize);
-+    if( strstr(pShader,"#version") == 0 )
-+    {
-+        const GLchar* aSources[] = {
-+            "#version 130\n",
-+            pShader,
-+        };
-+
-+        const GLint aSizes[] = {
-+            strlen("#version 130\n"),
-+            iGLSize,
-+        };
-+
-+        glShaderSource(shaderId, 2, &aSources[0], &aSizes[0]);
-+    }
-+    else
-+    {
-+        glShaderSource(shaderId, 1, &pShader, &iGLSize);
-+    }
-     glCompileShader(shaderId);
-     int iStatus = 0;
-     glGetShaderiv(shaderId, GL_COMPILE_STATUS, &iStatus);
diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/pathces/missing_include.patch
deleted file mode 100644
index 8b05224be781..000000000000
--- a/external/libgltf/pathces/missing_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
---- libgltf.org/src/Shaders.cpp	2014-08-05 11:40:30.387537876 +0200
-+++ libgltf/src/Shaders.cpp	2014-08-05 11:41:13.887536123 +0200
-@@ -10,6 +10,7 @@
- #include "Shaders.h"
- 
- #include <GL/glew.h>
-+#include <cstdio>
- 
- namespace libgltf
- {