related: tdf#103884 remove gltf/collada feature

Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
author: Thorsten Behrens <Thorsten.Behrens@CIB.de> 2017-10-28 02:28:18 +0200
committer: Thorsten Behrens <Thorsten.Behrens@CIB.de> 2017-10-30 08:21:55 +0100
commit: 08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 (patch)
tree: 11f416701d1be0a962c7653ea86060f30f708b56 /external
parent: 8d994f83568073eb79ab987069f740c3c940405e (diff)
34 files changed, 0 insertions, 1636 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 590e216b3c2b..8f87fe70a5b3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,LIBCMIS,libcmis) \
 	$(call gb_Helper_optional,COINMP,coinmp) \
-	$(call gb_Helper_optional,COLLADA2GLTF,collada2gltf) \
 	$(call gb_Helper_optional,CPPUNIT,cppunit) \
 	$(call gb_Helper_optional,CT2N,ct2n) \
 	$(call gb_Helper_optional,CURL,curl) \
@@ -58,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBEOT,libeot) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
-	$(call gb_Helper_optional,LIBGLTF,libgltf) \
 	$(call gb_Helper_optional,LIBGPGERROR,libgpg-error) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
@@ -78,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
-	$(call gb_Helper_optional,OPENCOLLADA,opencollada) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
 	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
diff --git a/external/collada2gltf/GitSHA1.cpp b/external/collada2gltf/GitSHA1.cpp
deleted file mode 100644
index af4286061349..000000000000
--- a/external/collada2gltf/GitSHA1.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define GIT_SHA1 "cb1d97788a38d2928afb4622f6a25d012f0f8a54"
-char g_GIT_SHA1[] = GIT_SHA1;
diff --git a/external/collada2gltf/Makefile b/external/collada2gltf/Makefile
deleted file mode 100644
index 569ad8a0ba7a..000000000000
--- a/external/collada2gltf/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/Module_collada2gltf.mk b/external/collada2gltf/Module_collada2gltf.mk
deleted file mode 100644
index 789a8cb64530..000000000000
--- a/external/collada2gltf/Module_collada2gltf.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,collada2gltf))
-
-$(eval $(call gb_Module_add_targets,collada2gltf,\
-	StaticLibrary_collada2gltf \
-	UnpackedTarball_collada2gltf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/README b/external/collada2gltf/README
deleted file mode 100644
index 15060554b103..000000000000
--- a/external/collada2gltf/README
+++ /dev/null
@@ -1,4 +0,0 @@
-An open-source converter produces glTF assets from COLLADA using OpenCOLLADA.
-
-From:
-[https://github.com/amd/glTF/tree/master/converter/COLLADA2GLTF].
diff --git a/external/collada2gltf/StaticLibrary_collada2gltf.mk b/external/collada2gltf/StaticLibrary_collada2gltf.mk
deleted file mode 100644
index 03039976ea9d..000000000000
--- a/external/collada2gltf/StaticLibrary_collada2gltf.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,collada2gltf))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,collada2gltf,collada2gltf))
-
-$(eval $(call gb_StaticLibrary_use_externals,collada2gltf, \
-	opencollada_parser \
-	libpng \
-))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,collada2gltf))
-
-$(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\
-	-DUSE_OPEN3DGC \
-))
-
-# collada2gltf has a lot of warnings, suppress them.
-$(eval $(call gb_StaticLibrary_add_cxxflags,collada2gltf,\
-	-w \
-))
-ifeq ($(COM),MSC)
-$(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\
-	-D_CRT_SECURE_NO_WARNINGS \
-	-EHsc \
-))
-
-endif
-
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,collada2gltf,cpp))
-
-$(eval $(call gb_StaticLibrary_set_include,collada2gltf,\
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf) \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/assetModifiers \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/convert \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/json/include/rapidjson \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/extensions/o3dgc-compression \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/GLTF \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/helpers \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/JSON \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/profiles/webgl-1.0 \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/shaders \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,collada2gltf,\
-	UnpackedTarball/collada2gltf/COLLADA2GLTFWriter \
-	UnpackedTarball/collada2gltf/GitSHA1 \
-	UnpackedTarball/collada2gltf/GLTFOpenCOLLADAUtils \
-	UnpackedTarball/collada2gltf/assetModifiers/GLTFFlipUVModifier \
-	UnpackedTarball/collada2gltf/convert/meshConverter \
-	UnpackedTarball/collada2gltf/convert/animationConverter \
-	UnpackedTarball/collada2gltf/extensions/o3dgc-compression/GLTF-Open3DGC \
-	UnpackedTarball/collada2gltf/GLTF/GLTFAccessor \
-	UnpackedTarball/collada2gltf/GLTF/GLTFAccessorCache \
-	UnpackedTarball/collada2gltf/GLTF/GLTFAsset \
-	UnpackedTarball/collada2gltf/GLTF/GLTFAnimation \
-	UnpackedTarball/collada2gltf/GLTF/GLTFBuffer \
-	UnpackedTarball/collada2gltf/GLTF/GLTFConfig \
-	UnpackedTarball/collada2gltf/GLTF/GLTFEffect \
-	UnpackedTarball/collada2gltf/GLTF/GLTFExtraDataHandler \
-	UnpackedTarball/collada2gltf/GLTF/GLTFInputStream \
-	UnpackedTarball/collada2gltf/GLTF/GLTFMesh \
-	UnpackedTarball/collada2gltf/GLTF/GLTFOutputStream \
-	UnpackedTarball/collada2gltf/GLTF/GLTFPrimitive \
-	UnpackedTarball/collada2gltf/GLTF/GLTFProfile \
-	UnpackedTarball/collada2gltf/GLTF/GLTFSkin \
-	UnpackedTarball/collada2gltf/GLTF/GLTFUtils \
-	UnpackedTarball/collada2gltf/GLTF/GLTFWriter \
-	UnpackedTarball/collada2gltf/helpers/geometryHelpers \
-	UnpackedTarball/collada2gltf/helpers/mathHelpers \
-	UnpackedTarball/collada2gltf/JSON/JSONArray \
-	UnpackedTarball/collada2gltf/JSON/JSONNumber \
-	UnpackedTarball/collada2gltf/JSON/JSONObject \
-	UnpackedTarball/collada2gltf/JSON/JSONString \
-	UnpackedTarball/collada2gltf/JSON/JSONValue \
-	UnpackedTarball/collada2gltf/profiles/webgl-1.0/GLTFWebGL_1_0_Profile \
-	UnpackedTarball/collada2gltf/shaders/commonProfileShaders \
-))
-
-# o3dgc external library compiled from collada2gltf
-$(eval $(call gb_StaticLibrary_set_include,collada2gltf,\
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/o3dgc/src/o3dgc_common_lib/inc \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/o3dgc/src/o3dgc_decode_lib/inc \
-	-I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/o3dgc/src/o3dgc_encode_lib/inc \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,collada2gltf,\
-	UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/src/o3dgcArithmeticCodec \
-	UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/src/o3dgcTools \
-	UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_common_lib/src/o3dgcTriangleFans \
-	UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_decode_lib/src/o3dgcDynamicVectorDecoder \
-	UnpackedTarball/collada2gltf/dependencies/o3dgc/src/o3dgc_encode_lib/src/o3dgcDynamicVectorEncoder \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
deleted file mode 100644
index e01ca53d287b..000000000000
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,collada2gltf))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,collada2gltf,$(COLLADA2GLTF_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/GitSHA1.cpp))
-
-$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
-	external/collada2gltf/patches/wrong_uri_usage.patch.1 \
-	external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 \
-	external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \
-	external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
-	external/collada2gltf/patches/shader_compatibility.patch.1 \
-	external/collada2gltf/patches/drop_tr1_support.patch.1 \
-	external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
deleted file mode 100644
index 5da297836064..000000000000
--- a/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp
---- collada2gltf.org/shaders/commonProfileShaders.cpp	2014-11-26 22:05:07.445842977 +0100
-+++ collada2gltf/shaders/commonProfileShaders.cpp	2014-11-26 22:07:24.313844588 +0100
-@@ -367,7 +367,8 @@
-     public:
-         
-         GLSLShader(shared_ptr <GLTFProfile> profile) {
--            this->_declarations = "#ifdef GL_ES_VERSION_2_0\n";
-+            this->_declarations = "#version 130\n";
-+            this->_declarations += "#ifdef GL_ES_VERSION_2_0\n";
-             this->_declarations += "precision highp float;\n";
-             this->_declarations += "#endif\n";
-             this->_body = "void main(void) {\n";
diff --git a/external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 b/external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1
deleted file mode 100644
index a1fbee874263..000000000000
--- a/external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp
---- collada2gltf.org/shaders/commonProfileShaders.cpp	2014-07-06 04:20:31.152197885 +0200
-+++ collada2gltf/shaders/commonProfileShaders.cpp	2014-07-06 04:27:21.681181083 +0200
-@@ -495,6 +495,10 @@
-             this->_profile = profile;
-             this->_instanceProgram = new GLSLProgram(profile);
-         }
-+
-+        ~Pass() {
-+            delete _instanceProgram;
-+        }
-         
-         GLSLProgram* instanceProgram() {
-             return this->_instanceProgram;
-@@ -1188,6 +1192,10 @@
-             fragmentShader->appendCode("}\n");
-             
-         }
-+
-+        ~Technique() {
-+            delete _pass;
-+        }
-         
-         shared_ptr <GLTF::JSONObject> parameters() {
-             return _parameters;
diff --git a/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 b/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
deleted file mode 100644
index 81b4db86f016..000000000000
--- a/external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur collada2gltf.org/COLLADA2GLTFWriter.cpp collada2gltf/COLLADA2GLTFWriter.cpp
---- collada2gltf.org/COLLADA2GLTFWriter.cpp	2014-07-06 06:42:01.305850400 +0200
-+++ collada2gltf/COLLADA2GLTFWriter.cpp	2014-07-06 06:45:57.000840753 +0200
-@@ -75,10 +75,13 @@
-                 
- 		COLLADAFW::Root root(&this->_loader, this);
-         this->_loader.registerExtraDataCallbackHandler(this->_extraDataHandler);
--		if (!root.loadDocument(asset->getInputFilePath()))
-+		if (!root.loadDocument(asset->getInputFilePath())) {
-+                    delete _extraDataHandler;
- 			return false;
-+                }
-         
-         asset->write();
-+        delete _extraDataHandler;
-                 
- 		return true;
- 	}
diff --git a/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 b/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1
deleted file mode 100644
index dd1344bc077b..000000000000
--- a/external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur collada2gltf.org/GLTF/GLTFAccessorCache.cpp collada2gltf/GLTF/GLTFAccessorCache.cpp
---- collada2gltf.org/GLTF/GLTFAccessorCache.cpp	2014-07-06 02:10:04.803518202 +0200
-+++ collada2gltf/GLTF/GLTFAccessorCache.cpp	2014-07-06 02:10:58.623515999 +0200
-@@ -22,7 +22,7 @@
-     }
- 
-     GLTFAccessorCache::~GLTFAccessorCache() {
--        delete this->m_pData;
-+        delete[] this->m_pData;
-     }
-     
-     bool GLTFAccessorCache::operator<(const GLTFAccessorCache& rhs) const {
diff --git a/external/collada2gltf/patches/drop_tr1_support.patch.1 b/external/collada2gltf/patches/drop_tr1_support.patch.1
deleted file mode 100644
index 0d15897b9d60..000000000000
--- a/external/collada2gltf/patches/drop_tr1_support.patch.1
+++ /dev/null
@@ -1,403 +0,0 @@
-diff -urN -U 4 COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp
---- COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp	2014-05-25 11:30:45.116840301 +0200
-+++ COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -25,9 +25,6 @@
- #include "GLTFFlipUVModifier.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/COLLADA2GLTFWriter.cpp COLLADA2GLTF_/COLLADA2GLTFWriter.cpp
---- COLLADA2GLTF/COLLADA2GLTFWriter.cpp	2014-05-25 11:30:45.111840284 +0200
-+++ COLLADA2GLTF_/COLLADA2GLTFWriter.cpp	2014-09-29 14:35:52.299612815 +0200
-@@ -35,9 +35,6 @@
- #include <algorithm>
- 
- 
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- using namespace COLLADAFW;
- using namespace COLLADABU;
-diff -urN -U 4 COLLADA2GLTF/convert/animationConverter.cpp COLLADA2GLTF_/convert/animationConverter.cpp
---- COLLADA2GLTF/convert/animationConverter.cpp	2014-05-25 11:30:45.116840301 +0200
-+++ COLLADA2GLTF_/convert/animationConverter.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -9,9 +9,6 @@
- #include "GLTF-Open3DGC.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/convert/meshConverter.cpp COLLADA2GLTF_/convert/meshConverter.cpp
---- COLLADA2GLTF/convert/meshConverter.cpp	2014-05-25 11:30:45.117840304 +0200
-+++ COLLADA2GLTF_/convert/meshConverter.cpp	2014-09-29 14:35:52.311612817 +0200
-@@ -23,9 +23,6 @@
- //--- X3DGC
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- 
-diff -urN -U 4 COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp
---- COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp	2014-05-25 11:30:45.143840389 +0200
-+++ COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp	2014-09-29 14:35:52.299612815 +0200
-@@ -40,9 +40,6 @@
- 
- using namespace o3dgc;
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAccessor.cpp COLLADA2GLTF_/GLTF/GLTFAccessor.cpp
---- COLLADA2GLTF/GLTF/GLTFAccessor.cpp	2014-05-25 11:30:45.111840284 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFAccessor.cpp	2014-09-29 14:35:52.307612816 +0200
-@@ -27,9 +27,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAnimation.cpp COLLADA2GLTF_/GLTF/GLTFAnimation.cpp
---- COLLADA2GLTF/GLTF/GLTFAnimation.cpp	2014-05-25 11:30:45.112840287 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFAnimation.cpp	2014-09-29 14:35:52.311612817 +0200
-@@ -28,9 +28,6 @@
- 
- using namespace rapidjson;
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAsset.cpp COLLADA2GLTF_/GLTF/GLTFAsset.cpp
---- COLLADA2GLTF/GLTF/GLTFAsset.cpp	2014-05-25 11:30:45.112840287 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFAsset.cpp	2014-09-29 14:35:52.307612816 +0200
-@@ -7,9 +7,6 @@
- #include "geometryHelpers.h"
- #include "../shaders/commonProfileShaders.h"
- 
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFBuffer.cpp COLLADA2GLTF_/GLTF/GLTFBuffer.cpp
---- COLLADA2GLTF/GLTF/GLTFBuffer.cpp	2014-05-25 11:30:45.112840287 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFBuffer.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -29,9 +29,6 @@
- 
- using namespace rapidjson;
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFConfig.cpp COLLADA2GLTF_/GLTF/GLTFConfig.cpp
---- COLLADA2GLTF/GLTF/GLTFConfig.cpp	2014-05-25 11:30:45.112840287 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFConfig.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -24,9 +24,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFEffect.cpp COLLADA2GLTF_/GLTF/GLTFEffect.cpp
---- COLLADA2GLTF/GLTF/GLTFEffect.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFEffect.cpp	2014-09-29 14:35:52.307612816 +0200
-@@ -28,9 +28,6 @@
- #include "../shaders/commonProfileShaders.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtraDataHandler.cpp COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.cpp
---- COLLADA2GLTF/GLTF/GLTFExtraDataHandler.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.cpp	2014-09-29 14:35:52.299612815 +0200
-@@ -8,12 +8,9 @@
-
- #include <vector> //FIXME: this should be included by OpenCOLLADA.
- #include "../GLTFOpenCOLLADA.h"
--#include "GLTFExtraDataHandler.h"
- #include "GLTF.h"
-+#include "GLTFExtraDataHandler.h"
-
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
-
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtraDataHandler.h COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.h
---- COLLADA2GLTF/GLTF/GLTFExtraDataHandler.h	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.h	2014-09-29 14:37:50.127630964 +0200
-@@ -6,14 +6,6 @@
- 
- #include "COLLADASaxFWLIExtraDataCallbackHandler.h"
- 
--#if (defined(WIN32) || defined(_LIBCPP_VERSION) || __cplusplus > 199711L)
--#include <memory>
--#include <unordered_map>
--#else
--#include <tr1/memory>
--#include <tr1/unordered_map>
--#endif
--
- namespace GLTF
- {
-     class JSONObject;
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtras.cpp COLLADA2GLTF_/GLTF/GLTFExtras.cpp
---- COLLADA2GLTF/GLTF/GLTFExtras.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFExtras.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -24,9 +24,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTF.h COLLADA2GLTF_/GLTF/GLTF.h
---- COLLADA2GLTF/GLTF/GLTF.h	2014-05-25 11:30:45.111840284 +0200
-+++ COLLADA2GLTF_/GLTF/GLTF.h	2014-09-29 14:37:33.531629524 +0200
-@@ -42,13 +42,8 @@
- #include <cstddef>
- #include <cstdint>
- 
--#if (defined(WIN32) || defined(_LIBCPP_VERSION) || __cplusplus > 199711L)
- #include <memory>
- #include <unordered_map>
--#else 
--#include <tr1/memory>
--#include <tr1/unordered_map>
--#endif
- 
- // RapidJSON headers
- #include "prettywriter.h"	
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFInputStream.cpp COLLADA2GLTF_/GLTF/GLTFInputStream.cpp
---- COLLADA2GLTF/GLTF/GLTFInputStream.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFInputStream.cpp	2014-09-29 14:35:52.299612815 +0200
-@@ -23,9 +23,6 @@
- 
- #include "GLTF.h"
- 
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFMesh.cpp COLLADA2GLTF_/GLTF/GLTFMesh.cpp
---- COLLADA2GLTF/GLTF/GLTFMesh.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFMesh.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -29,9 +29,6 @@
- #include "../helpers/geometryHelpers.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFOutputStream.cpp COLLADA2GLTF_/GLTF/GLTFOutputStream.cpp
---- COLLADA2GLTF/GLTF/GLTFOutputStream.cpp	2014-05-25 11:30:45.113840291 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFOutputStream.cpp	2014-09-29 14:35:52.311612817 +0200
-@@ -23,9 +23,6 @@
- 
- #include "GLTF.h"
- 
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFPrimitive.cpp COLLADA2GLTF_/GLTF/GLTFPrimitive.cpp
---- COLLADA2GLTF/GLTF/GLTFPrimitive.cpp	2014-05-25 11:30:45.114840294 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFPrimitive.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -27,9 +27,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFSkin.cpp COLLADA2GLTF_/GLTF/GLTFSkin.cpp
---- COLLADA2GLTF/GLTF/GLTFSkin.cpp	2014-05-25 11:30:45.114840294 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFSkin.cpp	2014-09-29 14:35:52.303612815 +0200
-@@ -24,9 +24,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFWriter.cpp COLLADA2GLTF_/GLTF/GLTFWriter.cpp
---- COLLADA2GLTF/GLTF/GLTFWriter.cpp	2014-05-25 11:30:45.115840297 +0200
-+++ COLLADA2GLTF_/GLTF/GLTFWriter.cpp	2014-09-29 14:35:52.307612816 +0200
-@@ -29,9 +29,6 @@
- #include "GLTFAsset.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/GLTFOpenCOLLADAUtils.cpp COLLADA2GLTF_/GLTFOpenCOLLADAUtils.cpp
---- COLLADA2GLTF/GLTFOpenCOLLADAUtils.cpp	2014-05-25 11:30:45.115840297 +0200
-+++ COLLADA2GLTF_/GLTFOpenCOLLADAUtils.cpp	2014-09-29 14:35:52.295612814 +0200
-@@ -25,9 +25,6 @@
- #include "GLTFOpenCOLLADA.h"
- #include "GLTFOpenCOLLADAUtils.h"
- 
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- void fillFloatPtrFromOpenCOLLADAMatrix4(const COLLADABU::Math::Matrix4 &matrix, float *m) {
-diff -urN -U 4 COLLADA2GLTF/helpers/geometryHelpers.cpp COLLADA2GLTF_/helpers/geometryHelpers.cpp
---- COLLADA2GLTF/helpers/geometryHelpers.cpp	2014-05-25 11:30:45.143840389 +0200
-+++ COLLADA2GLTF_/helpers/geometryHelpers.cpp	2014-09-29 14:35:52.291612813 +0200
-@@ -27,9 +27,6 @@
- #include "geometryHelpers.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/helpers/mathHelpers.cpp COLLADA2GLTF_/helpers/mathHelpers.cpp
---- COLLADA2GLTF/helpers/mathHelpers.cpp	2014-05-25 11:30:45.143840389 +0200
-+++ COLLADA2GLTF_/helpers/mathHelpers.cpp	2014-09-29 14:35:52.291612813 +0200
-@@ -26,9 +26,6 @@
- #include "mathHelpers.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF
-diff -urN -U 4 COLLADA2GLTF/JSON/JSONArray.cpp COLLADA2GLTF_/JSON/JSONArray.cpp
---- COLLADA2GLTF/JSON/JSONArray.cpp	2014-05-25 11:30:45.115840297 +0200
-+++ COLLADA2GLTF_/JSON/JSONArray.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -32,9 +32,6 @@
- #include "document.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/JSON/JSONNumber.cpp COLLADA2GLTF_/JSON/JSONNumber.cpp
---- COLLADA2GLTF/JSON/JSONNumber.cpp	2014-05-25 11:30:45.115840297 +0200
-+++ COLLADA2GLTF_/JSON/JSONNumber.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -27,9 +27,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/JSON/JSONObject.cpp COLLADA2GLTF_/JSON/JSONObject.cpp
---- COLLADA2GLTF/JSON/JSONObject.cpp	2014-05-25 11:30:45.116840301 +0200
-+++ COLLADA2GLTF_/JSON/JSONObject.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -29,9 +29,6 @@
- #include "document.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- 
-diff -urN -U 4 COLLADA2GLTF/JSON/JSONString.cpp COLLADA2GLTF_/JSON/JSONString.cpp
---- COLLADA2GLTF/JSON/JSONString.cpp	2014-05-25 11:30:45.116840301 +0200
-+++ COLLADA2GLTF_/JSON/JSONString.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -30,9 +30,6 @@
- #include "GLTF.h"
- 
- using namespace std;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- 
- namespace GLTF 
- {
-diff -urN -U 4 COLLADA2GLTF/JSON/JSONValue.cpp COLLADA2GLTF_/JSON/JSONValue.cpp
---- COLLADA2GLTF/JSON/JSONValue.cpp	2014-05-25 11:30:45.116840301 +0200
-+++ COLLADA2GLTF_/JSON/JSONValue.cpp	2014-09-29 14:35:52.315612818 +0200
-@@ -27,9 +27,6 @@
- #include "GLTF.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- namespace GLTF 
-diff -urN -U 4 COLLADA2GLTF/main.cpp COLLADA2GLTF_/main.cpp
---- COLLADA2GLTF/main.cpp	2014-05-25 11:30:45.143840389 +0200
-+++ COLLADA2GLTF_/main.cpp	2014-09-29 14:35:52.295612814 +0200
-@@ -41,9 +41,6 @@
- #include "JSONObject.h"
- 
- using namespace rapidjson;
--#if __cplusplus <= 199711L
--using namespace std::tr1;
--#endif
- using namespace std;
- 
- #ifndef _CRT_SECURE_NO_WARNINGS
diff --git a/external/collada2gltf/patches/shader_compatibility.patch.1 b/external/collada2gltf/patches/shader_compatibility.patch.1
deleted file mode 100644
index 948d8caa5f88..000000000000
--- a/external/collada2gltf/patches/shader_compatibility.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp
---- collada2gltf.org/shaders/commonProfileShaders.cpp	2014-08-17 08:57:52.187210533 +0200
-+++ collada2gltf/shaders/commonProfileShaders.cpp	2014-08-17 08:59:48.427215491 +0200
-@@ -367,7 +367,9 @@
-     public:
-         
-         GLSLShader(shared_ptr <GLTFProfile> profile) {
--            this->_declarations = "precision highp float;\n";;
-+            this->_declarations = "#ifdef GL_ES_VERSION_2_0\n";
-+            this->_declarations += "precision highp float;\n";
-+            this->_declarations += "#endif\n";
-             this->_body = "void main(void) {\n";
-             this->_profile = profile;
-         }
diff --git a/external/collada2gltf/patches/wrong_uri_usage.patch.1 b/external/collada2gltf/patches/wrong_uri_usage.patch.1
deleted file mode 100644
index 7c688ad97448..000000000000
--- a/external/collada2gltf/patches/wrong_uri_usage.patch.1
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp
---- collada2gltf.org/GLTF/GLTFAsset.cpp	2014-05-23 19:19:39.505246750 +0200
-+++ collada2gltf/GLTF/GLTFAsset.cpp	2014-05-23 19:20:05.005245669 +0200
-@@ -191,12 +191,9 @@
-     shared_ptr<GLTFOutputStream> GLTFAsset::createOutputStreamIfNeeded(const std::string& streamName) {
- 
-         if (this->_nameToOutputStream.count(streamName) == 0) {
--            COLLADABU::URI inputURI(this->getInputFilePath().c_str());
-             COLLADABU::URI outputURI(this->getOutputFilePath().c_str());
-             
--            std::string folder = outputURI.getPathDir();
--            std::string fileName = inputURI.getPathFileBase();
--            
-+            std::string folder = COLLADABU::URI(outputURI.getPathDir()).toNativePath();
-             shared_ptr<GLTFOutputStream> outputStream = shared_ptr <GLTFOutputStream> (new GLTFOutputStream(folder, streamName, ""));
-             this->_nameToOutputStream[streamName] = outputStream;
-         }
-@@ -280,13 +277,13 @@
-             this->_bundleOutputPath = outputBundlePathURI.toNativePath();
-             
-             COLLADABU::URI outputPathURI(outputBundlePathURI.getURIString() + "/" + outputBundlePathURI.getPathFileBase() + "." + "json");
--            this->_outputFilePath = outputPathURI.toNativePath();
-+            this->_outputFilePath = outputPathURI.getURIString();
-             //                this->log("outputBundlePath:%s\n",outputBundlePathURI.toNativePath().c_str());
-             //                this->log("outputPath:%s\n",outputPathURI.toNativePath().c_str());
-         } else {
-             this->_bundleOutputPath = outputBundlePathURI.toNativePath();
-             COLLADABU::URI outputPathURI(outputBundlePathURI.getURIString() + "/" + outputBundlePathURI.getPathFileBase()  + "." + "json");
--            this->_outputFilePath = outputPathURI.toNativePath();
-+            this->_outputFilePath = outputPathURI.getURIString();
-         }
-         COLLADABU::Utils::createDirectoryIfNeeded(this->_bundleOutputPath.c_str());
-     }
-@@ -376,10 +373,10 @@
-                     COLLADABU::URI outputImagePathURI(inputImagePath.c_str());
-                     
-                     COLLADABU::URI outputURI(this->getOutputFilePath().c_str());
--                    std::string folder = outputURI.getPathDir();
-+                    std::string folder = COLLADABU::URI(outputURI.getPathDir()).toNativePath();
-                     std::string outputPath = folder + outputImagePathURI.getPathFile();
--                    
--                    std::ifstream f1(inputImagePath.c_str(), std::fstream::binary);
-+
-+                    std::ifstream f1(COLLADABU::URI(inputImagePath).toNativePath().c_str(), std::fstream::binary);
-                     std::ofstream f2(outputPath.c_str(), std::fstream::binary);
-                     
-                     if (this->_converterConfig->boolForKeyPath("verboseLogging")) {
-@@ -397,7 +394,8 @@
-         this->_root = shared_ptr <GLTF::JSONObject> (new GLTF::JSONObject());
-         this->_root->createObjectIfNeeded(kNodes);
-         
--        this->_writer.initWithPath(this->getOutputFilePath().c_str());
-+        COLLADABU::URI outputURI(this->getOutputFilePath().c_str());
-+        this->_writer.initWithPath(outputURI.toNativePath().c_str());
-     }
-     
-     static void __eval(JSONValue* value, void *context) {
-@@ -427,7 +424,7 @@
-     void GLTFAsset::_writeJSONResource(const std::string &path, shared_ptr<JSONObject> obj) {
-         GLTF::GLTFWriter resultsWriter;
-         COLLADABU::URI outputURI(this->resourceOuputPathForPath(path));
--        std::string aPath = this->getOutputFolderPath() + outputURI.getPathFile();
-+        std::string aPath = COLLADABU::URI(this->getOutputFolderPath() + outputURI.getPathFile()).toNativePath();
-         resultsWriter.initWithPath(aPath);
-         obj->write(&resultsWriter);
-         
-diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp
---- collada2gltf.org/shaders/commonProfileShaders.cpp	2014-05-23 19:19:39.521246749 +0200
-+++ collada2gltf/shaders/commonProfileShaders.cpp	2014-05-23 19:20:09.085245497 +0200
-@@ -294,7 +294,7 @@
-             //also write the file on disk
-             if (shaderString.size() > 0) {
-                 COLLADABU::URI outputURI(asset->getOutputFilePath());
--                std::string shaderPath =  outputURI.getPathDir() + path;
-+                std::string shaderPath =  COLLADABU::URI(outputURI.getPathDir()).toNativePath() + path;
-                 GLTF::GLTFUtils::writeData(shaderPath, "w",(unsigned char*)shaderString.c_str(), shaderString.size());
-                 if (!CONFIG_BOOL(asset, "outputProgress") && asset->converterConfig()->boolForKeyPath("verboseLogging")) {
-                     asset->log("[shader]: %s\n", shaderPath.c_str());
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
deleted file mode 100644
index da5655338eb2..000000000000
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,libgltf))
-
-$(eval $(call gb_ExternalProject_use_autoconf,libgltf,build))
-
-$(eval $(call gb_ExternalProject_register_targets,libgltf,\
-	build \
-))
-
-$(eval $(call gb_ExternalProject_use_externals,libgltf,\
-	boost_headers \
-	epoxy \
-	glm_headers \
-))
-
-
-ifeq ($(COM),MSC)
-
-libgltf_AdditionalIncludes :=
-
-ifeq ($(SYSTEM_BOOST),)
-libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,boost)"
-endif
-
-ifeq ($(SYSTEM_EPOXY),)
-libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,epoxy)/include"
-endif
-
-ifeq ($(SYSTEM_GLM),)
-libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)"
-endif
-
-$(call gb_ExternalProject_get_state_target,libgltf,build) :
-	$(call gb_ExternalProject_run,build,\
-		msbuild.exe libgltf.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
-			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
-			$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
-			$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
-			$(if $(filter 150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
-			'/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
-			/p:AdditionalLibraryDirectories=$(if $(SYSTEM_EPOXY),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,epoxy))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
-	,build/win32)
-
-else # !ifeq($(COM),MSC)
-
-libgltf_CPPFLAGS=$(CPPFLAGS)
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
-ifneq (,$(gb_ENABLE_DBGUTIL))
-libgltf_CPPFLAGS+=-D_GLIBCXX_DEBUG
-endif
-endif
-
-$(call gb_ExternalProject_get_state_target,libgltf,build) :
-	$(call gb_ExternalProject_run,build,\
-		export PKG_CONFIG="" \
-		&& ./configure \
-			--disable-shared \
-			--enable-static \
-			--with-pic \
-			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
-			--disable-werror \
-			BOOST_CFLAGS="$(BOOST_CPPFLAGS)" \
-			EPOXY_CFLAGS="$(if $(SYSTEM_EPOXY),$(EPOXY_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,epoxy)/include)" \
-			GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
-			$(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
-		&& $(MAKE) \
-	)
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/Makefile b/external/libgltf/Makefile
deleted file mode 100644
index 569ad8a0ba7a..000000000000
--- a/external/libgltf/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/Module_libgltf.mk b/external/libgltf/Module_libgltf.mk
deleted file mode 100644
index c6ebed6102d8..000000000000
--- a/external/libgltf/Module_libgltf.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,libgltf))
-
-$(eval $(call gb_Module_add_targets,libgltf,\
-	ExternalProject_libgltf \
-	UnpackedTarball_libgltf \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/README b/external/libgltf/README
deleted file mode 100644
index 41fbde692e70..000000000000
--- a/external/libgltf/README
+++ /dev/null
@@ -1 +0,0 @@
-Render glTF 3D models.
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
deleted file mode 100644
index 8f677ab62a0a..000000000000
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,libgltf))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,libgltf,$(LIBGLTF_TARBALL)))
-
-$(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/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
deleted file mode 100644
index 0013d4796399..000000000000
--- a/external/libgltf/libgltf-add-a-vao.1
+++ /dev/null
@@ -1,49 +0,0 @@
-From b260dd9f337af262a48054f3ff537df38083513a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-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, &mVAO);
-+    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<std::string> vCameraIndex;
--- 
-2.9.4
-
diff --git a/external/libgltf/libgltf-disable-non-core.1 b/external/libgltf/libgltf-disable-non-core.1
deleted file mode 100644
index c6251a01ffb1..000000000000
--- a/external/libgltf/libgltf-disable-non-core.1
+++ /dev/null
@@ -1,28 +0,0 @@
-From f944ca8d14feee3787937bff0ba5b47e47f1d04f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-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, &mVAO);
-     glBindVertexArray(mVAO);
--- 
-2.9.4
-
diff --git a/external/libgltf/libgltf-msvc-disable-sse2.patch.1 b/external/libgltf/libgltf-msvc-disable-sse2.patch.1
deleted file mode 100644
index 4644c89ec82b..000000000000
--- a/external/libgltf/libgltf-msvc-disable-sse2.patch.1
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgltf/build/win32/libgltf.vcxproj.orig	2014-10-02 15:27:23.057965577 +0200
-+++ libgltf/build/win32/libgltf.vcxproj	2014-10-02 15:27:25.845965361 +0200
-@@ -90,6 +90,7 @@
-     <ClCompile>
-       <WarningLevel>Level4</WarningLevel>
-       <Optimization>MaxSpeed</Optimization>
-+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
-       <AdditionalIncludeDirectories>..\..\inc;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/external/libgltf/libgltf-msvc-x64.patch.1 b/external/libgltf/libgltf-msvc-x64.patch.1
deleted file mode 100644
index 32a831bebd5c..000000000000
--- a/external/libgltf/libgltf-msvc-x64.patch.1
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ur libgltf.org/build/win32/libgltf.vcxproj libgltf/build/win32/libgltf.vcxproj
---- libgltf.org/build/win32/libgltf.vcxproj	2015-02-18 21:36:34.059042700 +0100
-+++ libgltf/build/win32/libgltf.vcxproj	2015-02-18 21:38:07.969414000 +0100
-@@ -5,10 +5,18 @@
-       <Configuration>Debug</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug|x64">
-+      <Configuration>Debug</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release|Win32">
-       <Configuration>Release</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release|x64">
-+      <Configuration>Release</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-   </ItemGroup>
-   <ItemGroup>
-     <ClInclude Include="..\..\inc\libgltf.h" />
-@@ -53,6 +61,12 @@
-     <CharacterSet>MultiByte</CharacterSet>
-     <PlatformToolset>v110</PlatformToolset>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>true</UseDebugLibraries>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v110</PlatformToolset>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
-     <UseDebugLibraries>false</UseDebugLibraries>
-@@ -60,15 +74,28 @@
-     <CharacterSet>MultiByte</CharacterSet>
-     <PlatformToolset>v110</PlatformToolset>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <UseDebugLibraries>false</UseDebugLibraries>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <PlatformToolset>v110</PlatformToolset>
-+  </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-   <ImportGroup Label="ExtensionSettings">
-   </ImportGroup>
-   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <PropertyGroup Label="UserMacros" />
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-     <ClCompile>
-@@ -83,10 +110,42 @@
-       <AdditionalDependencies>opengl32.lib;epoxy32.lib;$(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-+    <ClCompile>
-+      <WarningLevel>Level4</WarningLevel>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>..\..\inc;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <WholeProgramOptimization>false</WholeProgramOptimization>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <AdditionalDependencies>opengl32.lib;epoxy32.lib;$(AdditionalDependencies)</AdditionalDependencies>
-+    </Link>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-     <ClCompile>
-       <WarningLevel>Level4</WarningLevel>
-       <Optimization>MaxSpeed</Optimization>
-+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-+      <FunctionLevelLinking>true</FunctionLevelLinking>
-+      <IntrinsicFunctions>true</IntrinsicFunctions>
-+      <AdditionalIncludeDirectories>..\..\inc;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <WholeProgramOptimization>false</WholeProgramOptimization>
-+    </ClCompile>
-+    <Link>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <AdditionalLibraryDirectories>$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <AdditionalDependencies>opengl32.lib;epoxy32.lib;$(AdditionalDependencies)</AdditionalDependencies>
-+      <SubSystem>Windows</SubSystem>
-+    </Link>
-+  </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+    <ClCompile>
-+      <WarningLevel>Level4</WarningLevel>
-+      <Optimization>MaxSpeed</Optimization>
-       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/external/libgltf/libgltf-quads-to-triangles.1 b/external/libgltf/libgltf-quads-to-triangles.1
deleted file mode 100644
index 94361e19663e..000000000000
--- a/external/libgltf/libgltf-quads-to-triangles.1
+++ /dev/null
@@ -1,69 +0,0 @@
-From b01a2afeac2749ade7fac96b663a684aa988b28f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-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 RenderWithFBO::inverseBitMap(int width, int height)
-         1.0f, 1.0f,
-         1.0f, 0.0f,
-         0.0f, 0.0f,
-+        0.0f, 1.0f,
-     };
-     GLfloat squareVertices[] =
-     {
-         -1.0f, -1.0f, -1.0,
-          1.0f, -1.0f, -1.0,
-          1.0f,  1.0f, -1.0,
--        -1.0f,  1.0f, -1.0
-+        -1.0f,  1.0f, -1.0,
-+        -1.0f, -1.0f, -1.0,
-     };
-     setBufferForFbo(texCoordBuf, vertexBuf, coordVertices,
-                     sizeof(coordVertices), squareVertices,
-@@ -266,7 +268,8 @@ void RenderWithFBO::inverseTexture(GLuint proId, GLuint texCoordBuf,
-     glActiveTexture(GL_TEXTURE0);
-     glBindTexture(GL_TEXTURE_2D, mShotTexId);
-     glUniform1i(textureId, 0);
--    glDrawArrays(GL_QUADS, 0, 4);
-+    glDrawArrays(GL_TRIANGLES, 0, 3);
-+    glDrawArrays(GL_TRIANGLES, 2, 3);
-     glDisableVertexAttribArray(vertexId);
-     glDisableVertexAttribArray(texCoordId);
-     glActiveTexture(GL_TEXTURE0);
-@@ -416,7 +419,8 @@ int RenderWithFBO::renderFboTexture()
- 
-     glBindTexture(GL_TEXTURE_2D, mRenderTexId);
-     glUniform1i(textureId, 0);
--    glDrawArrays(GL_QUADS, 0, 4);
-+    glDrawArrays(GL_TRIANGLES, 0, 3);
-+    glDrawArrays(GL_TRIANGLES, 2, 3);
-     glDisableVertexAttribArray(texCoordId);
-     glDisableVertexAttribArray(vertexId);
-     return LIBGLTF_SUCCESS;
-@@ -456,6 +460,7 @@ int RenderWithFBO::createAndBindFbo(int width, int height, bool isUseMSAA)
-         1.0f, 0.0f,
-         1.0f, 1.0f,
-         0.0f, 1.0f,
-+        0.0f, 0.0f,
-     };
-     GLfloat squareVertices[] =
-     {
-@@ -463,6 +468,7 @@ int RenderWithFBO::createAndBindFbo(int width, int height, bool isUseMSAA)
-          1.0f, -1.0f,
-          1.0f,  1.0f,
-         -1.0f,  1.0f,
-+        -1.0f, -1.0f,
-     };
-     setBufferForFbo(mTexCoordBuf, mVertexBuf, coordVertices,
-                     sizeof(coordVertices), squareVertices,
--- 
-2.9.4
-
diff --git a/external/opencollada/Makefile b/external/opencollada/Makefile
deleted file mode 100644
index 569ad8a0ba7a..000000000000
--- a/external/opencollada/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/opencollada/Module_opencollada.mk b/external/opencollada/Module_opencollada.mk
deleted file mode 100644
index 4ea3c7ee5a5f..000000000000
--- a/external/opencollada/Module_opencollada.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,opencollada))
-
-$(eval $(call gb_Module_add_targets,opencollada,\
-	StaticLibrary_opencollada_parser \
-	UnpackedTarball_opencollada \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/opencollada/README b/external/opencollada/README
deleted file mode 100644
index 225bcbeb93d8..000000000000
--- a/external/opencollada/README
+++ /dev/null
@@ -1,5 +0,0 @@
-OpenCOLLADA is a COLLADA SDK that includes plug-ins for Autodesk Maya and 3ds Max.
-LibreOffice mainly use it for parse collada files (*.dae).
-
-From:
-[https://github.com/khronosGroup/OpenCOLLADA/].
diff --git a/external/opencollada/StaticLibrary_opencollada_parser.mk b/external/opencollada/StaticLibrary_opencollada_parser.mk
deleted file mode 100644
index 74b21ed917b1..000000000000
--- a/external/opencollada/StaticLibrary_opencollada_parser.mk
+++ /dev/null
@@ -1,273 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,opencollada_parser))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,opencollada_parser,opencollada))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,opencollada_parser))
-
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,opencollada_parser,cpp))
-
-$(eval $(call gb_StaticLibrary_use_externals,opencollada_parser,\
-	libxml2 \
-))
-
-# Avoid warnings
-$(eval $(call gb_StaticLibrary_add_cxxflags,opencollada_parser,-w))
-$(eval $(call gb_StaticLibrary_add_cflags,opencollada_parser,-w))
-
-# Use libxml2 for xml parsing (other option is expat)
-$(eval $(call gb_StaticLibrary_add_defs,opencollada_parser,\
-	-DGENERATEDSAXPARSER_XMLPARSER_LIBXML \
-	-DGENERATEDSAXPARSER_VALIDATION \
-	-DPCRE_STATIC \
-))
-
-# OpenCollada parser part
-$(eval $(call gb_StaticLibrary_set_include,opencollada_parser,\
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include/Math \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADAFramework/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADASaxFrameworkLoader/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADASaxFrameworkLoader/include/generated14 \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADASaxFrameworkLoader/include/generated15 \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/MathMLSolver/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/MathMLSolver/include/AST \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/UTF/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/GeneratedSaxParser/include \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,opencollada_parser,\
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUHashFunctions \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUIDList \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUNativeString \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUPcreCompiledPattern \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUPrecompiledHeaders \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUStringUtils \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUURI \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/COLLADABUUtils \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/Math/COLLADABUMathMatrix3 \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/Math/COLLADABUMathMatrix4 \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/Math/COLLADABUMathQuaternion \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/Math/COLLADABUMathUtils \
-	UnpackedTarball/opencollada/COLLADABaseUtils/src/Math/COLLADABUMathVector3 \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWAxisInfo \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWCamera \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWColor \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWConstants \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWEffect \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWEffectCommon \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWFileInfo \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWFloatOrDoubleArray \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWFormula \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWFormulas \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWGeometry \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWImage \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWInstanceKinematicsScene \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWKinematicsController \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWKinematicsModel \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWKinematicsScene \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWLight \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWLoaderUtils \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWMaterial \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWMatrix \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWMesh \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWMeshPrimitive \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWMorphController \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWNode \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWPrecompiledHeaders \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWRenderState \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWRoot \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWRotate \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWSampler \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWScale \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWSkinController \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWSkinControllerData \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWSpline \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWTexture \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWTransformation \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWTranslate \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWUniqueId \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWValidate \
-	UnpackedTarball/opencollada/COLLADAFramework/src/COLLADAFWVisualScene \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLAssetLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLCOLLADACsymbol \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLDocumentProcessor \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLExtraDataElementHandler \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLExtraDataLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFileLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFilePartLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFormulasLinker \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLFormulasLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLGeometryLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLGeometryMaterialIdInfo \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIError \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIErrorHandler \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIExtraDataCallbackHandler \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIFilePartLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLInputUnshared \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLInstanceArticulatedSystemLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLInstanceKinematicsModelLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIParserImpl14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLIParserImpl15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLJointsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLKinematicsIntermediateData \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLKinematicsSceneCreator \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryAnimationsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryArticulatedSystemsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryCamerasLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryControllersLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryEffectsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryFormulasLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryImagesLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryJointsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryKinematicsModelsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryKinematicsScenesLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryLightsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryMaterialsLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryNodesLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLMeshLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLMeshPrimitiveInputList \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLNodeLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLPostProcessor \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLPrecompiledHeaders \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLRootParser15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSaxFWLError \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSaxParserError \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSaxParserErrorHandler \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSceneLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSidAddress \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSidTreeNode \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSourceArrayLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLSplineLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLTransformationLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLTypes \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLVersionParser \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/COLLADASaxFWLVisualSceneLoader \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLAssetLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14Private \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateEnums \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateFindElementHash \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateFunctionMap \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateFunctionMapFactory \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateNameMap \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLColladaParserAutoGen14PrivateValidation \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLGeometryLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryAnimationsLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryCamerasLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryControllersLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryEffectsLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryImagesLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryLightsLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryMaterialsLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLLibraryNodesLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLMeshLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLNodeLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLSceneLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLSourceArrayLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLSplineLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated14/COLLADASaxFWLVisualSceneLoader14 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLAssetLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15Private \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateEnums \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateFindElementHash \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateFunctionMap \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateFunctionMapFactory \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateNameMap \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLColladaParserAutoGen15PrivateValidation \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLFormulasLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLGeometryLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryAnimationsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryArticulatedSystemsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryCamerasLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryControllersLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryEffectsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryFormulasLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryImagesLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryJointsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryKinematicsModelsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryLightsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryMaterialsLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLLibraryNodesLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLMeshLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLNodeLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLSceneLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLSourceArrayLoader15 \
-	UnpackedTarball/opencollada/COLLADASaxFrameworkLoader/src/generated15/COLLADASaxFWLVisualSceneLoader15 \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserCoutErrorHandler \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserLibxmlSaxParser \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserNamespaceStack \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserParser \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserParserError \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserParserTemplate \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserParserTemplateBase \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserRawUnknownElementHandler \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserSaxParser \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserStackMemoryManager \
-	UnpackedTarball/opencollada/GeneratedSaxParser/src/GeneratedSaxParserUtils \
-))
-
-# PCRE external library compiled via OpenCollada
-$(eval $(call gb_StaticLibrary_set_include,opencollada_parser,\
-	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/pcre/include \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,opencollada_parser,\
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_chartables \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_compile \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_exec \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_globals \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_newline \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_tables \
-	UnpackedTarball/opencollada/Externals/pcre/src/pcre_try_flipped \
-))
-
-# UTF external library compiled via OpenCollada
-$(eval $(call gb_StaticLibrary_set_include,opencollada_parser,\
-	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/UTF/include \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,opencollada_parser,\
-	UnpackedTarball/opencollada/Externals/UTF/src/ConvertUTF \
-))
-
-# MathMLSolver external library compiled via OpenCollada
-$(eval $(call gb_StaticLibrary_set_include,opencollada_parser,\
-	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/MathMLSolver/include \
-	-I$(call gb_UnpackedTarball_get_dir,opencollada)/Externals/MathMLSolver/include/AST \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,opencollada_parser,\
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTArithmeticExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTBinaryComparisionExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTConstantExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTFragmentExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTFunctionExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTLogicExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTStringVisitor \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTUnaryArithmeticExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/AST/MathMLASTVariableExpression \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLEvaluatorVisitor \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLSerializationUtil \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLSerializationVisitor \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLSolverFunctionExtensions \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLSolverPrecompiled \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLString \
-	UnpackedTarball/opencollada/Externals/MathMLSolver/src/MathMLSymbolTable \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/opencollada/UnpackedTarball_opencollada.mk b/external/opencollada/UnpackedTarball_opencollada.mk
deleted file mode 100644
index f70cc2a609ce..000000000000
--- a/external/opencollada/UnpackedTarball_opencollada.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,opencollada))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,opencollada,$(OPENCOLLADA_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_patches,opencollada,\
-	external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1 \
-	external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 \
-	external/opencollada/patches/opencollada.clang.patch.0 \
-	external/opencollada/patches/opencollada.libxml.patch.0 \
-	external/opencollada/patches/libc++.patch.0 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1 b/external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1
deleted file mode 100644
index 968b57c50b9a..000000000000
--- a/external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1
+++ /dev/null
@@ -1,51 +0,0 @@
-From a54360e9d2a67350f27eec8dfbe1103778b2711c Mon Sep 17 00:00:00 2001
-From: Fabrice Robinet <fabricerobinet@me.com>
-Date: Tue, 13 May 2014 16:31:40 -0700
-Subject: [PATCH 1/2] Revert fix for malformed FBX-COLLADA id
-
----
- GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-index 404306a..1f9a3ee 100644
---- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-+++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-@@ -868,11 +868,13 @@ namespace GeneratedSaxParser
-             failed = false;
-             return COLLADABU::URI(0);
-         }
-+        const ParserString& string = toStringListItem(buffer, bufferEnd, failed);
-+        return COLLADABU::URI(string.str, string.length);
-+        
-+        //FIXME: Testing fails on windows but pass on OSX with this fix.
-         //Just get the string as it is for ids, so that we are able to read FBX-COLLADA
-         //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces
--        //const ParserString& string = toStringListItem(buffer, bufferEnd, failed);
--        //return COLLADABU::URI(string.str, string.length);
--        return COLLADABU::URI((const char*)*buffer, bufferEnd - *buffer);
-+        //return COLLADABU::URI((const char*)*buffer, bufferEnd - *buffer);
-     }
- 
-     //--------------------------------------------------------------------
-@@ -883,11 +885,14 @@ namespace GeneratedSaxParser
-             failed = false;
-             return COLLADABU::URI(0);
-         }
-+        
-+        const ParserString& string = toStringListItem(buffer, failed);
-+        return COLLADABU::URI(string.str, string.length);
-+        
-+        //FIXME: Testing fails on windows but pass on OSX with this fix.
-         //Just get the string as it is for ids, so that we are able to read FBX-COLLADA
-         //Otherwise, calling toStringItem would result in a truncated string when an id contains spaces
--        //const ParserString& string = toStringListItem(buffer, failed);
--        //return COLLADABU::URI(string.str, string.length);
--        return COLLADABU::URI((const char*)*buffer);
-+        //return COLLADABU::URI((const char*)*buffer);
-     }
- 
- 
--- 
-1.8.1.4
-
diff --git a/external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1 b/external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1
deleted file mode 100644
index 067b277e6da6..000000000000
--- a/external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1
+++ /dev/null
@@ -1,66 +0,0 @@
-From 3f68b25b9085c577c2cc2db81d9a9f743de077b7 Mon Sep 17 00:00:00 2001
-From: Fabrice Robinet <fabricerobinet@me.com>
-Date: Thu, 22 May 2014 15:15:40 -0700
-Subject: [PATCH 2/2] Expose sid for textures in extras.
-
----
- COLLADAFramework/include/COLLADAFWSampler.h                       | 8 +++++++-
- .../src/COLLADASaxFWLLibraryEffectsLoader.cpp                     | 4 +++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/COLLADAFramework/include/COLLADAFWSampler.h b/COLLADAFramework/include/COLLADAFWSampler.h
-index 44936a8..562e47a 100644
---- a/COLLADAFramework/include/COLLADAFWSampler.h
-+++ b/COLLADAFramework/include/COLLADAFWSampler.h
-@@ -129,6 +129,9 @@ namespace COLLADAFW
- 		that is used by the sampler to evaluate the MIPmap chain. */
- 		float mMipmapBias;
- 
-+        /* sampler Sid, required to be able to retrieve a sampler from extras */
-+        std::string mSid;
-+        
- 	public:
- 
-         /** Constructor. */
-@@ -203,8 +206,11 @@ namespace COLLADAFW
- 		/** Returns the mipmap Bias.*/
- 		void setMipmapBias ( float mipmapBias ) { mMipmapBias = mipmapBias; }
- 
--		Sampler* clone() { return FW_NEW Sampler(*this); }
-+        void setSid( const std::string &sid) { mSid = sid; }
-+
-+        const std::string& getSid() { return mSid; }
- 
-+		Sampler* clone() { return FW_NEW Sampler(*this); }
- 	};
- 
-     /** 
-diff --git a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryEffectsLoader.cpp b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryEffectsLoader.cpp
-index 36f9c58..5ac99a4 100644
---- a/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryEffectsLoader.cpp
-+++ b/COLLADASaxFrameworkLoader/src/COLLADASaxFWLLibraryEffectsLoader.cpp
-@@ -1003,18 +1003,20 @@ namespace COLLADASaxFWL
- 
-             bool validSampler =  false;
-             SidSamplerInfoMap::iterator samplerIt = mEffectProfileSidSamplerInfoMap.find ( samplerSid );
-+            
-             if ( samplerIt == mEffectProfileSidSamplerInfoMap.end () )
-             {
-                 samplerIt = mEffectSidSamplerInfoMap.find ( samplerSid );
-                 if ( samplerIt != mEffectSidSamplerInfoMap.end () ) validSampler = true;
-             }
-             else validSampler = true;
--
-+            
-             if ( validSampler )
-             {
-                 SamplerInfo& samplerInfo = samplerIt->second;
-                 samplerInfo.id = samplerArray.getCount();
-                 COLLADAFW::Sampler* sampler = samplerInfo.sampler;
-+                sampler->setSid(samplerSid);
-                 if ( !sampler->getSourceImage().isValid() )
-                 {
-                     bool validSurface = false;
--- 
-1.8.1.4
-
diff --git a/external/opencollada/patches/libc++.patch.0 b/external/opencollada/patches/libc++.patch.0
deleted file mode 100644
index bcf5b2cad187..000000000000
--- a/external/opencollada/patches/libc++.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- COLLADABaseUtils/include/COLLADABUhash_map.h
-+++ COLLADABaseUtils/include/COLLADABUhash_map.h
-@@ -60,7 +60,7 @@
-         #define COLLADABU_HASH_NAMESPACE_CLOSE }
-         #define COLLADABU_HASH_FUN hash
-     #endif
--#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION)
-+#elif defined(_LIBCPP_VERSION)
-     #include <unordered_map>
-     #include <unordered_set>
-     #define COLLADABU_HASH_MAP std::unordered_map
---- GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-+++ GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-@@ -10,6 +10,7 @@
- 
- #include "GeneratedSaxParserUtils.h"
- #include <math.h>
-+#include <cmath>
- #include <memory>
- #include <string.h>
- #include <limits>
diff --git a/external/opencollada/patches/opencollada.clang.patch.0 b/external/opencollada/patches/opencollada.clang.patch.0
deleted file mode 100644
index 14e67e9501a7..000000000000
--- a/external/opencollada/patches/opencollada.clang.patch.0
+++ /dev/null
@@ -1,22 +0,0 @@
--*- Mode: Diff -*-
-diff -ur opencollada.org/COLLADABaseUtils/include/COLLADABUhash_map.h opencollada/COLLADABaseUtils/include/COLLADABUhash_map.h
---- COLLADABaseUtils/include/COLLADABUhash_map.h	2014-05-09 11:12:05.740858077 +0200
-+++ COLLADABaseUtils/include/COLLADABUhash_map.h	2014-05-09 11:17:38.616861995 +0200
-@@ -60,7 +60,7 @@
-         #define COLLADABU_HASH_NAMESPACE_CLOSE }
-         #define COLLADABU_HASH_FUN hash
-     #endif
--#elif defined(__FreeBSD__) && defined(_LIBCPP_VERSION)
-+#elif (defined(__APPLE__) || defined(__FreeBSD__)) && defined(_LIBCPP_VERSION)
-     #include <unordered_map>
-     #include <unordered_set>
-     #define COLLADABU_HASH_MAP std::unordered_map
-@@ -70,7 +70,7 @@
-     #define COLLADABU_HASH_NAMESPACE_CLOSE
-     #define COLLADABU_HASH_FUN hash
- #else   // Linux or Mac or FreeBSD with GCC
--    #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
-+    #if !defined(__clang__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3))
-         #include <ext/hash_map>
-         #include <ext/hash_set>
-     #if !(defined(__APPLE__) && defined(__MACH__))
diff --git a/external/opencollada/patches/opencollada.libxml.patch.0 b/external/opencollada/patches/opencollada.libxml.patch.0
deleted file mode 100644
index beccc92bd6f3..000000000000
--- a/external/opencollada/patches/opencollada.libxml.patch.0
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur opencollada.org/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h opencollada/GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h
---- GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h	2014-05-13 10:37:05.029390239 +0200
-+++ GeneratedSaxParser/include/GeneratedSaxParserPrerequisites.h	2014-05-13 10:37:37.093390617 +0200
-@@ -11,8 +11,6 @@
- #ifndef __GENERATEDSAXPARSER_PREREQUISITES_H__
- #define __GENERATEDSAXPARSER_PREREQUISITES_H__
- 
--#define LIBXML_STATIC
--
- #include <string>
- 
- #include "COLLADABUPlatform.h"
author	Thorsten Behrens <Thorsten.Behrens@CIB.de>	2017-10-28 02:28:18 +0200
committer	Thorsten Behrens <Thorsten.Behrens@CIB.de>	2017-10-30 08:21:55 +0100
commit	08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 (patch)
tree	11f416701d1be0a962c7653ea86060f30f708b56 /external
parent	8d994f83568073eb79ab987069f740c3c940405e (diff)