external/libgltf/UnpackedTarball_libgltf.mk | 1 - external/libgltf/patches/errno.patch | 10 ---------- external/libgltf/patches/fmod_error_handling.patch | 14 +++++++++++--- 3 files changed, 11 insertions(+), 14 deletions(-)
New commits: commit 563a83a8cf30327008397913f12e0373b8a1650c Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Tue May 6 18:31:36 2014 +0200 libgltf: include is missing from fmod_error_handling patch, merge patches Change-Id: I9e0e7816e6d85cb3484105de4ce49db47db72451 diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 3405e86..bd2ee0b 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/remove_extra_include.patch \ external/libgltf/patches/fmod_error_handling.patch \ external/libgltf/patches/extern-C.patch \ - external/libgltf/patches/errno.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/errno.patch b/external/libgltf/patches/errno.patch deleted file mode 100644 index 81f47f3..0000000 --- a/external/libgltf/patches/errno.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libgltf/src/RenderScene.cpp -+++ libgltf/src/RenderScene.cpp -@@ -5,6 +5,7 @@ - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -+#include <errno.h> - #include "RenderScene.h" - #include <glm/gtx/transform.hpp> - #include <glm/gtc/matrix_inverse.hpp> diff --git a/external/libgltf/patches/fmod_error_handling.patch b/external/libgltf/patches/fmod_error_handling.patch index 6b47ca1..3a13291 100644 --- a/external/libgltf/patches/fmod_error_handling.patch +++ b/external/libgltf/patches/fmod_error_handling.patch @@ -1,7 +1,15 @@ diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp ---- libgltf.org/src/RenderScene.cpp 2014-05-06 12:01:08.204238237 +0200 -+++ libgltf/src/RenderScene.cpp 2014-05-06 12:21:58.720287272 +0200 -@@ -979,7 +979,9 @@ +--- libgltf.org/src/RenderScene.cpp 2014-05-06 18:26:20.097144491 +0200 ++++ libgltf/src/RenderScene.cpp 2014-05-06 18:26:26.281144733 +0200 +@@ -11,6 +11,7 @@ + #include <glm/gtc/type_ptr.hpp> + #include <glm/gtc/quaternion.hpp> + #include <glm/gtx/quaternion.hpp> ++#include <cerrno> + + RenderPrimitive::RenderPrimitive() + : mVerterCount(0), mIndicesCount(0) +@@ -979,7 +980,9 @@ double RenderScene::getAnimTime() {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits