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
This commit is contained in:
Stephan Bergmann 2014-01-29 10:26:33 +01:00
parent 790966d5d7
commit 8205b38d71
2 changed files with 15 additions and 0 deletions

View file

@ -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:

11
external/glm/Wshadow-patch-fix.patch vendored Normal file
View file

@ -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>