external/libgltf/UnpackedTarball_libgltf.mk | 1 external/libgltf/patches/compiler_error_fixes.patch | 41 ++++++++++++++++++++ 2 files changed, 42 insertions(+)
New commits: commit 481a17b6a6fb332935c3e41c077cc5f60b751021 Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Thu Jun 26 17:14:36 2014 +0200 libgltf: compiler error fixes: missing include and missing namespace Thanks to Rene Engelhard for the report and the fixes. Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371 diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index e8c5133..175fe43 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/no_animation_in_orbit_mode.patch \ external/libgltf/patches/walkthrough_mode_affects_orbit_mode_unexpectedly.patch \ external/libgltf/patches/move_fps_closer_to_the_corner.patch \ + external/libgltf/patches/compiler_error_fixes.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/compiler_error_fixes.patch b/external/libgltf/patches/compiler_error_fixes.patch new file mode 100644 index 0000000..a2ff172 --- /dev/null +++ b/external/libgltf/patches/compiler_error_fixes.patch @@ -0,0 +1,41 @@ +diff -ur libgltf.org/src/Camera.cpp libgltf/src/Camera.cpp +--- libgltf.org/src/Camera.cpp 2014-06-26 15:49:57.807687346 +0200 ++++ libgltf/src/Camera.cpp 2014-06-26 15:50:46.195685296 +0200 +@@ -161,7 +161,7 @@ + } + else + { +- if (abs(x) > 0.0001 || abs(y) > 0.0001 || abs(z) > 0.0001) ++ if (std::abs(x) > 0.0001 || std::abs(y) > 0.0001 || std::abs(z) > 0.0001) + { + bMoveCmeraModel = true; + } +@@ -240,7 +240,7 @@ + { + if (!bAerialView) + return; +- if (abs(horizontal) > planar || abs(vertical) > 0.0001) ++ if (std::abs(horizontal) > planar || std::abs(vertical) > 0.0001) + { + bRotateCameraModel = true; + fRotateCameraXSpeed = 0; +@@ -275,7 +275,7 @@ + void CPhysicalCamera::RotateCamera(double horizontal, double vertical, + double planar) + { +- if (abs(horizontal) > planar || abs(vertical) > 0.0001) ++ if (std::abs(horizontal) > planar || std::abs(vertical) > 0.0001) + { + bRotateCameraModel = true; + } +diff -ur libgltf.org/src/Font.cpp libgltf/src/Font.cpp +--- libgltf.org/src/Font.cpp 2014-06-26 15:49:57.807687346 +0200 ++++ libgltf/src/Font.cpp 2014-06-26 15:50:57.619684812 +0200 +@@ -8,6 +8,7 @@ + #include "Font.h" + + #include <glm/gtc/matrix_transform.hpp> ++#include <cstdio> + + using namespace std; +
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits