[Libreoffice-commits] core.git: external/libgltf

[Markus Mohrhard]

 external/libgltf/UnpackedTarball_libgltf.mk                  |    1 
 external/libgltf/patches/wrong_shader_program_delete.patch.1 |   12 -----------
 2 files changed, 13 deletions(-)

New commits:
commit 237426e104d1fe8e9e03296e05576bf411ea7451
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jul 6 05:05:45 2014 +0200

    Revert "fix OpenGL error in libgltf"
    
    New tarball already contains the fix for it.
    
    This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index 5c46d54..f1e618c 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
 	external/libgltf/patches/extra_semicolon.patch \
 	external/libgltf/patches/stop_a_potential_memory_leak.patch \
-	external/libgltf/patches/wrong_shader_program_delete.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/wrong_shader_program_delete.patch.1 b/external/libgltf/patches/wrong_shader_program_delete.patch.1
deleted file mode 100644
index b5dbc3b..0000000
--- a/external/libgltf/patches/wrong_shader_program_delete.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
---- libgltf.org/src/Shaders.cpp	2014-07-06 03:33:15.205313955 +0200
-+++ libgltf/src/Shaders.cpp	2014-07-06 03:34:33.079310767 +0200
-@@ -144,7 +144,7 @@
- 
- void ShaderProgram::deleteProgram(unsigned int programId)
- {
--    glDeleteShader(programId);
-+    glDeleteProgram(programId);
- }
- 
- void ShaderProgram::useProgram(unsigned int programId)