From 2abdfa2ad03398e58264bc5575ea6805132457df Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Thu, 29 May 2014 23:00:57 +0400
Subject: [PATCH] openexr: More fixes.

---
 mingw-w64-ilmbase/PKGBUILD                    |   2 +
 mingw-w64-openexr/PKGBUILD                    |  66 ++--
 .../cmake-install-binaries.patch              |  70 ----
 mingw-w64-openexr/cmake-soversion.patch       | 345 ++++++++++++++----
 4 files changed, 324 insertions(+), 159 deletions(-)
 delete mode 100644 mingw-w64-openexr/cmake-install-binaries.patch

diff --git a/mingw-w64-ilmbase/PKGBUILD b/mingw-w64-ilmbase/PKGBUILD
index f6b619493c..df1f458a1d 100644
--- a/mingw-w64-ilmbase/PKGBUILD
+++ b/mingw-w64-ilmbase/PKGBUILD
@@ -44,6 +44,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
     -DBUILD_SHARED_LIBS=ON \
     ../${_realname}-${pkgver}
+  
+  #-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--export-all-symbols"
 
   make
 }
diff --git a/mingw-w64-openexr/PKGBUILD b/mingw-w64-openexr/PKGBUILD
index 359de7ddc6..7fb94de355 100644
--- a/mingw-w64-openexr/PKGBUILD
+++ b/mingw-w64-openexr/PKGBUILD
@@ -1,60 +1,76 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
-_realname=ilmbase
+_realname=openexr
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
 pkgver=2.1.0
 pkgrel=6
-pkgdesc="Base libraries from ILM for OpenEXR (mingw-w64)"
+pkgdesc="Openexr library for EXR images (mingw-w64)"
 arch=('any')
 url="http://http://www.openexr.com/"
 license=("custom")
-makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config" "libtool")
-depends=("${_mingw_suff}-gcc-libs")
+makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config")
+depends=("${_mingw_suff}-ilmbase")
 options=('staticlibs' 'strip')
 source=("http://download.savannah.nongnu.org/releases/openexr/${_realname}-${pkgver}.tar.gz"
-        ilmthread-mingw-win32.patch
-        ilmthread-mingw-pthreads.patch
-        ilmbase-2.1.0_obsolete-macros.patch
-        cmake-soversion.patch
-        cmake-install-binaries.patch)
-md5sums=('8ba2f608191ad020e50277d8a3ba0850'
-         '3a34cf48b52c2af0584ef3e8cf50499a'
-         '8b9d9c6e4ed88dc9dfb80ce4f637460a'
-         '1c9a320c8ab09c98abe9ecb80eb24e2e'
-         'c4f323df9490418d0d0b31f83f0493c2'
-         'baaa4fa9467969a611c70e62efa1fe6b')
+        mingw-w64-fix.patch
+        openexr-2.1.0-headers.patch
+        openexr-2.1.0_bb44ExpLogTable.patch
+        openexr-2.1.0_aligned-malloc.patch
+        openexr-2.1.0_cast.patch
+        openexr_obsolete-macros.patch
+        cmake-soversion.patch)
+md5sums=('33735d37d2ee01c6d8fbd0df94fb8b43'
+         '346e4c67b11e4f688cb3e751604342e0'
+         'd87df3d057dd8d902c61a3b88f05fd0d'
+         '4798df032716e33a2b227542319fa8f5'
+         '09df5525cf2d53d013304dd5e533ce0f'
+         '4ec9ab6cc823dc9fcc28cfc85a761546'
+         '2f20a165ea31e7638a37809dd5feefb1'
+         '05cf5c3ef40abed7757305028fb46dab')
+
 prepare(){
   cd "$srcdir/${_realname}-$pkgver"
-  # Use either one or the other of the ilmthread patches
-  # depending on the sort of threads that you want.
-  # patch -Np1 -i "$srcdir/ilmthread-mingw-win32.patch"
-  patch -Np1 -i "$srcdir/ilmthread-mingw-pthreads.patch"
-  patch -Np1 -i "$srcdir/ilmbase-2.1.0_obsolete-macros.patch"
+  
+  sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfZipCompressor.cpp
+  sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfPxr24Compressor.cpp
+
+  patch -Np1 -i "$srcdir/mingw-w64-fix.patch"
+  patch -Np1 -i "$srcdir/openexr-2.1.0-headers.patch"
+  patch -Np1 -i "$srcdir/openexr-2.1.0_bb44ExpLogTable.patch"
+  patch -Np1 -i "$srcdir/openexr-2.1.0_aligned-malloc.patch"
+  patch -Np1 -i "$srcdir/openexr-2.1.0_cast.patch"
+  patch -Np1 -i "$srcdir/openexr_obsolete-macros.patch"
   patch -Np1 -i "$srcdir/cmake-soversion.patch"
-  patch -Np1 -i "$srcdir/cmake-install-binaries.patch"
+
   #./bootstrap
 }
 
 build() {
-  mkdir build-${CARCH}
-  cd build-${CARCH}
+  CXXFLAGS+=" -I${MINGW_PREFIX}/include/OpenEXR"
+  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  mkdir "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
+
   ${MINGW_PREFIX}/bin/cmake \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
     -DBUILD_SHARED_LIBS=ON \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DUSE_ZLIB_WINAPI=OFF \
     ../${_realname}-${pkgver}
 
+  #-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--export-all-symbols"
   make
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MINGW_CHOST}"
   make install
 
   pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
   export PREFIX_WIN=`pwd -W`
   popd > /dev/null
   sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
-    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/IlmBase.pc
+    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/OpenEXR.pc
 }
diff --git a/mingw-w64-openexr/cmake-install-binaries.patch b/mingw-w64-openexr/cmake-install-binaries.patch
deleted file mode 100644
index 381779043a..0000000000
--- a/mingw-w64-openexr/cmake-install-binaries.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- ilmbase-2.1.0/Half/CMakeLists.txt.orig	2014-05-28 14:54:27.438200000 +0400
-+++ ilmbase-2.1.0/Half/CMakeLists.txt	2014-05-28 14:55:30.509000000 +0400
-@@ -45,8 +45,9 @@
- 
- INSTALL ( TARGETS
-   Half
--  DESTINATION
--  lib
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
- )
- 
- INSTALL ( FILES 
---- ilmbase-2.1.0/Iex/CMakeLists.txt.orig	2013-11-12 00:46:45.000000000 +0400
-+++ ilmbase-2.1.0/Iex/CMakeLists.txt	2014-05-28 14:56:07.166600000 +0400
-@@ -12,8 +12,9 @@
- 
- INSTALL ( TARGETS
-   Iex
--  DESTINATION
--  lib
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
- )
- 
- INSTALL ( FILES 
---- ilmbase-2.1.0/IexMath/CMakeLists.txt.orig	2013-11-12 01:10:04.000000000 +0400
-+++ ilmbase-2.1.0/IexMath/CMakeLists.txt	2014-05-28 14:56:46.461200000 +0400
-@@ -11,8 +11,9 @@
- 
- INSTALL ( TARGETS
-   IexMath
--  DESTINATION
--  lib
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
- )
- 
- INSTALL ( FILES 
---- ilmbase-2.1.0/IlmThread/CMakeLists.txt.orig	2013-11-12 01:10:49.000000000 +0400
-+++ ilmbase-2.1.0/IlmThread/CMakeLists.txt	2014-05-28 14:57:25.297600000 +0400
-@@ -30,8 +30,9 @@
- 
- INSTALL ( TARGETS
-   IlmThread
--  DESTINATION
--  lib
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
- )
- 
- INSTALL ( FILES 
---- ilmbase-2.1.0/Imath/CMakeLists.txt.orig	2013-11-12 03:09:51.000000000 +0400
-+++ ilmbase-2.1.0/Imath/CMakeLists.txt	2014-05-28 14:58:07.328600000 +0400
-@@ -18,8 +18,9 @@
- 
- INSTALL ( TARGETS
-   Imath
--  DESTINATION
--  lib
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
- )
- 
- INSTALL ( FILES 
diff --git a/mingw-w64-openexr/cmake-soversion.patch b/mingw-w64-openexr/cmake-soversion.patch
index 953e38a788..45dafa9b2f 100644
--- a/mingw-w64-openexr/cmake-soversion.patch
+++ b/mingw-w64-openexr/cmake-soversion.patch
@@ -1,72 +1,289 @@
---- ilmbase-2.1.0/CMakeLists.txt.orig	2014-05-28 14:46:01.760200000 +0400
-+++ ilmbase-2.1.0/CMakeLists.txt	2014-05-28 15:28:01.970000000 +0400
-@@ -20,7 +20,7 @@
- # Allow the developer to select if Dynamic or Static libraries are built
- OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+diff -Naur openexr-2.1.0-orig/CMakeLists.txt openexr-2.1.0/CMakeLists.txt
+--- openexr-2.1.0-orig/CMakeLists.txt	2013-11-25 23:49:53.000000000 +0400
++++ openexr-2.1.0/CMakeLists.txt	2014-05-28 16:55:20.527800000 +0400
+@@ -40,7 +40,7 @@
+ FIND_PACKAGE(ZLIB REQUIRED)
+ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
  
--IF ( NOT WIN32)
-+IF ( NOT WIN32 OR MINGW)
-   ADD_DEFINITIONS ( -pthread )
- ENDIF ()
+-IF (NOT WIN32)
++IF (NOT WIN32 OR MINGW)
+   SET ( PTHREAD_LIB pthread )
+ ENDIF()
  
-@@ -127,35 +127,46 @@
-                              (ILMBASE_VERSION_PATCH <<  8))
- ")
+@@ -107,11 +107,14 @@
+ ##########################
+ ADD_SUBDIRECTORY ( IlmImf )
  
--
-+SET(SO_VERSION "11")
- SET_TARGET_PROPERTIES ( Half
++SET(SO_VERSION "21")
+ SET_TARGET_PROPERTIES ( IlmImf
    PROPERTIES
-   VERSION 11.0.0
-   SOVERSION 11
-+  OUTPUT_NAME Half
-+  RUNTIME_OUTPUT_NAME "Half-${SO_VERSION}"
-+  ARCHIVE_OUTPUT_NAME Half
+   VERSION 21.0.0
+   SOVERSION 21
+-  OUTPUT_NAME "IlmImf-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
++  OUTPUT_NAME IlmImf
++  RUNTIME_OUTPUT_NAME "IlmImf-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}-${SO_VERSION}"
++  ARCHIVE_OUTPUT_NAME IlmImf
    )
- SET_TARGET_PROPERTIES ( Iex
-   PROPERTIES
-   VERSION 11.0.0
-   SOVERSION 11
--  OUTPUT_NAME "Iex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
-+  OUTPUT_NAME Iex
-+  RUNTIME_OUTPUT_NAME "Iex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}-${SO_VERSION}"
-+  ARCHIVE_OUTPUT_NAME Iex
-   )
- SET_TARGET_PROPERTIES ( Imath
-   PROPERTIES
-   VERSION 11.0.0
-   SOVERSION 11
--  OUTPUT_NAME "Imath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
-+  OUTPUT_NAME Imath
-+  RUNTIME_OUTPUT_NAME "Imath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}-${SO_VERSION}"
-+  ARCHIVE_OUTPUT_NAME Imath
-   )
- SET_TARGET_PROPERTIES ( IlmThread
-   PROPERTIES
-   VERSION 11.0.0
-   SOVERSION 11
--  OUTPUT_NAME "IlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
-+  OUTPUT_NAME IlmThread
-+  RUNTIME_OUTPUT_NAME "IlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}-${SO_VERSION}"
-+  ARCHIVE_OUTPUT_NAME IlmThread
-   )
- SET_TARGET_PROPERTIES ( IexMath
-   PROPERTIES
-   VERSION 11.0.0
-   SOVERSION 11
--  OUTPUT_NAME "IexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}"
-+  OUTPUT_NAME IexMath
-+  RUNTIME_OUTPUT_NAME "IexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}-${SO_VERSION}"
-+  ARCHIVE_OUTPUT_NAME IexMath
+   
+ ##########################
+@@ -177,3 +180,24 @@
+   DESTINATION
+   ${CMAKE_INSTALL_PREFIX}/share/doc/OpenEXR-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}/examples
    )
++
++FILE ( WRITE ${CMAKE_BINARY_DIR}/OpenEXR.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" )
++FILE ( APPEND ${CMAKE_BINARY_DIR}/OpenEXR.pc "exec_prefix=\${prefix}
++libdir=\${exec_prefix}/lib
++includedir=\${prefix}/include
++OpenEXR_includedir=\${prefix}/include/OpenEXR
++
++Name: OpenEXR
++Description: OpenEXR image library
++Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
++Libs: -L\${libdir} -lIlmImf
++Cflags: -I\${OpenEXR_includedir}
++Requires: IlmBase
++Libs.private: -lz
++")
++
++INSTALL ( FILES
++  ${CMAKE_BINARY_DIR}/OpenEXR.pc
++  DESTINATION
++  ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
++)
+diff -Naur openexr-2.1.0-orig/exrenvmap/CMakeLists.txt openexr-2.1.0/exrenvmap/CMakeLists.txt
+--- openexr-2.1.0-orig/exrenvmap/CMakeLists.txt	2013-11-25 23:49:55.000000000 +0400
++++ openexr-2.1.0/exrenvmap/CMakeLists.txt	2014-05-28 15:33:02.099600000 +0400
+@@ -12,8 +12,8 @@
  
- IF ( NOT WIN32 )
-@@ -190,7 +201,7 @@
- Name: IlmBase
- Description: Base math and exception libraries
- Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
--Libs: -L\${libdir} -lImath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIexMath-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lHalf -lIex-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -lIlmThread-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR} -pthreadCflags: -pthread -I\${OpenEXR_includedir}
-+Libs: -L\${libdir} -lImath -lIexMath -lHalf -lIex -lIlmThread -pthreadCflags: -pthread -I\${OpenEXR_includedir}
- ")
+ TARGET_LINK_LIBRARIES ( exrenvmap
+   IlmImf
+-  IlmThread-2_1
+-  Iex-2_1
++  IlmThread
++  Iex
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/exrheader/CMakeLists.txt openexr-2.1.0/exrheader/CMakeLists.txt
+--- openexr-2.1.0-orig/exrheader/CMakeLists.txt	2013-11-25 23:49:55.000000000 +0400
++++ openexr-2.1.0/exrheader/CMakeLists.txt	2014-05-28 15:33:40.620800000 +0400
+@@ -6,8 +6,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( exrheader
+   IlmImf
+-  Iex-2_1
+-  IlmThread-2_1
++  Iex
++  IlmThread
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/exrmakepreview/CMakeLists.txt openexr-2.1.0/exrmakepreview/CMakeLists.txt
+--- openexr-2.1.0-orig/exrmakepreview/CMakeLists.txt	2013-11-25 23:49:56.000000000 +0400
++++ openexr-2.1.0/exrmakepreview/CMakeLists.txt	2014-05-28 15:34:16.131600000 +0400
+@@ -7,8 +7,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( exrmakepreview
+   IlmImf
+-  IlmThread-2_1
+-  Iex-2_1
++  IlmThread
++  Iex
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/exrmaketiled/CMakeLists.txt openexr-2.1.0/exrmaketiled/CMakeLists.txt
+--- openexr-2.1.0-orig/exrmaketiled/CMakeLists.txt	2013-11-25 23:49:56.000000000 +0400
++++ openexr-2.1.0/exrmaketiled/CMakeLists.txt	2014-05-28 15:35:22.033400000 +0400
+@@ -8,8 +8,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( exrmaketiled
+   IlmImf
+-  IlmThread-2_1
+-  Iex-2_1
++  IlmThread
++  Iex
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/exrmultipart/CMakeLists.txt openexr-2.1.0/exrmultipart/CMakeLists.txt
+--- openexr-2.1.0-orig/exrmultipart/CMakeLists.txt	2013-11-25 23:49:56.000000000 +0400
++++ openexr-2.1.0/exrmultipart/CMakeLists.txt	2014-05-28 15:35:34.029800000 +0400
+@@ -6,8 +6,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( exrmultipart
+   IlmImf
+-  IlmThread-2_1
+-  Iex-2_1
++  IlmThread
++  Iex
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/exrmultiview/CMakeLists.txt openexr-2.1.0/exrmultiview/CMakeLists.txt
+--- openexr-2.1.0-orig/exrmultiview/CMakeLists.txt	2013-11-25 23:49:56.000000000 +0400
++++ openexr-2.1.0/exrmultiview/CMakeLists.txt	2014-05-28 15:35:48.928400000 +0400
+@@ -9,9 +9,9 @@
+ TARGET_LINK_LIBRARIES ( exrmultiview
+   IlmImf
+   Half
+-  Imath-2_1
+-  Iex-2_1
+-  IlmThread-2_1
++  Imath
++  Iex
++  IlmThread
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+ )
+diff -Naur openexr-2.1.0-orig/exrstdattr/CMakeLists.txt openexr-2.1.0/exrstdattr/CMakeLists.txt
+--- openexr-2.1.0-orig/exrstdattr/CMakeLists.txt	2013-11-25 23:49:56.000000000 +0400
++++ openexr-2.1.0/exrstdattr/CMakeLists.txt	2014-05-28 15:36:00.868400000 +0400
+@@ -6,8 +6,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( exrstdattr
+   IlmImf
+-  IlmThread-2_1
+-  Iex-2_1
++  IlmThread
++  Iex
+   Half
+   ${PTHREAD_LIB}
+   ${ZLIB_LIBRARIES}
+diff -Naur openexr-2.1.0-orig/IlmImf/CMakeLists.txt openexr-2.1.0/IlmImf/CMakeLists.txt
+--- openexr-2.1.0-orig/IlmImf/CMakeLists.txt	2013-11-25 23:49:53.000000000 +0400
++++ openexr-2.1.0/IlmImf/CMakeLists.txt	2014-05-28 15:51:53.296000000 +0400
+@@ -6,8 +6,8 @@
+   )
+ TARGET_LINK_LIBRARIES ( b44ExpLogTable
+   Half
+-  Iex-2_1
+-  IlmThread-2_1
++  Iex
++  IlmThread
+   ${PTHREAD_LIB}
+ )
+ 
+@@ -19,7 +19,7 @@
+ ADD_CUSTOM_COMMAND (
+   TARGET b44ExpLogTable 
+   POST_BUILD
+-  COMMAND b44ExpLogTable > b44ExpLogTable.h
++  COMMAND b44ExpLogTable > ${CMAKE_SOURCE_DIR}/b44ExpLogTable.h
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/IlmImf
+ )
+ SET_SOURCE_FILES_PROPERTIES(
+@@ -124,9 +124,9 @@
+ 
+ TARGET_LINK_LIBRARIES ( IlmImf 
+   Half 
+-  Iex-2_1 
+-  Imath-2_1 
+-  IlmThread-2_1 
++  Iex 
++  Imath 
++  IlmThread 
+   ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+ )
+ 
+@@ -143,8 +143,9 @@
+ 
+ INSTALL ( TARGETS
+   IlmImf
+-  DESTINATION
+-  ${CMAKE_INSTALL_PREFIX}/lib
++  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
++  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ )
+ 
+ # Headers
+diff -Naur openexr-2.1.0-orig/IlmImf/ImfMultiView.h openexr-2.1.0/IlmImf/ImfMultiView.h
+--- openexr-2.1.0-orig/IlmImf/ImfMultiView.h	2013-06-18 23:51:39.000000000 +0400
++++ openexr-2.1.0/IlmImf/ImfMultiView.h	2014-05-28 16:04:49.540000000 +0400
+@@ -120,6 +120,7 @@
+ // Return a list of all channels belonging to view viewName.
+ //
+ 
++IMF_EXPORT
+ ChannelList channelsInView (const std::string &viewName,
+                             const ChannelList &channelList,
+                             const StringVector &multiView);
+diff -Naur openexr-2.1.0-orig/IlmImf/ImfPartType.h openexr-2.1.0/IlmImf/ImfPartType.h
+--- openexr-2.1.0-orig/IlmImf/ImfPartType.h	2013-06-18 23:51:39.000000000 +0400
++++ openexr-2.1.0/IlmImf/ImfPartType.h	2014-05-29 12:51:44.539600000 +0400
+@@ -37,6 +37,7 @@
+ 
+ #include <string>
+ #include "ImfNamespace.h"
++#include "ImfExport.h"
+ 
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+ 
+@@ -46,12 +47,16 @@
+ const std::string DEEPSCANLINE  = "deepscanline";
+ const std::string DEEPTILE      = "deeptile";
+ 
++IMF_EXPORT
+ bool isImage(const std::string& name);
+ 
++IMF_EXPORT
+ bool isTiled(const std::string& name);
+ 
++IMF_EXPORT
+ bool isDeepData(const std::string& name);
+ 
++IMF_EXPORT
+ bool isSupportedType(const std::string& name);
+ 
+ 
+diff -Naur openexr-2.1.0-orig/IlmImfExamples/CMakeLists.txt openexr-2.1.0/IlmImfExamples/CMakeLists.txt
+--- openexr-2.1.0-orig/IlmImfExamples/CMakeLists.txt	2013-11-25 23:49:53.000000000 +0400
++++ openexr-2.1.0/IlmImfExamples/CMakeLists.txt	2014-05-28 15:26:49.508000000 +0400
+@@ -15,9 +15,9 @@
+ TARGET_LINK_LIBRARIES ( IlmImfExamples 
+         IlmImf
+         Half 
+-        Iex-2_1
+-        Imath-2_1 
+-        IlmThread-2_1 
++        Iex
++        Imath
++        IlmThread
+         ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+         )
+   
+\ В конце файла нет новой строки
+diff -Naur openexr-2.1.0-orig/IlmImfFuzzTest/CMakeLists.txt openexr-2.1.0/IlmImfFuzzTest/CMakeLists.txt
+--- openexr-2.1.0-orig/IlmImfFuzzTest/CMakeLists.txt	2013-11-25 23:49:53.000000000 +0400
++++ openexr-2.1.0/IlmImfFuzzTest/CMakeLists.txt	2014-05-28 15:36:27.060200000 +0400
+@@ -12,9 +12,9 @@
+ TARGET_LINK_LIBRARIES ( IlmImfFuzzTest 
+         IlmImf
+         Half
+-        Iex-2_1
+-        Imath-2_1
+-        IlmThread-2_1
++        Iex
++        Imath
++        IlmThread
+         ${PTHREAD_LIB} ${ZLIB_LIBRARIES})
+ 
+ ADD_TEST ( TestIlmImfFuzz IlmImfFuzzTest )
+diff -Naur openexr-2.1.0-orig/IlmImfTest/CMakeLists.txt openexr-2.1.0/IlmImfTest/CMakeLists.txt
+--- openexr-2.1.0-orig/IlmImfTest/CMakeLists.txt	2013-11-25 23:49:53.000000000 +0400
++++ openexr-2.1.0/IlmImfTest/CMakeLists.txt	2014-05-28 15:36:51.041600000 +0400
+@@ -63,9 +63,9 @@
+ TARGET_LINK_LIBRARIES ( IlmImfTest 
+         IlmImf  
+         Half 
+-        Iex-2_1
+-        Imath-2_1 
+-        IlmThread-2_1 
++        Iex 
++        Imath 
++        IlmThread 
+         ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+         )
  
- INSTALL ( FILES