download.lst
|3
external/collada2gltf/GitSHA1.cpp
|2
external/collada2gltf/patches/wrong_uri_usage.patch.1
|5
external/opencollada/UnpackedTarball_opencollada.mk
|2
external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1
| 51 +++
external/opencollada/patches/0002-Expose-sid-for-textures-in-extras.patch.1
| 66 ++
external/opencollada/patches/generatedsaxparser_utils_touri_fix.patch.1
| 25 +--
7 files changed, 132 insertions(+), 22 deletions(-)
New commits:
commit 45726c9ecd641aa047f994d4c63a65179b726c03
Author: Jan Holesovsky ke...@collabora.com
Date: Sun May 25 14:14:05 2014 +0200
Update OpenCollada and collada2gltf to the newest versions.
Change-Id: Iee0b9f08843220e8ece00739ca01aa438b93965a
diff --git a/download.lst b/download.lst
index 3e13a8e..56ea8c5 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,7 @@ export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.
export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129
export COINMP_TARBALL := CoinMP-1.7.6.tgz
-export COLLADA2GLTF_MD5SUM := c8a8be5829ceffacfe1d68d078f5c442
-export COLLADA2GLTF_TARBALL := collada2gltf-master-6258611a6a.tar.bz2
+export COLLADA2GLTF_TARBALL :=
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
export CPPUNIT_TARBALL :=
ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz
export CT2N_TARBALL :=
451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
export CURL_MD5SUM := e6d1f9d1b59da5062109ffe14e0569a4
diff --git a/external/collada2gltf/GitSHA1.cpp
b/external/collada2gltf/GitSHA1.cpp
index bd2cffe..af42860 100644
--- a/external/collada2gltf/GitSHA1.cpp
+++ b/external/collada2gltf/GitSHA1.cpp
@@ -1,2 +1,2 @@
-#define GIT_SHA1 6258611a6a4b4b94b963db5f1fe41c5290be1f87
+#define GIT_SHA1 cb1d97788a38d2928afb4622f6a25d012f0f8a54
char g_GIT_SHA1[] = GIT_SHA1;
diff --git a/external/collada2gltf/patches/wrong_uri_usage.patch.1
b/external/collada2gltf/patches/wrong_uri_usage.patch.1
index f42f435..7c688ad 100644
--- a/external/collada2gltf/patches/wrong_uri_usage.patch.1
+++ b/external/collada2gltf/patches/wrong_uri_usage.patch.1
@@ -45,11 +45,10 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp
collada2gltf/GLTF/GLTFAsset.cpp
std::ofstream f2(outputPath.c_str(),
std::fstream::binary);
if
(this-_converterConfig-boolForKeyPath(verboseLogging)) {
-@@ -397,8 +394,8 @@
+@@ -397,7 +394,8 @@
this-_root = shared_ptr GLTF::JSONObject (new GLTF::JSONObject());
- this-_root-setString(kProfile, profile-id());
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());
diff --git a/external/opencollada/UnpackedTarball_opencollada.mk
b/external/opencollada/UnpackedTarball_opencollada.mk
index 7670784..b625bb4 100644
--- a/external/opencollada/UnpackedTarball_opencollada.mk
+++ b/external/opencollada/UnpackedTarball_opencollada.mk
@@ -12,6 +12,8 @@ $(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/generatedsaxparser_utils_touri_fix.patch.1
\
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
new file mode 100644
index 000..968b57c
--- /dev/null
+++
b/external/opencollada/patches/0001-Revert-fix-for-malformed-FBX-COLLADA-id.patch.1
@@ -0,0 +1,51 @@
+From a54360e9d2a67350f27eec8dfbe1103778b2711c Mon Sep 17 00:00:00 2001
+From: Fabrice Robinet fabricerobi...@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
+---
