download.lst | 4 +-
external/glm/UnpackedTarball_glm.mk | 3 -
external/glm/Wshadow-patch-fix.patch | 11 -----
external/glm/Wsign-compare.patch.0 | 20 ----------
external/glm/Wunused-parameter.patch | 18 ---------
external/glm/c++20.patch.0 | 22 +++++------
external/glm/clang-cl.patch.0 | 42 ++++++----------------
slideshow/source/engine/opengl/Operation.cxx | 4 +-
slideshow/source/engine/opengl/TransitionImpl.cxx | 2 -
9 files changed, 28 insertions(+), 98 deletions(-)
New commits:
commit 494092dc0c2f6fd04dbd973d6f76f1df720dbcf7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Feb 2 20:22:29 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Feb 4 21:11:43 2020 +0100
upgrade to latest glm
Change-Id: I75f145b71c0f82e87a94ef90709fb8fdf56041d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87833
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/download.lst b/download.lst
index f1066cac4aad..6c0a5fb87694 100644
--- a/download.lst
+++ b/download.lst
@@ -90,8 +90,8 @@ export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d909
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
export FREETYPE_TARBALL := freetype-2.9.1.tar.bz2
-export GLM_SHA256SUM :=
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
-export GLM_TARBALL :=
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+export GLM_SHA256SUM :=
c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95
+export GLM_TARBALL := glm-0.9.9.7.zip
export GPGME_SHA256SUM :=
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
export GRAPHITE_SHA256SUM :=
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index 940d12372b94..934621eac841 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -16,9 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if
$(filter MSC,$(COM)),--
$(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
- external/glm/Wshadow-patch-fix.patch \
- external/glm/Wsign-compare.patch.0 \
- external/glm/Wunused-parameter.patch \
external/glm/clang-cl.patch.0 \
external/glm/c++20.patch.0 \
))
diff --git a/external/glm/Wshadow-patch-fix.patch
b/external/glm/Wshadow-patch-fix.patch
deleted file mode 100644
index 3c25f40bda51..000000000000
--- a/external/glm/Wshadow-patch-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
diff --git a/external/glm/Wsign-compare.patch.0
b/external/glm/Wsign-compare.patch.0
deleted file mode 100644
index ef97121ff97f..000000000000
--- a/external/glm/Wsign-compare.patch.0
+++ /dev/null
@@ -1,20 +0,0 @@
---- glm/gtx/bit.inl
-+++ glm/gtx/bit.inl
-@@ -576,7 +576,7 @@
- assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
- genIUType Result = Value;
-- for(std::size_t i = 0; i <= ToBit; ++i)
-+ for(int i = 0; i <= ToBit; ++i)
- Result |= (1 << i);
- return Result;
- }
-@@ -593,7 +593,7 @@
- assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
- genIUType Result = Value;
-- for(std::size_t i = 0; i <= ToBit; ++i)
-+ for(int i = 0; i <= ToBit; ++i)
- Result &= ~(1 << i);
- return Result;
- }
diff --git a/external/glm/Wunused-parameter.patch
b/external/glm/Wunused-parameter.patch
deleted file mode 100644
index de1239702679..000000000000
--- a/external/glm/Wunused-parameter.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- glm/glm/gtx/bit.inl
-+++ glm/glm/gtx/bit.inl
-@@ -572,6 +572,7 @@
- int const & ToBit
- )
- {
-+ (void) FromBit;
- assert(FromBit <= ToBit);
- assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
-@@ -589,6 +589,7 @@
- int const & ToBit
- )
- {
-+ (void) FromBit;
- assert(FromBit <= ToBit);
- assert(ToBit <= sizeof(genIUType) * std::size_t(8));
-
diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0
index 559adde48946..34a40b5ef4c6 100644
--- a/external/glm/c++20.patch.0
+++ b/external/glm/c++20.patch.0
@@ -1,11 +1,11 @@
---- glm/core/type_half.inl
-+++ glm/core/type_half.inl
-@@ -40,7 +40,7 @@
- volatile float f = 1e10;
-
- for(int i = 0; i < 10; ++i)
-- f *= f; // this will overflow before
-+ f = f * f; // this will overflow before
- // the for�loop
terminates
- return f;
- }
+--- glm/detail/type_half.inl
++++ glm/detail/type_half.inl
+@@ -6,7 +6,7 @@
+ volatile float f = 1e10;
+
+ for(int i = 0; i < 10; ++i)
+- f *= f; // this will overflow before the for loop
terminates
++ f = f * f; // this will overflow before the for loop
terminates
+ return f;
+ }
+
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0
index edbc30b2408b..44713a1968c5 100644
--- a/external/glm/clang-cl.patch.0
+++ b/external/glm/clang-cl.patch.0
@@ -1,32 +1,14 @@
# "#pragma intrinsic" not (yet?) handled in the "if (LangOpts.MicrosoftExt)"
# block in Preprocessor::RegisterBuiltinPragmas in Clang's lib/Lex/Pragma.cpp:
---- glm/core/func_integer.inl
-+++ glm/core/func_integer.inl
-@@ -29,7 +29,9 @@
- #if(GLM_ARCH != GLM_ARCH_PURE)
- #if(GLM_COMPILER & GLM_COMPILER_VC)
- # include <intrin.h>
-+#if !defined __clang__
- # pragma intrinsic(_BitScanReverse)
-+#endif
- #endif//(GLM_COMPILER & GLM_COMPILER_VC)
- #endif//(GLM_ARCH != GLM_ARCH_PURE)
-
-
-# Fix check for availability of C++11 static_assert (it apparently should be
-# conditional on GLM_LANG_CXX11 instead of GLM_LANG_CXX0X, but just don't care
-# to try to fix that mess, and use __cplusplus value instead; unconditionally
-# using C++11 static_assert would fail in external/libgltf, which uses
-# external/glm but does not -std=c++11); falling back to BOOST_STATIC_ASSERT
-# would cause unnecessary warnings with clang-cl:
---- glm/core/setup.hpp
-+++ glm/core/setup.hpp
-@@ -628,7 +628,7 @@
-
///////////////////////////////////////////////////////////////////////////////////////////////////
- // Static assert
-
--#if(GLM_LANG == GLM_LANG_CXX0X)
-+#if __cplusplus >= 201103L
- # define GLM_STATIC_ASSERT(x, message) static_assert(x, message)
- #elif(defined(BOOST_STATIC_ASSERT))
- # define GLM_STATIC_ASSERT(x, message) BOOST_STATIC_ASSERT(x)
+--- glm/detail/func_integer.inl
++++ glm/detail/func_integer.inl
+@@ -3,7 +3,9 @@
+ #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ # include <intrin.h>
++#if !defined __clang__^M
+ # pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+
diff --git a/slideshow/source/engine/opengl/Operation.cxx
b/slideshow/source/engine/opengl/Operation.cxx
index 6789fcc5ae6c..e70f203edad7 100644
--- a/slideshow/source/engine/opengl/Operation.cxx
+++ b/slideshow/source/engine/opengl/Operation.cxx
@@ -28,11 +28,11 @@
#include <sal/config.h>
+#include <basegfx/numeric/ftools.hxx>
+
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
-#include <basegfx/numeric/ftools.hxx>
-
#include "Operation.hxx"
SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin,
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 5078a8c23bfd..d1926ab854f9 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -37,8 +37,8 @@
#include <comphelper/random.hxx>
-#include "TransitionImpl.hxx"
#include "Operation.hxx"
+#include "TransitionImpl.hxx"
#include <math.h>
TransitionScene::TransitionScene(TransitionScene const& rOther)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
