[glm] 01/03: Clear old patch queue, no longer needed
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 12 00:07:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository glm.
commit b2646a186dde2af458af59d5ea926619c71e9176
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Wed Jan 11 14:40:23 2017 +0000
Clear old patch queue, no longer needed
---
...ode-included-in-GLM-tests-on-pure-platfor.patch | 98 ----------------------
debian/patches/add-pkg-config-file | 30 -------
debian/patches/series | 0
3 files changed, 128 deletions(-)
diff --git a/debian/patches/Fixed-SSE-code-included-in-GLM-tests-on-pure-platfor.patch b/debian/patches/Fixed-SSE-code-included-in-GLM-tests-on-pure-platfor.patch
deleted file mode 100644
index ef9a17c..0000000
--- a/debian/patches/Fixed-SSE-code-included-in-GLM-tests-on-pure-platfor.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From d7862e4bb5d58415dd8697b99f85969759dea7b6 Mon Sep 17 00:00:00 2001
-From: Christophe Riccio <christophe.riccio at unity3d.com>
-Date: Tue, 14 Jan 2014 14:07:09 +0100
-Subject: [PATCH] Fixed SSE code included in GLM tests on pure platforms
-
----
- readme.txt | 1 +
- test/gtx/gtx_bit.cpp | 14 +++++++++-----
- test/gtx/gtx_int_10_10_10_2.cpp | 3 ---
- test/gtx/gtx_mixed_product.cpp | 3 ---
- 4 files changed, 10 insertions(+), 11 deletions(-)
-
---- a/test/gtx/gtx_bit.cpp
-+++ b/test/gtx/gtx_bit.cpp
-@@ -11,7 +11,6 @@
- #include <glm/gtx/bit.hpp>
- #include <glm/gtc/type_precision.hpp>
-
--#include <emmintrin.h>
- #if(GLM_ARCH != GLM_ARCH_PURE)
- # include <glm/detail/intrinsic_integer.hpp>
- #endif
-@@ -152,6 +151,7 @@
- return REG1 | (REG2 << 1);
- }
-
-+#if(GLM_ARCH != GLM_ARCH_PURE)
- inline glm::uint64 sseBitfieldInterleave(glm::uint32 x, glm::uint32 y)
- {
- GLM_ALIGN(16) glm::uint32 const Array[4] = {x, 0, y, 0};
-@@ -267,6 +267,7 @@
-
- return Result[0];
- }
-+#endif//(GLM_ARCH != GLM_ARCH_PURE)
-
- int test()
- {
-@@ -287,16 +288,17 @@
- glm::uint64 B = fastBitfieldInterleave(x, y);
- glm::uint64 C = loopBitfieldInterleave(x, y);
- glm::uint64 D = interleaveBitfieldInterleave(x, y);
-- glm::uint64 E = sseBitfieldInterleave(x, y);
-- glm::uint64 F = sseUnalignedBitfieldInterleave(x, y);
-
- assert(A == B);
- assert(A == C);
- assert(A == D);
-- assert(A == E);
-- assert(A == F);
-
- # if(GLM_ARCH != GLM_ARCH_PURE)
-+ glm::uint64 E = sseBitfieldInterleave(x, y);
-+ glm::uint64 F = sseUnalignedBitfieldInterleave(x, y);
-+ assert(A == E);
-+ assert(A == F);
-+
- __m128i G = glm::detail::_mm_bit_interleave_si128(_mm_set_epi32(0, y, 0, x));
- glm::uint64 Result[2];
- _mm_storeu_si128((__m128i*)Result, G);
-@@ -366,6 +368,7 @@
- std::cout << "interleaveBitfieldInterleave Time " << Time << " clocks" << std::endl;
- }
-
-+# if(GLM_ARCH != GLM_ARCH_PURE)
- {
- std::clock_t LastTime = std::clock();
-
-@@ -387,6 +390,7 @@
-
- std::cout << "sseUnalignedBitfieldInterleave Time " << Time << " clocks" << std::endl;
- }
-+# endif//(GLM_ARCH != GLM_ARCH_PURE)
-
- {
- std::clock_t LastTime = std::clock();
---- a/test/gtx/gtx_int_10_10_10_2.cpp
-+++ b/test/gtx/gtx_int_10_10_10_2.cpp
-@@ -7,8 +7,6 @@
- // File : test/gtx/associated_min_max.cpp
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-
--#include <emmintrin.h>
--
- #include <glm/glm.hpp>
- #include <glm/gtc/type_precision.hpp>
- #include <glm/gtx/associated_min_max.hpp>
---- a/test/gtx/gtx_mixed_product.cpp
-+++ b/test/gtx/gtx_mixed_product.cpp
-@@ -7,8 +7,6 @@
- // File : test/gtx/associated_min_max.cpp
- ///////////////////////////////////////////////////////////////////////////////////////////////////
-
--#include <emmintrin.h>
--
- #include <glm/glm.hpp>
- #include <glm/gtc/type_precision.hpp>
- #include <glm/gtx/associated_min_max.hpp>
diff --git a/debian/patches/add-pkg-config-file b/debian/patches/add-pkg-config-file
deleted file mode 100644
index 873e728..0000000
--- a/debian/patches/add-pkg-config-file
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -200,4 +200,17 @@
- )
- endif()
-
-+# build pkg-config file
-+configure_file(
-+ "glm.pc.in"
-+ "glm.pc"
-+ @ONLY
-+)
-+
-+# install pkg-config file
-+install(
-+ FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc"
-+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-+)
-+
- export(PACKAGE glm)
---- /dev/null
-+++ b/glm.pc.in
-@@ -0,0 +1,7 @@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+includedir=${prefix}/include
-+
-+Name: GLM
-+Description: OpenGL Mathematics
-+Version: @GLM_VERSION@
-+Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/glm.git
More information about the debian-science-commits
mailing list