From 414c74cdce88c52cd9244ed2f0f05b2ff54b13bb Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Thu, 29 May 2014 23:02:32 +0400
Subject: [PATCH] OpenImageIO: Update to 1.4.8

---
 mingw-w64-openimageio/PKGBUILD                | 70 +++++++++++--------
 mingw-w64-openimageio/fix-mingw-w64.patch     | 32 ++++-----
 mingw-w64-openimageio/giflib.patch            | 11 +++
 ...round-ansidecl-h-PTR-define-conflict.patch |  4 +-
 4 files changed, 68 insertions(+), 49 deletions(-)
 create mode 100644 mingw-w64-openimageio/giflib.patch

diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD
index ad9acc171a..c3838e2ce1 100644
--- a/mingw-w64-openimageio/PKGBUILD
+++ b/mingw-w64-openimageio/PKGBUILD
@@ -3,41 +3,47 @@
 _realname=openimageio
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
-pkgver=1.3.13
+pkgver=1.4.8
 pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)"
 arch=('any')
 url="http://www.openimageio.org/"
 license=("custom")
-depends=("${_mingw_suff}-openexr"
-    "${_mingw_suff}-boost"
-    "${_mingw_suff}-jasper" 
-    "${_mingw_suff}-glew"
-    "${_mingw_suff}-libtiff"
-    "${_mingw_suff}-opencolorio"
-    #"${_mingw_suff}-intel-tbb"
-    "${_mingw_suff}-libjpeg"
-    "${_mingw_suff}-libpng"
-    "${_mingw_suff}-giflib"
-    "${_mingw_suff}-zlib"
-    "${_mingw_suff}-freetype"
-    "${_mingw_suff}-openjpeg"
-    "${_mingw_suff}-libwebp")
+depends=("${_mingw_suff}-boost"
+        "${_mingw_suff}-field3d"
+        "${_mingw_suff}-freetype"
+        "${_mingw_suff}-jasper"
+        "${_mingw_suff}-giflib"
+        "${_mingw_suff}-glew"
+        "${_mingw_suff}-hdf5"
+        "${_mingw_suff}-libjpeg"
+        "${_mingw_suff}-libpng"
+        "${_mingw_suff}-LibRaw"
+        "${_mingw_suff}-libwebp"
+        "${_mingw_suff}-libtiff"
+        "${_mingw_suff}-opencolorio"
+        "${_mingw_suff}-openexr"
+        "${_mingw_suff}-openjpeg"
+        "${_mingw_suff}-openssl"
+        "${_mingw_suff}-zlib")
 makedepends=("${_mingw_suff}-cmake" "${_mingw_suff}-qt5" "${_mingw_suff}-python2" "${_mingw_suff}-boost")
 optdepends=(#"${_mingw_suff}-qt4: iv image viewer"
             "${_mingw_suff}-python2: bindings support")
 options=('strip' 'buildflags')
 source=(https://github.com/OpenImageIO/oiio/archive/Release-$pkgver.tar.gz
-    fix-mingw-w64.patch
-    workaround-ansidecl-h-PTR-define-conflict.patch)
-md5sums=('a0e187243c568df36e125c81c0a0efe3'
-         '7a1c6f54e2bce377a0550d618185ab35'
-         '6602e0502de60003e247c2e754e531fd')
+        fix-mingw-w64.patch
+        workaround-ansidecl-h-PTR-define-conflict.patch
+        giflib.patch)
+md5sums=('fff0d9673fcd9b8cb050c91af5cfd731'
+         '8da0d1c2140b8ffa707a6dbe3874a1ab'
+         '1bf4c840ee73d37ebdfc98d3ea527ed4'
+         'f5cef862b0700c80cb574bfec9625b85')
 
 prepare() {
   cd ${srcdir}/oiio-Release-${pkgver}
   patch -p1 -i ${srcdir}/fix-mingw-w64.patch
   patch -p1 -i ${srcdir}/workaround-ansidecl-h-PTR-define-conflict.patch
+  patch -p1 -i ${srcdir}/giflib.patch
 }
 
 build() {
@@ -51,30 +57,32 @@ build() {
   popd > /dev/null
   
   export OPENJPEG_HOME=${MINGW_PREFIX}
-  cd oiio-Release-${pkgver}
-  cd src
   [[ -d build-${MINGW_CHOST} ]] && rm -r build-${MINGW_CHOST}
   mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
-    ${MINGW_PREFIX}/bin/cmake.exe \
+  
+  ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \
+    -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
     -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
+    -DUSE_FREETYPE=ON \
+    -DFREETYPE_INCLUDE_PATH=${PREFIX_DEPS}/include/freetype2 \
     -DOPENJPEG_INCLUDE_DIR=${PREFIX_DEPS}/include/openjpeg-1.5 \
     -DOPENJPEG_OPENJPEG_LIBRARIES=${PREFIX_DEPS}/lib/libopenjpeg.dll.a \
-    -DUSE_EXTERNAL_TBB=ON \
+    -DUSE_OPENCV=ON \
+    -DUSE_FIELD3D=ON \
     -DCMAKE_SHARED_LINKER_FLAGS=" -Wl,--export-all-symbols -Wl,--enable-auto-import " \
     -DOIIO_BUILD_TESTS=ON \
-      ../..
-    make
+    -DVERBOSE=ON \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    ../oiio-Release-${pkgver}
+  make
 }
 
 package() {
-  cd "$srcdir"/oiio-Release-${pkgver}/src/build-${MINGW_CHOST}
+  cd "$srcdir"/build-${MINGW_CHOST}
 
   make install
   rm -r ${pkgdir}${MINGW_PREFIX}/doc
 
-  # license
-  cd ../..
-  install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE"
+  install -Dm644 ${srcdir}/oiio-Release-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE"
 }
diff --git a/mingw-w64-openimageio/fix-mingw-w64.patch b/mingw-w64-openimageio/fix-mingw-w64.patch
index 977b281e4a..63fa7c3c67 100644
--- a/mingw-w64-openimageio/fix-mingw-w64.patch
+++ b/mingw-w64-openimageio/fix-mingw-w64.patch
@@ -9,8 +9,8 @@
  if (VERBOSE)
      message (STATUS "Boost found ${Boost_FOUND} ")
      message (STATUS "Boost version      ${Boost_VERSION}")
---- a/src/include/fmath.h
-+++ b/src/include/fmath.h
+--- a/src/include/OpenImageIO/fmath.h
++++ b/src/include/OpenImageIO/fmath.h
 @@ -46,6 +46,7 @@
  #include <limits>
  #include <typeinfo>
@@ -37,8 +37,20 @@
   using std::isnan;
   using std::isinf;
   using std::isfinite;
---- a/src/include/thread.h
-+++ b/src/include/thread.h
+--- a/src/include/OpenImageIO/osdep.h
++++ b/src/include/OpenImageIO/osdep.h
+@@ -33,7 +33,9 @@
+ #ifdef _WIN32
+ # define WIN32_LEAN_AND_MEAN
+ # define VC_EXTRALEAN
++# ifndef __MINGW32__
+ # define NOMINMAX
++# endif
+ # include <windows.h>
+ #endif
+ 
+--- a/src/include/OpenImageIO/thread.h
++++ b/src/include/OpenImageIO/thread.h
 @@ -98,6 +98,7 @@
  #endif
  
@@ -284,15 +296,3 @@
      set (CPACK_GENERATOR "NSIS")
      set(CPACK_PACKAGE_EXECUTABLES "iv" "iv - Image Viewer")
  #    set(CPACK_CREATE_DESCTOP_LINKS "iv" "iv - Image Viewer")
---- a/src/include/osdep.h
-+++ b/src/include/osdep.h
-@@ -33,7 +33,9 @@
- #ifdef _WIN32
- # define WIN32_LEAN_AND_MEAN
- # define VC_EXTRALEAN
-+# ifndef __MINGW32__
- # define NOMINMAX
-+# endif
- # include <windows.h>
- #endif
- 
diff --git a/mingw-w64-openimageio/giflib.patch b/mingw-w64-openimageio/giflib.patch
new file mode 100644
index 0000000000..2871f696d1
--- /dev/null
+++ b/mingw-w64-openimageio/giflib.patch
@@ -0,0 +1,11 @@
+--- oiio-Release-1.4.8/src/gif.imageio/gifinput.cpp.orig	2014-05-23 20:21:53.000000000 +0400
++++ oiio-Release-1.4.8/src/gif.imageio/gifinput.cpp	2014-05-29 09:37:42.109200000 +0400
+@@ -437,7 +437,7 @@
+ GIFInput::close (void)
+ {
+     if (m_gif_file) {
+-        if (DGifCloseFile (m_gif_file) == GIF_ERROR) {
++        if (DGifCloseFile (m_gif_file, NULL) == GIF_ERROR) {
+             error ("Error trying to close the file.");
+             return false;
+         }
diff --git a/mingw-w64-openimageio/workaround-ansidecl-h-PTR-define-conflict.patch b/mingw-w64-openimageio/workaround-ansidecl-h-PTR-define-conflict.patch
index 6494424edf..2ba33c6f11 100644
--- a/mingw-w64-openimageio/workaround-ansidecl-h-PTR-define-conflict.patch
+++ b/mingw-w64-openimageio/workaround-ansidecl-h-PTR-define-conflict.patch
@@ -1,5 +1,5 @@
---- a/src/include/typedesc.h.orig	2014-01-12 23:34:55.402417300 +0000
-+++ b/src/include/typedesc.h	2014-01-12 23:35:17.974708400 +0000
+--- a/src/include/OpenImageIO/typedesc.h.orig	2014-01-12 23:34:55.402417300 +0000
++++ b/src/include/OpenImageIO/typedesc.h	2014-01-12 23:35:17.974708400 +0000
 @@ -76,12 +76,23 @@
  struct OIIO_API TypeDesc {
      /// BASETYPE is a simple enum for the C/C++ built-in types.