external/collada2gltf/UnpackedTarball_collada2gltf.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
New commits: commit b0d29f1160799dd3ce88dfe643dba05031cf0a46 Author: Zolnai Tamás <[email protected]> Date: Sat May 24 23:28:53 2014 +0200 kmz3collada: Workaround for missing textures The write-only-.dae-file-which-we-need.patch makes the converter extract only the *.dae file but textures are stored in seperate image files we need to extract too. On the other hand this patch makes the converter buildable on all platforms, since this only works on Windows originally. So for now disable this patch on Windows so here we won't loose textures but enable it on other platforms for buildability. Later we need to solve kmz conversion properly. Change-Id: Iede9e3bdd5a68a9002f5fa38da8a6459dda8d805 (cherry picked from commit 2d8941eea664031567f4d70f8347dc15befe8880) diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk index a3ba218..f37f274 100644 --- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk +++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk @@ -15,8 +15,16 @@ $(eval $(call gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/G $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3 \ - external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \ external/collada2gltf/patches/wrong_uri_usage.patch.1 \ )) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ + external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \ +)) + +endif + + + # vim: set noet sw=4 ts=4:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
