From b264a15aba7aefb3d2c3b15673913d01df04c877 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 8 Feb 2010 16:44:54 +0100
Subject: [PATCH] xbmc: - fix for building against libpng-1.4

---
 .../xbmc-cximage-libpng-1.4.0-0.1.diff        | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 packages/mediacenter/xbmc/patches/xbmc-cximage-libpng-1.4.0-0.1.diff

diff --git a/packages/mediacenter/xbmc/patches/xbmc-cximage-libpng-1.4.0-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-cximage-libpng-1.4.0-0.1.diff
new file mode 100644
index 0000000000..7cec6dfffc
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-cximage-libpng-1.4.0-0.1.diff
@@ -0,0 +1,84 @@
+diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
+--- xbmc-27495/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2010-02-05 23:40:42.000000000 +0100
++++ xbmc-27495.patch/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2010-02-08 03:37:44.901982746 +0100
+@@ -142,9 +142,17 @@
+ 	if (info_ptr->num_trans!=0){ //palette transparency
+ 		if (info_ptr->num_trans==1){
+ 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
++#if PNG_LIBPNG_VER > 10399
++				info.nBkgndIndex = info_ptr->trans_color.index;
++#else
+ 				info.nBkgndIndex = info_ptr->trans_values.index;
++#endif
+ 			} else{
++#if PNG_LIBPNG_VER > 10399
++				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
++#else
+ 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
++#endif
+ 			}
+ 		}
+ 		if (info_ptr->num_trans>1){
+@@ -152,7 +160,11 @@
+ 			if (pal){
+ 				DWORD ip;
+ 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
++#if PNG_LIBPNG_VER > 10399
++					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
++#else
+ 					pal[ip].rgbReserved=info_ptr->trans[ip];
++#endif
+ 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
+ 					pal[ip].rgbReserved=255;
+ 				}
+@@ -166,9 +178,15 @@
+ 		int num_trans;
+ 		png_color_16 *image_background;
+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
++#if PNG_LIBPNG_VER > 10399
++			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
++#else
+ 			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+ 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+ 			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
++#endif
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -417,12 +435,21 @@
+ 	if (info.nBkgndIndex >= 0){
+ 		info_ptr->num_trans = 1;
+ 		info_ptr->valid |= PNG_INFO_tRNS;
++#if PNG_LIBPNG_VER > 10399
++		info_ptr->trans_alpha = trans;
++		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
++		info_ptr->trans_color.red   = tc.rgbRed;
++		info_ptr->trans_color.green = tc.rgbGreen;
++		info_ptr->trans_color.blue  = tc.rgbBlue;
++		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
++#else
+ 		info_ptr->trans = trans;
+ 		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
+ 		info_ptr->trans_values.red   = tc.rgbRed;
+ 		info_ptr->trans_values.green = tc.rgbGreen;
+ 		info_ptr->trans_values.blue  = tc.rgbBlue;
+ 		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
++#endif
+ 
+ 		// the transparency indexes start from 0 for non grayscale palette
+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -443,7 +470,11 @@
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+ 			info_ptr->num_trans = (WORD)nc;
+ 			info_ptr->valid |= PNG_INFO_tRNS;
++#if PNG_LIBPNG_VER > 10399
++			info_ptr->trans_alpha = trans;
++#else
+ 			info_ptr->trans = trans;
++#endif
+ 		}
+ 
+ 		// copy the palette colors
+diff -Naur xbmc-27495/xbmc/lib/cximage-6.0/libpng.diff xbmc-27495.patch/xbmc/lib/cximage-6.0/libpng.diff