summaryrefslogtreecommitdiff
path: root/external/glm
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-29 10:26:33 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-29 10:29:46 +0100
commit8205b38d7127143d567a587616bd0cc9091b62e3 (patch)
tree6043b74356b2995322d68f3afd1fe9401cb9ad8b /external/glm
parent790966d5d78cd3700c4ad2d6991cc48381bd1834 (diff)
Fix bad patch
...and whoever had the bad idea to make the downloaded GLM_TARBALL bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip to already be patched with that broken patch (external/glm/Wshadow-unix.patch or external/glm/Wshadow-windows.patch or whatever?) instead of applying locally via gb_UnpackedTarball_add_patches... Change-Id: I0053346f626cc3af42f7ea82a7a26c8b47876a98
Diffstat (limited to 'external/glm')
-rw-r--r--external/glm/UnpackedTarball_glm.mk4
-rw-r--r--external/glm/Wshadow-patch-fix.patch11
2 files changed, 15 insertions, 0 deletions
diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk
index e115bff8f168..9b7bc9d4dcda 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -13,4 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
+$(eval $(call gb_UnpackedTarball_add_patches,glm, \
+ external/glm/Wshadow-patch-fix.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wshadow-patch-fix.patch b/external/glm/Wshadow-patch-fix.patch
new file mode 100644
index 000000000000..3c25f40bda51
--- /dev/null
+++ b/external/glm/Wshadow-patch-fix.patch
@@ -0,0 +1,11 @@
+--- a/glm/core/type_vec4.hpp
++++ b/glm/core/type_vec4.hpp
+@@ -185,7 +185,7 @@
+ template <int E0, int E1>
+ GLM_FUNC_DECL tvec4(T const & x_, glm::detail::swizzle<2, T, tvec2<T>, E0, E1, -1, -2> const & v, T const & w_)
+ {
+- *this = tvec4<T>(x_, v(), w);
++ *this = tvec4<T>(x_, v(), w_);
+ }
+
+ template <int E0, int E1>