[Libreoffice-commits] core.git: external/glm
0 files changed New commits: commit ac23bec7a43350ce0dd01096ed99f1ed673d9533 Author: Andrea Gelmini AuthorDate: Thu Oct 24 17:44:29 2019 +0200 Commit: Julien Nabet CommitDate: Thu Oct 24 18:54:32 2019 +0200 Removed executable bits on patch file Change-Id: If4bed7d12570ff126bec8638480430796f0e89f8 Reviewed-on: https://gerrit.libreoffice.org/81462 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0 old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1 + external/glm/c++20.patch.0 | 11 +++ 2 files changed, 12 insertions(+) New commits: commit 27c047e53c293fa14913bb8128874cfd1174e131 Author: Stephan Bergmann AuthorDate: Thu Oct 24 09:01:45 2019 +0200 Commit: Stephan Bergmann CommitDate: Thu Oct 24 10:52:17 2019 +0200 external/glm: Avoid -std=c++2a -Werror,-Wdeprecated-volatile ...as seen with recent Clang 10 trunk clang-cl: > In file included from vcl/source/gdi/salgdilayout.cxx:24: > In file included from vcl/inc\openglgdiimpl.hxx:31: > In file included from vcl/inc/opengl/RenderList.hxx:16: > In file included from workdir/UnpackedTarball/glm\glm/glm.hpp:98: > In file included from workdir/UnpackedTarball/glm\glm/./core/type.hpp:32: > In file included from workdir/UnpackedTarball/glm\glm/core/type_half.hpp:116: > workdir/UnpackedTarball/glm\glm/core/type_half.inl(43,6): error: compound assignment to object of volatile-qualified type 'volatile float' is deprecated [-Werror,-Wdeprecated-volatile] > f *= f; // this will overflow before > ^ Change-Id: I97fdfc0650344db1401cdce126f6755df00c5a0e Reviewed-on: https://gerrit.libreoffice.org/81427 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index 71f1c3cd8ff8..940d12372b94 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,glm, \ external/glm/Wsign-compare.patch.0 \ external/glm/Wunused-parameter.patch \ external/glm/clang-cl.patch.0 \ +external/glm/c++20.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0 new file mode 100755 index ..559adde48946 --- /dev/null +++ b/external/glm/c++20.patch.0 @@ -0,0 +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; + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05925ef8a49f3ba302140bd37ba9c4848598638d Author: Thomas Klausner Date: Sat Aug 8 17:59:09 2015 +0200 Do not add --binary to patch flags unconditionally. It is only needed for Cygwin, and some patch(1) don't support it, like NetBSD's. Solution suggested by vmiklos on irc. Change-Id: I65a3a82e755167828658218c7d73c4f2294e587f diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index 82f4a2c..f593254 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -11,7 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,glm)) $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchflags,glm,--binary)) +$(eval $(call gb_UnpackedTarball_set_patchflags,glm,$(if $(filter MSC,$(COM)),--binary))) $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/Wshadow-unix.patch| 2659 -
external/glm/Wshadow-windows.patch | 2659 -
2 files changed, 5318 deletions(-)
New commits:
commit 74109a9b1628a12dd351c4d15e3c5352d62bd1be
Author: Stephan Bergmann
Date: Tue Dec 9 16:55:24 2014 +0100
external/glm/Wshadow-{unix,windows}.patch are dead
...since ba5285f4e1b9f15a55e6ec40ea1ea916af9a3280 "I give up on patching
glm"
Change-Id: I5a2cc1a2ea2a455df3ce364249b101df1e615367
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
deleted file mode 100644
index be4af10..000
--- a/external/glm/Wshadow-unix.patch
+++ /dev/null
@@ -1,2659 +0,0 @@
-diff -ur glm.org/glm/core/_detail.hpp glm/glm/core/_detail.hpp
glm.org/glm/core/_detail.hpp 2013-12-09 02:05:30.115442079 +0100
-+++ glm/glm/core/_detail.hpp 2013-12-09 02:06:33.749941584 +0100
-@@ -136,12 +136,12 @@
- i(0)
- {}
-
-- GLM_FUNC_QUALIFIER uif32(float f) :
-- f(f)
-+ GLM_FUNC_QUALIFIER uif32(float f_) :
-+ f(f_)
- {}
-
-- GLM_FUNC_QUALIFIER uif32(unsigned int i) :
-- i(i)
-+ GLM_FUNC_QUALIFIER uif32(unsigned int i_) :
-+ i(i_)
- {}
-
- float f;
-@@ -154,12 +154,12 @@
- i(0)
- {}
-
-- GLM_FUNC_QUALIFIER uif64(double f) :
-- f(f)
-+ GLM_FUNC_QUALIFIER uif64(double f_) :
-+ f(f_)
- {}
-
-- GLM_FUNC_QUALIFIER uif64(uint64 i) :
-- i(i)
-+ GLM_FUNC_QUALIFIER uif64(uint64 i_) :
-+ i(i_)
- {}
-
- double f;
-diff -ur glm.org/glm/core/type_vec1.hpp glm/glm/core/type_vec1.hpp
glm.org/glm/core/type_vec1.hpp 2013-12-08 17:04:59.706365245 +0100
-+++ glm/glm/core/type_vec1.hpp 2013-12-08 17:07:20.079840510 +0100
-@@ -86,19 +86,19 @@
- GLM_FUNC_DECL explicit tvec1(
- ctor);
- GLM_FUNC_DECL explicit tvec1(
-- value_type const & s);
-+ value_type const & s_);
-
- //
- // Swizzle constructors
-
-- GLM_FUNC_DECL tvec1(tref1 const & r);
-+ GLM_FUNC_DECL tvec1(tref1 const & r_);
-
- //
- // Convertion scalar constructors
-
- //! Explicit converions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
- template
-- GLM_FUNC_DECL explicit tvec1(U const & s);
-+ GLM_FUNC_DECL explicit tvec1(U const & s_);
-
- //
- // Convertion vector constructors
-@@ -121,19 +121,19 @@
- GLM_FUNC_DECL tvec1 & operator= (tvec1 const & v);
-
- template
-- GLM_FUNC_DECL tvec1 & operator+=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator+=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator+=(tvec1 const & v);
- template
-- GLM_FUNC_DECL tvec1 & operator-=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator-=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator-=(tvec1 const & v);
- template
-- GLM_FUNC_DECL tvec1 & operator*=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator*=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator*=(tvec1 const & v);
- template
-- GLM_FUNC_DECL tvec1 & operator/=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator/=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator/=(tvec1 const & v);
- GLM_FUNC_DECL tvec1 & operator++();
-@@ -143,27 +143,27 @@
- // Unary bit operators
-
- template
-- GLM_FUNC_DECL tvec1 & operator%=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator%=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator%=(tvec1 const & v);
- template
-- GLM_FUNC_DECL tvec1 & operator&=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator&=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator&=(tvec1 const & v);
- template
-- GLM_FUNC_DECL tvec1 & operator|=(U const & s);
-+ GLM_FUNC_DECL tvec1 & operator|=(U const & s_);
- template
- GLM_FUNC_DECL tvec1 & operator|=(tvec1 const & v);
-
[Libreoffice-commits] core.git: external/glm external/mysqlcppconn instsetoo_native/inc_openoffice
external/glm/Wshadow-unix.patch|4 ++--
external/glm/Wshadow-windows.patch |4 ++--
external/mysqlcppconn/patches/cmake.patch |2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 67d7ba55a007cc11bc291a6e97b1fdcc2cc1bad1
Author: Stephan Bergmann
Date: Tue Dec 9 16:44:18 2014 +0100
Revert "Fix common typos. No automatic tools. Handmadeâ¦"
This reverts commit 759c4d18d57b06dcc26fb82759599a29c61ef853, every part of
it
is wrong.
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
index 47a34a7..be4af10 100644
--- a/external/glm/Wshadow-unix.patch
+++ b/external/glm/Wshadow-unix.patch
@@ -52,9 +52,9 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL tvec1(tref1 const & r_);
//
- // Conversion scalar constructors
+ // Convertion scalar constructors
- //! Explicit conversions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
+ //! Explicit converions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
template
- GLM_FUNC_DECL explicit tvec1(U const & s);
+ GLM_FUNC_DECL explicit tvec1(U const & s_);
diff --git a/external/glm/Wshadow-windows.patch
b/external/glm/Wshadow-windows.patch
index fa8c284..c6c9c65 100644
--- a/external/glm/Wshadow-windows.patch
+++ b/external/glm/Wshadow-windows.patch
@@ -52,7 +52,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL tvec1(tref1 const & r_);
//
- // Conversion scalar constructors
+ // Convertion scalar constructors
//! Explicit converions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
template
@@ -60,7 +60,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL explicit tvec1(U const & s_);
//
- // Conversion vector constructors
+ // Convertion vector constructors
@@ -121,19 +121,19 @@
GLM_FUNC_DECL tvec1 & operator= (tvec1 const & v);
diff --git a/external/mysqlcppconn/patches/cmake.patch
b/external/mysqlcppconn/patches/cmake.patch
index a856c21..79fe064 100644
--- a/external/mysqlcppconn/patches/cmake.patch
+++ b/external/mysqlcppconn/patches/cmake.patch
@@ -127,7 +127,7 @@ diff --recursive -u
UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT
- ENDIF(STLPORT_INCLUDE_DIR)
-
-# We want to set the inclusion of the library globally
--ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but
CMake manual says I can!! ;)
+-ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake
manual says I can!! ;)
-SET(CMAKE_EXE_LINKER_FLAGS"${CMAKE_EXE_LINKER_FLAGS}
-library=stlport4")
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
-library=stlport4")
-SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
-library=stlport4")
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 4f3830d..d937499 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -111,7 +111,7 @@ CreateFolderComponent_ N
Component 1 Identifier Foreign key into the Compone
CreateFolder Directory_ N Directory 1
Identifier Primary key, could be foreign key into the Directory
table.
CustomAction Action N Identifier
Primary key, name of action, normally appears in sequence table unless
private use.
CustomAction Source Y CustomSource
The table reference of the source of the code.
-CustomAction Target Y Formatted
Execution parameter, depends on the type of custom action
+CustomAction Target Y Formatted
Excecution parameter, depends on the type of custom action
CustomAction TypeN 1 32767
The numeric custom action type, consisting of source location, code type,
entry, option flags.
Dialog Attributes Y 0 214748
[Libreoffice-commits] core.git: external/glm external/mysqlcppconn
external/glm/Wshadow-unix.patch |4 ++--
external/glm/Wshadow-windows.patch|4 ++--
external/mysqlcppconn/patches/cmake.patch |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 702d14d954d5dcb88e70cfad8517118f9614c987
Author: Andrea Gelmini
Date: Sat Nov 15 00:54:01 2014 +0100
Partial revert of da40cac540e7d735edbe9069b3c8ec6af4530208
As requested from Michael Stahl here:
https://gerrit.libreoffice.org/#/c/12164/
Change-Id: Ie00bc789c1dfa3f0049c8915e0deeac7fab6e0fd
Reviewed-on: https://gerrit.libreoffice.org/12432
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/external/glm/Wshadow-unix.patch b/external/glm/Wshadow-unix.patch
index 47a34a7..be4af10 100644
--- a/external/glm/Wshadow-unix.patch
+++ b/external/glm/Wshadow-unix.patch
@@ -52,9 +52,9 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL tvec1(tref1 const & r_);
//
- // Conversion scalar constructors
+ // Convertion scalar constructors
- //! Explicit conversions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
+ //! Explicit converions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
template
- GLM_FUNC_DECL explicit tvec1(U const & s);
+ GLM_FUNC_DECL explicit tvec1(U const & s_);
diff --git a/external/glm/Wshadow-windows.patch
b/external/glm/Wshadow-windows.patch
index fa8c284..c6c9c65 100644
--- a/external/glm/Wshadow-windows.patch
+++ b/external/glm/Wshadow-windows.patch
@@ -52,7 +52,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL tvec1(tref1 const & r_);
//
- // Conversion scalar constructors
+ // Convertion scalar constructors
//! Explicit converions (From section 5.4.1 Conversion and
scalar constructors of GLSL 1.30.08 specification)
template
@@ -60,7 +60,7 @@ diff -ur glm.org/glm/core/type_vec1.hpp
glm/glm/core/type_vec1.hpp
+ GLM_FUNC_DECL explicit tvec1(U const & s_);
//
- // Conversion vector constructors
+ // Convertion vector constructors
@@ -121,19 +121,19 @@
GLM_FUNC_DECL tvec1 & operator= (tvec1 const & v);
diff --git a/external/mysqlcppconn/patches/cmake.patch
b/external/mysqlcppconn/patches/cmake.patch
index a856c21..79fe064 100644
--- a/external/mysqlcppconn/patches/cmake.patch
+++ b/external/mysqlcppconn/patches/cmake.patch
@@ -127,7 +127,7 @@ diff --recursive -u
UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT
- ENDIF(STLPORT_INCLUDE_DIR)
-
-# We want to set the inclusion of the library globally
--ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but
CMake manual says I can!! ;)
+-ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake
manual says I can!! ;)
-SET(CMAKE_EXE_LINKER_FLAGS"${CMAKE_EXE_LINKER_FLAGS}
-library=stlport4")
-SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
-library=stlport4")
-SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
-library=stlport4")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1 +
external/glm/Wunused-parameter.patch | 18 ++
2 files changed, 19 insertions(+)
New commits:
commit 142dbf27c10535af51f2c722d9166b59e550aa22
Author: Tor Lillqvist
Date: Fri Oct 24 17:50:01 2014 +0300
WaE: unused parameter
Change-Id: Ifcdef5ed474b36e60604dde96bba4dd152e829b6
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index 86e9d16..82f4a2c 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -18,6 +18,7 @@ $(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 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wunused-parameter.patch
b/external/glm/Wunused-parameter.patch
new file mode 100644
index 000..de12397
--- /dev/null
+++ b/external/glm/Wunused-parameter.patch
@@ -0,0 +1,18 @@
+--- 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));
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1 + external/glm/Wsign-compare.patch.0 | 20 2 files changed, 21 insertions(+) New commits: commit 7f545208e8108be84cd880e026294e11aa15c65b Author: Stephan Bergmann Date: Fri Oct 10 16:31:09 2014 +0200 external/glm: -Werror,-Wsign-compare Change-Id: I5acb672ea8387cdbf68677a2b46d21785148a735 diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index ff9c998..86e9d16 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -17,6 +17,7 @@ $(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 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/glm/Wsign-compare.patch.0 b/external/glm/Wsign-compare.patch.0 new file mode 100644 index 000..ef97121 --- /dev/null +++ b/external/glm/Wsign-compare.patch.0 @@ -0,0 +1,20 @@ +--- 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; + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1
external/glm/Wshadow-patch-2.patch.1 | 283 ---
2 files changed, 284 deletions(-)
New commits:
commit 51dd4ebd065701c4fd5e9d774e44716be0664c24
Author: Markus Mohrhard
Date: Mon Feb 10 15:02:21 2014 +0100
Revert "fix Wshadow warnings in glm"
Only works with some versions and seems to break with cygwin. I'm
working on using a recent upstream version + patches.
This reverts commit 848f165ceb54b0c7ae3e52ad7ad50c258db2956c.
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index f357fdc..ff9c998 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
external/glm/Wshadow-patch-fix.patch \
-external/glm/Wshadow-patch-2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wshadow-patch-2.patch.1
b/external/glm/Wshadow-patch-2.patch.1
deleted file mode 100644
index 499db5a..000
--- a/external/glm/Wshadow-patch-2.patch.1
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -ur glm.org/glm/gtc/half_float.inl glm/glm/gtc/half_float.inl
glm.org/glm/gtc/half_float.inl 2014-02-09 13:49:08.003856255 +0100
-+++ glm/glm/gtc/half_float.inl 2014-02-09 13:58:59.187670698 +0100
-@@ -112,20 +112,20 @@
- template
- GLM_FUNC_QUALIFIER tvec2::tvec2
- (
-- U const & x
-+ U const & x_
- ) :
-- x(half(x)),
-- y(half(x))
-+ x(half(x_)),
-+ y(half(x_))
- {}
-
- template
- GLM_FUNC_QUALIFIER tvec2::tvec2
- (
-- U const & x,
-- V const & y
-+ U const & x_,
-+ V const & y_
- ) :
-- x(half(x)),
-- y(half(y))
-+ x(half(x_)),
-+ y(half(y_))
- {}
-
- //
-@@ -268,40 +268,40 @@
- //
- // Swizzle operators
-
-- GLM_FUNC_QUALIFIER half tvec2::swizzle(comp x) const
-+ GLM_FUNC_QUALIFIER half tvec2::swizzle(comp x_) const
- {
-- return (*this)[x];
-+ return (*this)[x_];
- }
-
-- GLM_FUNC_QUALIFIER tvec2 tvec2::swizzle(comp x, comp y)
const
-+ GLM_FUNC_QUALIFIER tvec2 tvec2::swizzle(comp x_, comp y_)
const
- {
- return tvec2(
-- (*this)[x],
-- (*this)[y]);
-+ (*this)[x_],
-+ (*this)[y_]);
- }
-
-- GLM_FUNC_QUALIFIER tvec3 tvec2::swizzle(comp x, comp y,
comp z) const
-+ GLM_FUNC_QUALIFIER tvec3 tvec2::swizzle(comp x_, comp y_,
comp z) const
- {
- return tvec3(
-- (*this)[x],
-- (*this)[y],
-+ (*this)[x_],
-+ (*this)[y_],
- (*this)[z]);
- }
-
-- GLM_FUNC_QUALIFIER tvec4 tvec2::swizzle(comp x, comp y,
comp z, comp w) const
-+ GLM_FUNC_QUALIFIER tvec4 tvec2::swizzle(comp x_, comp y_,
comp z, comp w) const
- {
- return tvec4(
-- (*this)[x],
-- (*this)[y],
-+ (*this)[x_],
-+ (*this)[y_],
- (*this)[z],
- (*this)[w]);
- }
-
-- GLM_FUNC_QUALIFIER tref2 tvec2::swizzle(comp x, comp y)
-+ GLM_FUNC_QUALIFIER tref2 tvec2::swizzle(comp x_, comp y_)
- {
- return tref2(
-- (*this)[x],
-- (*this)[y]);
-+ (*this)[x_],
-+ (*this)[y_]);
- }
-
- //
-@@ -399,23 +399,23 @@
- template
- GLM_FUNC_QUALIFIER tvec3::tvec3
- (
-- U const & x
-+ U const & x_
- ) :
-- x(half(x)),
-- y(half(x)),
-- z(half(x))
-+ x(half(x_)),
-+ y(half(x_)),
-+ z(half(x_))
- {}
-
- template
- GLM_FUNC_QUALIFIER tvec3::tvec3
- (
-- A const & x,
-- B const & y,
-- C const & z
-- ) :
-- x(half(x)),
-- y(half(y)),
-- z(half(z))
-+ A const & x_,
-+ B const & y_,
-+ C const & z_
-+ ) :
-+ x(half(x_)),
-+ y(half(y_)),
-+ z(half(z_))
- {}
-
- //
-@@ -584,41 +584,41 @@
- //
- // Swizzle operators
-
-- GLM_FUNC_QUALIFIER half tvec3::swizzle(comp x) const
-+ GLM_FUNC_QUALIFIER half
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1
external/glm/Wshadow-patch-2.patch.1 | 283 +++
2 files changed, 284 insertions(+)
New commits:
commit 848f165ceb54b0c7ae3e52ad7ad50c258db2956c
Author: Markus Mohrhard
Date: Sun Feb 9 14:14:49 2014 +0100
fix Wshadow warnings in glm
Change-Id: Ic366699d15338ad4bf14d783ca4dee72aa9d8e40
Reviewed-on: https://gerrit.libreoffice.org/7952
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/external/glm/UnpackedTarball_glm.mk
b/external/glm/UnpackedTarball_glm.mk
index ff9c998..f357fdc 100644
--- a/external/glm/UnpackedTarball_glm.mk
+++ b/external/glm/UnpackedTarball_glm.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1))
$(eval $(call gb_UnpackedTarball_add_patches,glm, \
external/glm/Wshadow-patch-fix.patch \
+external/glm/Wshadow-patch-2.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/glm/Wshadow-patch-2.patch.1
b/external/glm/Wshadow-patch-2.patch.1
new file mode 100644
index 000..499db5a
--- /dev/null
+++ b/external/glm/Wshadow-patch-2.patch.1
@@ -0,0 +1,283 @@
+diff -ur glm.org/glm/gtc/half_float.inl glm/glm/gtc/half_float.inl
+--- glm.org/glm/gtc/half_float.inl 2014-02-09 13:49:08.003856255 +0100
glm/glm/gtc/half_float.inl 2014-02-09 13:58:59.187670698 +0100
+@@ -112,20 +112,20 @@
+ template
+ GLM_FUNC_QUALIFIER tvec2::tvec2
+ (
+- U const & x
++ U const & x_
+ ) :
+- x(half(x)),
+- y(half(x))
++ x(half(x_)),
++ y(half(x_))
+ {}
+
+ template
+ GLM_FUNC_QUALIFIER tvec2::tvec2
+ (
+- U const & x,
+- V const & y
++ U const & x_,
++ V const & y_
+ ) :
+- x(half(x)),
+- y(half(y))
++ x(half(x_)),
++ y(half(y_))
+ {}
+
+ //
+@@ -268,40 +268,40 @@
+ //
+ // Swizzle operators
+
+- GLM_FUNC_QUALIFIER half tvec2::swizzle(comp x) const
++ GLM_FUNC_QUALIFIER half tvec2::swizzle(comp x_) const
+ {
+- return (*this)[x];
++ return (*this)[x_];
+ }
+
+- GLM_FUNC_QUALIFIER tvec2 tvec2::swizzle(comp x, comp y)
const
++ GLM_FUNC_QUALIFIER tvec2 tvec2::swizzle(comp x_, comp y_)
const
+ {
+ return tvec2(
+- (*this)[x],
+- (*this)[y]);
++ (*this)[x_],
++ (*this)[y_]);
+ }
+
+- GLM_FUNC_QUALIFIER tvec3 tvec2::swizzle(comp x, comp y,
comp z) const
++ GLM_FUNC_QUALIFIER tvec3 tvec2::swizzle(comp x_, comp y_,
comp z) const
+ {
+ return tvec3(
+- (*this)[x],
+- (*this)[y],
++ (*this)[x_],
++ (*this)[y_],
+ (*this)[z]);
+ }
+
+- GLM_FUNC_QUALIFIER tvec4 tvec2::swizzle(comp x, comp y,
comp z, comp w) const
++ GLM_FUNC_QUALIFIER tvec4 tvec2::swizzle(comp x_, comp y_,
comp z, comp w) const
+ {
+ return tvec4(
+- (*this)[x],
+- (*this)[y],
++ (*this)[x_],
++ (*this)[y_],
+ (*this)[z],
+ (*this)[w]);
+ }
+
+- GLM_FUNC_QUALIFIER tref2 tvec2::swizzle(comp x, comp y)
++ GLM_FUNC_QUALIFIER tref2 tvec2::swizzle(comp x_, comp y_)
+ {
+ return tref2(
+- (*this)[x],
+- (*this)[y]);
++ (*this)[x_],
++ (*this)[y_]);
+ }
+
+ //
+@@ -399,23 +399,23 @@
+ template
+ GLM_FUNC_QUALIFIER tvec3::tvec3
+ (
+- U const & x
++ U const & x_
+ ) :
+- x(half(x)),
+- y(half(x)),
+- z(half(x))
++ x(half(x_)),
++ y(half(x_)),
++ z(half(x_))
+ {}
+
+ template
+ GLM_FUNC_QUALIFIER tvec3::tvec3
+ (
+- A const & x,
+- B const & y,
+- C const & z
+- ) :
+- x(half(x)),
+- y(half(y)),
+- z(half(z))
++ A const & x_,
++ B const & y_,
++ C const & z_
++ ) :
++ x(half(x_)),
++ y(half(y_)),
++ z(half(z_))
+ {}
+
+ //
+@@ -584,41 +584,41 @@
+ //
+ // Swizzle operators
+
+- GLM_FUNC_QUALIFIER half tvec3::swizzle(comp x) const
++ GLM_FUNC_QUALIFIER half tvec3::swizzle(comp x_) const
+ {
[Libreoffice-commits] core.git: external/glm
external/glm/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46a990205ffe898629c573d1886b44ef680fc98e Author: Stephan Bergmann Date: Wed Jan 29 10:47:36 2014 +0100 Fix relative path Change-Id: I4c193d31a94666fc607142cf3f6b2c6fcb15c82b diff --git a/external/glm/Makefile b/external/glm/Makefile index ccb1c85..e4968cf 100644 --- a/external/glm/Makefile +++ b/external/glm/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 4b1b454856968a626504fc6a132457eb6c66b6e9 Author: Stephan Bergmann Date: Wed Jan 29 10:45:26 2014 +0100 Unbreak Cygwin patch handling Change-Id: Id7ad1063ae73099b1513fbeb08458298d3c135d8 diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index 9b7bc9d..ff9c998 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,glm)) $(eval $(call gb_UnpackedTarball_set_tarball,glm,$(GLM_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchflags,glm,--binary)) + $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) $(eval $(call gb_UnpackedTarball_add_patches,glm, \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
