diff options
Diffstat (limited to 'lcms2')
| -rw-r--r-- | lcms2/lcms2-2.4-windows.patch | 44 | ||||
| -rw-r--r-- | lcms2/lcms2-windows-export.patch | 18 | ||||
| -rw-r--r-- | lcms2/lcms2.patch | 4 | ||||
| -rw-r--r-- | lcms2/makefile.mk | 14 |
4 files changed, 55 insertions, 25 deletions
diff --git a/lcms2/lcms2-2.4-windows.patch b/lcms2/lcms2-2.4-windows.patch new file mode 100644 index 000000000000..f1c681aee7f2 --- /dev/null +++ b/lcms2/lcms2-2.4-windows.patch @@ -0,0 +1,44 @@ +--- misc/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcproj 2012-10-05 22:35:01.607191700 +0200 +@@ -205,6 +205,10 @@ + > + </File> + <File ++ RelativePath="..\..\..\src\cmshalf.c" ++ > ++ </File> ++ <File + RelativePath="..\..\..\src\cmsintrp.c" + > + </File> +--- misc/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-09-10 18:01:51.000000000 +0200 ++++ misc/build/lcms2-2.4/Projects/VC2010/lcms2_static/lcms2_static.vcproj 2012-10-05 22:35:28.168963200 +0200 +@@ -175,6 +175,10 @@ + > + </File> + <File ++ RelativePath="..\..\..\src\cmshalf.c" ++ > ++ </File> ++ <File + RelativePath="..\..\..\src\cmsintrp.c" + > + </File> +--- misc/lcms2-2.4/include/lcms2.h 2011-12-15 16:45:47.000000000 +0100 ++++ misc/build/lcms2-2.4/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 +@@ -192,6 +192,15 @@ typedef int cmsBool; + # endif + #endif + ++// LibreOffice always builds this as DLL and with the stdcall calling ++// convention, so make this usable from outside without having to ++// specify CMS_DLL manually whenever the library is used. ++#ifndef CMS_DLL_BUILD ++#ifndef CMS_DLL ++#define CMS_DLL ++#endif ++#endif ++ + // Calling convention -- this is hardly platform and compiler dependent + #ifdef CMS_IS_WINDOWS_ + # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/lcms2-windows-export.patch b/lcms2/lcms2-windows-export.patch deleted file mode 100644 index 9d6d26a1b648..000000000000 --- a/lcms2/lcms2-windows-export.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/build/lcms2-2.3/include/lcms2.h.sav 2011-12-15 16:45:47.000000000 +0100 -+++ misc/build/lcms2-2.3/include/lcms2.h 2012-03-17 22:53:28.731585981 +0100 -@@ -192,6 +192,15 @@ typedef int cmsBool; - # endif - #endif - -+// LibreOffice always builds this as DLL and with the stdcall calling -+// convention, so make this usable from outside without having to -+// specify CMS_DLL manually whenever the library is used. -+#ifndef CMS_DLL_BUILD -+#ifndef CMS_DLL -+#define CMS_DLL -+#endif -+#endif -+ - // Calling convention -- this is hardly platform and compiler dependent - #ifdef CMS_IS_WINDOWS_ - # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) diff --git a/lcms2/lcms2.patch b/lcms2/lcms2.patch index 851a4b6a729b..d0eca1fb86b3 100644 --- a/lcms2/lcms2.patch +++ b/lcms2/lcms2.patch @@ -1,5 +1,5 @@ ---- misc/build/lcms2-2.3/config.sub -+++ misc/build/lcms2-2.3/config.sub +--- misc/build/lcms2-2.4/config.sub ++++ misc/build/lcms2-2.4/config.sub @@ -123,7 +123,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 52b7b4a93b65..86f3620f790a 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -36,8 +36,8 @@ TARGET=so_lcms2 # --- Files -------------------------------------------------------- -TARFILE_NAME=lcms2-2.3 -TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 +TARFILE_NAME=lcms2-2.4 +TARFILE_MD5=861ef15fa0bc018f9ddc932c4ad8b6dd PATCH_FILES = lcms2.patch @@ -48,16 +48,20 @@ PATCH_FILES = lcms2.patch .IF "$(GUI)$(COM)"=="WNTMSC" -PATCH_FILES += lcms2-windows-export.patch +PATCH_FILES += lcms2-2.4-windows.patch CONFIGURE_DIR=. CONFIGURE_ACTION = -BUILD_DIR=Projects/VC2010/lcms2_DLL -.IF "$(CCNUMVER)" >= "001600000000" +.IF "$(CCNUMVER)" >= "001700000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL +BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 /p:PlatformToolset=v110 +.ELIF "$(CCNUMVER)" >= "001600000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 .ELSE +BUILD_DIR=Projects/VC2008/lcms2_DLL BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" .ENDIF |