From 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Feb 2012 23:14:50 +0000
Subject: Mon Feb  6 23:14:50 UTC 2012

---
 community/openimageio/PKGBUILD                          | 13 +++++++++----
 community/openimageio/openimageio-0.10.2-libpng15.patch | 11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 community/openimageio/openimageio-0.10.2-libpng15.patch

(limited to 'community/openimageio')

diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index b6cdcd8c1..dd91ef261 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -4,7 +4,7 @@
 _pkg=OpenImageIO
 pkgname=openimageio
 pkgver=0.10.4
-pkgrel=3
+pkgrel=5
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
@@ -13,8 +13,10 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew')
 makedepends=('cmake' 'qt' 'python2' 'boost')
 optdepends=('qt: iv image viewer' 'python2: bindings support')
 options=(!buildflags)
-source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}")
-md5sums=('08a1bc2b82862ad5547bba569f4f633f')
+source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}"
+        "openimageio-0.10.2-libpng15.patch")
+md5sums=('08a1bc2b82862ad5547bba569f4f633f'
+         'd12829808610a54b6bc3350dc5419db3')
 
 build() {
   cd "$srcdir"/$_pkg*
@@ -22,7 +24,10 @@ build() {
   # remove insecure rpath
   sed -i "/RPATH/d" src/CMakeLists.txt
 
-  make debug
+  patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch
+
+  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
+  [[ $CARCH == "i686" ]] && make debug || make
 }
 
 package() {
diff --git a/community/openimageio/openimageio-0.10.2-libpng15.patch b/community/openimageio/openimageio-0.10.2-libpng15.patch
new file mode 100644
index 000000000..97375d5fb
--- /dev/null
+++ b/community/openimageio/openimageio-0.10.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- ico.imageio/icooutput.cpp
++++ ico.imageio/icooutput.cpp
+@@ -32,6 +32,8 @@
+ #include <cstdlib>
+ #include <cmath>
+ 
++#include <zlib.h> /* Z_BEST_COMPRESSION */
++
+ #include "ico.h"
+ #include "../png.imageio/png_pvt.h"
+ 
-- 
cgit v1.2.3-54-g00ecf