[xine-ui] fix build with libpng-1.5

[mjg]

commit c307f4bb120efccc7e8d684f6ec7ab0b61c3d65b
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Tue Dec 6 17:25:27 2011 +0100

    fix build with libpng-1.5

 xine-ui-0.99.6-libpng-1.5.patch |   11 +++++++++++
 xine-ui.spec                    |   12 +++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/xine-ui-0.99.6-libpng-1.5.patch b/xine-ui-0.99.6-libpng-1.5.patch
new file mode 100644
index 0000000..9bae4dd
--- /dev/null
+++ b/xine-ui-0.99.6-libpng-1.5.patch
@@ -0,0 +1,11 @@
+--- xine-ui-0.99.6/src/xitk/Imlib-light/load.c-orig	2011-12-06 17:15:12.000000000 +0100
++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c	2011-12-06 17:16:21.000000000 +0100
+@@ -61,7 +61,7 @@
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return NULL;
+     }
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
diff --git a/xine-ui.spec b/xine-ui.spec
index d2c1357..420ccb8 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -6,7 +6,7 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.6
-Release:        28%{?dist}.1
+Release:        29%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.xine-project.org/
@@ -30,6 +30,8 @@ Patch1:         xine-ui-0.99.5-utf8doc.patch
 Patch10:	xine-ui-0.99.6-fix-help-crash.patch
 # curl/types.h has been empty since 2006, MIA 2011
 Patch11:	xine-ui-0.99.6-curl-types.patch
+# libpng-1.5 cares about its private parts
+Patch12:	xine-ui-0.99.6-libpng-1.5.patch
 
 
 #o Sources for -skins. Ugh.
@@ -76,7 +78,7 @@ BuildRequires:  curl-devel >= 7.10.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libcaca-devel
-BuildRequires:  libpng-devel
+BuildRequires:  libpng-devel >= 1.5
 BuildRequires:  libtermcap-devel
 BuildRequires:  libXft-devel
 BuildRequires:  libXi-devel
@@ -142,8 +144,9 @@ touch -r m4/_xine.m4 m4/_xine.m4.stamp
 touch -r m4/_xine.m4.stamp m4/_xine.m4
 
 %patch10 -p0
-
 %patch11 -p0
+%patch12 -p1
+
 
 # By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
 # it's provided by libX11-devel => version the dlopen()
@@ -276,6 +279,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/aaxine
 
 %changelog
+* Tue Dec 06 2011 Michael J Gruber <mjg at fedoraproject.org> 0.99.6-29
+- fix build with libpng-1.5
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.99.6-28.1
 - Rebuild for new libpng