external/collada2gltf/UnpackedTarball_collada2gltf.mk | 2 -
external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 | 12
----------
external/collada2gltf/patches/shader_compatibility.patch.1 | 12
++++++++++
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 1ea4f163c5a2f531dcfda7899b322636a735c618
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Fri Aug 15 17:04:29 2014 +0200
collada2gltf: add a better name to this patch
Change-Id: Ie8fb4ff71a683e986b9fec861608590cadee8612
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 00ef562..439e86b 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
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/fix_linux_shader_compiling.patch.1 \
+ external/collada2gltf/patches/shader_compatibility.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
b/external/collada2gltf/patches/shader_compatibility.patch.1
similarity index 89%
rename from external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
rename to external/collada2gltf/patches/shader_compatibility.patch.1
index 0a09385..8541336 100644
--- a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
+++ b/external/collada2gltf/patches/shader_compatibility.patch.1
@@ -6,7 +6,7 @@ diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp
collada2gltf/shaders/
GLSLShader(shared_ptr <GLTFProfile> profile) {
- this->_declarations = "precision highp float;\n";;
-+ this->_declarations = "#ifdef GL_ES_VERSION_2_0\n#version 100
es\n#else\n#version 130\n#endif\nprecision highp float;\n";
++ this->_declarations = "#ifdef GL_ES_VERSION_2_0\n#version
100\n#else\n#version 130\n#endif\nprecision highp float;\n";
this->_body = "void main(void) {\n";
this->_profile = profile;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
