[openjpeg/f17] fix build with libpng-1.5

[Rex Dieter]

commit ab367b7c8cf95d2fd1c8a1c644c636d1e6723625
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Jun 17 12:43:05 2012 -0500

    fix build with libpng-1.5

 openjpeg-1.4-libpng15.patch |   11 +++++++++++
 openjpeg.spec               |    5 +++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/openjpeg-1.4-libpng15.patch b/openjpeg-1.4-libpng15.patch
new file mode 100644
index 0000000..7c99660
--- /dev/null
+++ b/openjpeg-1.4-libpng15.patch
@@ -0,0 +1,11 @@
+diff -up openjpeg_v1_4_sources_r697/codec/convert.c.libpng15 openjpeg_v1_4_sources_r697/codec/convert.c
+--- openjpeg_v1_4_sources_r697/codec/convert.c.libpng15	2012-06-17 12:21:38.107105920 -0500
++++ openjpeg_v1_4_sources_r697/codec/convert.c	2012-06-17 12:21:53.735910455 -0500
+@@ -47,6 +47,7 @@
+ #ifdef _WIN32
+ #include "../libs/png/png.h"
+ #else
++#include <zlib.h>
+ #include <png.h>
+ #endif /* _WIN32 */
+ #endif /* HAVE_LIBPNG */
diff --git a/openjpeg.spec b/openjpeg.spec
index 6e8e7af..0f5b69c 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -30,6 +30,7 @@ BuildRequires: cmake
 BuildRequires: automake libtool 
 %endif
 BuildRequires: libtiff-devel
+BuildRequires: pkgconfig(libpng)
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -59,6 +60,8 @@ Patch100: openjpeg-1.4-poppler_regression.patch
 Patch101: openjpeg-1.4-r1330_backport.patch
 # http://code.google.com/p/openjpeg/source/detail?r=1703
 Patch102: openjpeg-1.4-r1703_backport.patch
+# fix build with libpng15
+Patch103: openjpeg-1.4-libpng15.patch
 
 %description
 OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
@@ -102,6 +105,7 @@ autoreconf -i -f
 #endif
 %patch101 -p1 -b .r1330_backport
 %patch102 -p1 -b .r1703_backport
+%patch103 -p1 -b .libpng15
 
 
 %build
@@ -202,6 +206,7 @@ rm -rf %{buildroot}
 * Sun Jun 17 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4-13
 - CVE-2012-1499 openjpeg: Out-of heap-based buffer write by processing palette information in certain JPEG 2000 images (#805912)
 - CVE-2009-5030 openjpeg: Heap memory corruption leading to invalid free by processing certain Gray16 TIFF images (#812317)
+- fix build with libpng-1.5
 
 * Thu Mar 01 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4-12
 - revert poppler regression patch, breaks ABI (#796500)