lcms2: avoid updating msbuild files, simply check-in new version

Change-Id: I54c3bf0e35b8969fe8237db64f66c3b8d12741f2

3 files changed, 38 insertions, 34 deletions

diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index fec0c361074f..2d4b16655b7e 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -17,12 +17,11 @@ ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,lcms2,build):
 	$(call gb_ExternalProject_run,build,\
-		$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade lcms2_DLL.vcxproj,echo up-to-date) && \
 		MSBuild.exe lcms2_DLL.vcxproj \
-			$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \
+			/p:PlatformToolset=v140 \
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 			/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \
-	,Projects/VC2013/lcms2_DLL)
+	,Projects/VC2015/lcms2_DLL)
 else
 $(call gb_ExternalProject_get_state_target,lcms2,build):
 	$(call gb_ExternalProject_run,build,\
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk
index db229340ea12..f97037e73d70 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
 	external/lcms2/lcms2.patch \
 	external/lcms2/lcms2-2.4-windows.patch \
 	external/lcms2/lcms2-msvc-disable-sse2.patch.1 \
-	external/lcms2/lcms2-vc2013-project.patch \
+	external/lcms2/lcms2-vs2015.patch.1 \
 	external/lcms2/lcms2-config-guess.patch.0 \
 	external/lcms2/ubsan.patch.0 \
 	external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 \
diff --git a/external/lcms2/lcms2-vc2013-project.patch b/external/lcms2/lcms2-vs2015.patch.1
index fc17a35982c9..b541941fdf33 100644
--- a/external/lcms2/lcms2-vc2013-project.patch
+++ b/external/lcms2/lcms2-vs2015.patch.1
@@ -1,5 +1,6 @@
---- /dev/null
-+++ foo/foo/lcms2/Projects/VC2013/lcms2.rc
+diff -urN lcms2.org/Projects/VC2015/lcms2.rc lcms2/Projects/VC2015/lcms2.rc
+--- lcms2.org/Projects/VC2015/lcms2.rc	1970-01-01 01:00:00.000000000 +0100
++++ lcms2/Projects/VC2015/lcms2.rc	2018-08-23 13:11:59.556155700 +0200
 @@ -0,0 +1,104 @@
 +// Microsoft Visual C++ generated resource script.
 +//
@@ -105,30 +106,12 @@
 +/////////////////////////////////////////////////////////////////////////////
 +#endif    // not APSTUDIO_INVOKED
 +
---- /dev/null
-+++ foo/foo/lcms2/Projects/VC2013/resource.h
-@@ -0,0 +1,16 @@
-+//{{NO_DEPENDENCIES}}
-+// Microsoft Visual C++ generated include file.
-+// Used by lcms2.rc
-+//
-+
-+// Next default values for new objects
-+// 
-+#ifdef APSTUDIO_INVOKED
-+#ifndef APSTUDIO_READONLY_SYMBOLS
-+#define _APS_NO_MFC                     1
-+#define _APS_NEXT_RESOURCE_VALUE        101
-+#define _APS_NEXT_COMMAND_VALUE         40001
-+#define _APS_NEXT_CONTROL_VALUE         1000
-+#define _APS_NEXT_SYMED_VALUE           101
-+#endif
-+#endif
---- /dev/null
-+++ foo/foo/lcms2/Projects/VC2013/lcms2_DLL/lcms2_DLL.vcxproj
+diff -urN lcms2.org/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj lcms2/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj
+--- lcms2.org/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj	1970-01-01 01:00:00.000000000 +0100
++++ lcms2/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj	2018-08-23 13:12:37.650399400 +0200
 @@ -0,0 +1,240 @@
 +<?xml version="1.0" encoding="utf-8"?>
-+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
@@ -157,23 +140,23 @@
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
-+    <PlatformToolset>v120</PlatformToolset>
++    <PlatformToolset>v140</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
-+    <PlatformToolset>v120</PlatformToolset>
++    <PlatformToolset>v140</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
++    <PlatformToolset>v140</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
-+    <PlatformToolset>v120</PlatformToolset>
++    <PlatformToolset>v140</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
@@ -367,8 +350,10 @@
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
---- /dev/null
-+++ foo/foo/lcms2/Projects/VC2013/lcms2_DLL/lcms2_DLL.vcxproj.filters
+\ No newline at end of file
+diff -urN lcms2.org/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters lcms2/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters
+--- lcms2.org/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters	1970-01-01 01:00:00.000000000 +0100
++++ lcms2/Projects/VC2015/lcms2_DLL/lcms2_DLL.vcxproj.filters	2018-08-23 13:11:59.571806200 +0200
 @@ -0,0 +1,118 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -488,3 +473,23 @@
 +    </CustomBuild>
 +  </ItemGroup>
 +</Project>
+diff -urN lcms2.org/Projects/VC2015/resource.h lcms2/Projects/VC2015/resource.h
+--- lcms2.org/Projects/VC2015/resource.h	1970-01-01 01:00:00.000000000 +0100
++++ lcms2/Projects/VC2015/resource.h	2018-08-23 13:11:59.556155700 +0200
+@@ -0,0 +1,16 @@
++//{{NO_DEPENDENCIES}}
++// Microsoft Visual C++ generated include file.
++// Used by lcms2.rc
++//
++
++// Next default values for new objects
++// 
++#ifdef APSTUDIO_INVOKED
++#ifndef APSTUDIO_READONLY_SYMBOLS
++#define _APS_NO_MFC                     1
++#define _APS_NEXT_RESOURCE_VALUE        101
++#define _APS_NEXT_COMMAND_VALUE         40001
++#define _APS_NEXT_CONTROL_VALUE         1000
++#define _APS_NEXT_SYMED_VALUE           101
++#endif
++#endif