commit 0429a44563652f507078f593cf003a5392bc0e10
Author: Jacek Konieczny <[email protected]>
Date: Thu Jul 14 15:01:06 2016 +0200
isinf.patch added
Something redefines isinf as macro and std::inf doesn't work. undef it.
glslang.spec | 2 ++
isinf.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
---
diff --git a/glslang.spec b/glslang.spec
index a6290dc..da9a25f 100644
--- a/glslang.spec
+++ b/glslang.spec
@@ -14,6 +14,7 @@ Group: Applications/Graphics
Source0:
https://github.com/KhronosGroup/glslang/archive/%{commit}/%{name}-%{version}.tar.gz
# Source0-md5: 071445912a8d0f8a533046f0f3b35127
Patch0: runtests.patch
+Patch1: isinf.patch
URL: https://github.com/KhronosGroup/glslang
BuildRequires: cmake
BuildRequires: bison
@@ -34,6 +35,7 @@ A front-end library for programmatic parsing of GLSL/ESSL
into an AST.
%prep
%setup -qn %{name}-%{commit}
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/isinf.patch b/isinf.patch
new file mode 100644
index 0000000..3300a4e
--- /dev/null
+++ b/isinf.patch
@@ -0,0 +1,13 @@
+diff -dur -x '*~'
glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/glslang/MachineIndependent/intermOut.cpp
glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b/glslang/MachineIndependent/intermOut.cpp
+---
glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b.orig/glslang/MachineIndependent/intermOut.cpp
2016-05-13 17:33:42.000000000 +0200
++++
glslang-4678ca9dacfec7a084dbc69bbe568bdad6889f1b/glslang/MachineIndependent/intermOut.cpp
2016-07-14 14:56:03.000000000 +0200
+@@ -49,6 +49,9 @@
+ #ifdef _MSC_VER
+ return _fpclass(x) == _FPCLASS_PINF;
+ #elif defined __ANDROID__ || defined __linux__ || __MINGW32__ || __MINGW64__
++#ifdef isinf
++#undef isinf
++#endif
+ return std::isinf(x) && (x >= 0);
+ #else
+ return isinf(x) && (x >= 0);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glslang.git/commitdiff/0429a44563652f507078f593cf003a5392bc0e10
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
