external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 14 +++++++-------
external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 275ed1fa438a8902ba45d76470a3dd05f5372b2e
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu Oct 9 03:27:06 2014 +0200
Revert "dos2unix on SSE2 patch files"
content need to be dos, otherwise patch fails to apply
This reverts commit 089b243c8b48aecfd25c79a70b4209a2399dbafa.
(cherry picked from commit d592b453cdb420bf7fabfc4e9722e3e0440807cd)
diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1
b/external/coinmp/coinmp-msvc-disable-sse2.patch.1
index c099494..0f518d6 100644
--- a/external/coinmp/coinmp-msvc-disable-sse2.patch.1
+++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1
@@ -1,10 +1,10 @@
--- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig 2014-10-02
14:22:21.497268171 +0200
+++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02
14:22:30.193267497 +0200
@@ -6,6 +6,7 @@
- <ItemDefinitionGroup>
- <ClCompile>
- <StringPooling>true</StringPooling>
-+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemGroup />
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <StringPooling>true</StringPooling>
++
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1
b/external/lcms2/lcms2-msvc-disable-sse2.patch.1
index 9bfad08..37ef773 100644
--- a/external/lcms2/lcms2-msvc-disable-sse2.patch.1
+++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1
@@ -1,10 +1,10 @@
--- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02
15:15:40.228020086 +0200
+++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02
15:15:42.243019930 +0200
@@ -133,6 +133,7 @@
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
-+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
++
<EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <Optimization>Full</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
