summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/libgltf/UnpackedTarball_libgltf.mk2
-rw-r--r--external/libgltf/patches/comma_at_end_of_enumerator_list.patch51
-rw-r--r--external/libgltf/patches/extra_semicolon.patch18
3 files changed, 71 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 174e719d7999..2e027ad2a47f 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
external/libgltf/patches/compiler_error_fixes.patch \
external/libgltf/patches/fix_package_file.patch \
+ external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
+ external/libgltf/patches/extra_semicolon.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/comma_at_end_of_enumerator_list.patch b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
new file mode 100644
index 000000000000..7e336f7de841
--- /dev/null
+++ b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
@@ -0,0 +1,51 @@
+diff -ur libgltf.org/src/Common.h libgltf/src/Common.h
+--- libgltf.org/src/Common.h 2014-06-28 12:17:56.880068394 +0200
++++ libgltf/src/Common.h 2014-06-28 12:22:32.940078647 +0200
+@@ -86,7 +86,7 @@
+ DataType_FLOAT_MAT3 = 0x8B5B,
+ DataType_FLOAT_MAT4 = 0x8B5C,
+ DataType_SAMPLER_2D = 0x8B5E,
+- DataType_SAMPLER_CUBE = 0x8B60,
++ DataType_SAMPLER_CUBE = 0x8B60
+ } DataType_E;
+
+ class Attribute
+@@ -119,7 +119,7 @@
+ LightSource_DIRECTIONAL = 0x1,
+ LightSource_POINT = 0x2,
+ LightSource_SPOT = 0x3,
+- LightSource_AMBIET = 0x4,
++ LightSource_AMBIET = 0x4
+ } LightSourceType_E;
+
+ class Light
+@@ -252,7 +252,7 @@
+ TextureType_DISPLACEMENT = 0x9,
+ TextureType_LIGHTMAP = 0xA,
+ TextureType_REFLECTION = 0xB,
+- TextureType_UNKNOWN = 0xC,
++ TextureType_UNKNOWN = 0xC
+ } TextureType_E;
+
+ class MaterialProperty
+@@ -449,7 +449,7 @@
+ NodeType_Node = 0x1,
+ NodeType_Mesh = 0x2,
+ NodeType_Camera = 0x4,
+- NodeType_Light = 0x8,
++ NodeType_Light = 0x8
+ } NodeType_E;
+
+ class Node
+diff -ur libgltf.org/src/Texture.h libgltf/src/Texture.h
+--- libgltf.org/src/Texture.h 2014-06-28 12:17:56.880068394 +0200
++++ libgltf/src/Texture.h 2014-06-28 12:18:19.740069243 +0200
+@@ -24,7 +24,7 @@
+ TEXTURE_FILTER_MIN_BILINEAR,
+ TEXTURE_FILTER_MIN_NEAREST_MIPMAP,
+ TEXTURE_FILTER_MIN_BILINEAR_MIPMAP,
+- TEXTURE_FILTER_MIN_TRILINEAR,
++ TEXTURE_FILTER_MIN_TRILINEAR
+ };
+
+ class Texture
diff --git a/external/libgltf/patches/extra_semicolon.patch b/external/libgltf/patches/extra_semicolon.patch
new file mode 100644
index 000000000000..42602d6bba96
--- /dev/null
+++ b/external/libgltf/patches/extra_semicolon.patch
@@ -0,0 +1,18 @@
+diff -ur libgltf.org/src/Common.cpp libgltf/src/Common.cpp
+--- libgltf.org/src/Common.cpp 2014-06-28 12:30:58.792097436 +0200
++++ libgltf/src/Common.cpp 2014-06-28 12:31:13.884097997 +0200
+@@ -550,12 +550,12 @@
+ /* -- Primitives -- */
+ Primitives::Primitives()
+ {
+-};
++}
+
+ Primitives::~Primitives()
+ {
+ mAttributeMap.clear();
+-};
++}
+
+ void Primitives::setMaterialIndex(std::string materialIndex)
+ {