[ogre/f17] Fix for crashes when built with gcc 4.7 (bug 842041)
Bruno Wolff III
bruno at fedoraproject.org
Mon Jul 23 20:51:50 UTC 2012
commit d8b42ca39fd267aea224bffa3e037b18f2f5acb7
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jul 21 07:58:20 2012 -0500
Fix for crashes when built with gcc 4.7 (bug 842041)
ogre-fix-utilSSE.patch | 14 ++++++++++++++
ogre.spec | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/ogre-fix-utilSSE.patch b/ogre-fix-utilSSE.patch
new file mode 100644
index 0000000..6eb1bb9
--- /dev/null
+++ b/ogre-fix-utilSSE.patch
@@ -0,0 +1,14 @@
+# This patch is from Al Reay in bug 842041. It is based on the discussion at:
+# http://www.ogre3d.org/forums/viewtopic.php?f=2&t=70052
+
+--- OgreMain/src/OgreSIMDHelper.h 2012-07-03 21:01:01.831381577 +1200
++++ OgreMain/src/OgreSIMDHelper.h 2012-07-03 21:01:32.506998075 +1200
+@@ -48,7 +48,7 @@
+ // thing. The size of the allocated block seems to be irrelevant.
+ #define __OGRE_SIMD_ALIGN_STACK() _alloca(16)
+
+-#elif OGRE_CPU == OGRE_CPU_X86 && (OGRE_COMPILER == OGRE_COMPILER_GNUC || OGRE_COMPILER == OGRE_COMPILER_CLANG)
++#elif OGRE_CPU == OGRE_CPU_X86 && OGRE_COMPILER == OGRE_COMPILER_CLANG
+ //
+ // Horrible hack to align the stack to a 16-bytes boundary for gcc.
+ //
diff --git a/ogre.spec b/ogre.spec
index 3a1b85a..c103d9f 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -25,6 +25,8 @@ Patch1: ogre-1.6.0rc1-glew.patch
Patch2: ogre-1.7.2-system-tinyxml.patch
Patch3: ogre-1.7.2-fix-ppc-build.patch
Patch5: ogre-1.7.2-build-rcapsdump.patch
+# Fixes bug 842041
+Patch6: ogre-fix-utilSSE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zziplib-devel freetype-devel
BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@@ -88,6 +90,7 @@ using SampleBrowser.
%patch2 -p1 -z .sys-tinyxml
%patch3 -p1 -z .ppc
%patch5 -p0 -z .build-rcapsdump
+%patch6 -p0 -z .fix-utilSSE
# remove execute bits from src-files for -debuginfo package
chmod -x `find RenderSystems/GL -type f` \
`find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp
More information about the scm-commits
mailing list