Add libpng patch to live version.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 636 insertions, 5 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index e102c87b1763..7c5bb4381028 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.111 2012/02/04 19:50:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.112 2012/02/04 19:53:47 vapier Exp $
+
+  04 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/xbmc-11.0-libpng-1.5.patch, xbmc-9999.ebuild:
+  Add libpng patch to live version.
 
   04 Feb 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
   files/xbmc-9999-nomythtv.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index e491d23fc12c..7fa57c8c7653 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085
 AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
 AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002
-AUX xbmc-10.1-libpng-1.5.patch 18833 RMD160 023626a75b96fbae4d662ff875f1647113d53bad SHA1 463ff9dda04707fc71db3d431eded9f396698aa9 SHA256 83b49d44b7855dcb2f7d34e2e9628f4c1f8e06ae8f9e94ac06a6036620705daa
+AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
+AUX xbmc-11.0-libpng-1.5.patch 18833 RMD160 023626a75b96fbae4d662ff875f1647113d53bad SHA1 463ff9dda04707fc71db3d431eded9f396698aa9 SHA256 83b49d44b7855dcb2f7d34e2e9628f4c1f8e06ae8f9e94ac06a6036620705daa
 AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
 AUX xbmc-9999-nomythtv.patch 6029 RMD160 d8cd1b795225b15f11c8fffd7b92fccffb62e5f2 SHA1 e36f5a7c0b7c98a2141ba858a904d01eb54693a9 SHA256 409a755e2dc7a77c5a73d0e39d9bb46eb824a9501f40225866938ec1d0c0eb4e
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
-EBUILD xbmc-9999.ebuild 5384 RMD160 0ab8afa65ae9ec4b80c4271ee1b7574ca6e3bca4 SHA1 0146575e910299bb88ab8d12aa23cbfda775165a SHA256 dbcd39ff1bc8849a5cdfffa22685a81b89d68242f5531d4f949147e7aff7950a
-MISC ChangeLog 17430 RMD160 6fe9d0bce8a3a8167adbc6f9ec9db3882d195262 SHA1 e54ea43e4c77dc1fee86ef5834e7affe3792f16e SHA256 b1eb911ae7530ff19bfc99e8322d92af1036ac028dbfa31367483cabaeb4a21e
+EBUILD xbmc-9999.ebuild 5385 RMD160 635f52c192a95a4f32e40affc06707c0ba0c1011 SHA1 c42c0f4afbcbfbc60a7e42601ebd07bde73963d1 SHA256 57b2597fba4aac744a9a7f7431a7715d2005c01ba0d3e0337359d2ba81648099
+MISC ChangeLog 17713 RMD160 21a83dcb200833771ea0a533e6bdce1674628ea4 SHA1 e3bdfb382401f31b2cd3492366f744daa74cda4d SHA256 e23cbd349b542a2f06dcb762f0c1532c24480448f85717bf17492c9a6afcf327
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPLYzhAAoJELEHsLL7fEFW6gQP/0BNh7BjrmkzhfyvcprW8pHw
+LmtonSU7cty4B+b5vYlcEVozGwVi9Qy8QTbff8WNrM5ldzD18UkKKtsgPb5SbK+w
+K4adVgaz5RB1cLLqBe1WBPQWJq+JzvfnwQZi/UnBThzjDdJWRKoYnJoOUKuhAAqa
+30Az/qFqkx/ztDd9uWGc8Tfqvcdhxxc4kCVb7tTiYtgwg9t1JwTE1A07nNSykbTm
+trNEYsx1zOx1g0eLSpUSva/f5pYbeZTi5hXfmCuFC5l8QAh5rWLSxU2fnwNVqoN+
+n51+tAAb5+1CM9gWtfW3f8/ru0v8gD01Xc89J22XSIzfc7epYwhT72PZwUzB37fI
+hambQTMsliibZtUA2bvVDkdiSoAibZKpnoP/kfEkR3dCbrNu0uy/A4CcKU+CrRyb
+zaYjwY+XTSuiXTRsi8L8BBXcZTaghTTQ6da9MCDFRB72Ao5Az2z3e+/CJzbzk0sR
+M/C/OTjkL4XPjDJfSPtv0JB9WJ8a42v8X2DtrneBUXQEBcu9DYa4qyHvTdPDe8gQ
+g9EVKn5Wfgqcra9T5iJhUO52KK3l3pOid+NAKtF1vLdncS6siGfyheODHZNyYG6l
+VnzFO0JcwbnGsDlkoqiqMhWBa0qDI0FI4yu6W6fn9L0M/qg/qjV1LlFkNv0QvqX8
+onV5Dfjpd4LQ3PuSsaVu
+=OP0i
+-----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-11.0-libpng-1.5.patch b/media-tv/xbmc/files/xbmc-11.0-libpng-1.5.patch
new file mode 100644
index 000000000000..18c589a126ab
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-11.0-libpng-1.5.patch
@@ -0,0 +1,605 @@
+fix building with newer libpng.  patch by Ian Stakenvicius.
+
+https://bugs.gentoo.org/380127
+
+--- a/lib/cximage-6.0/CxImage/ximapng.cpp
++++ b/lib/cximage-6.0/CxImage/ximapng.cpp
+@@ -15,7 +15,11 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ 	strcpy(info.szLastError,message);
++#if PNG_LIBPNG_VER > 10499
++	longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 	longjmp(png_ptr->jmpbuf, 1);
++#endif
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +66,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
+     /* Set error handling if you are using the setjmp/longjmp method (this is
+     * the normal method of doing things with libpng).  REQUIRED unless you
+     * set up your own error handlers in the png_create_read_struct() earlier. */
++#if PNG_LIBPNG_VER > 10499
++	if (setjmp(png_jmpbuf(png_ptr))) {
++#else
+ 	if (setjmp(png_ptr->jmpbuf)) {
++#endif
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		delete [] row_pointers;
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -76,16 +84,34 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 	/* read the file information */
+ 	png_read_info(png_ptr, info_ptr);
+ 
++#if PNG_LIBPNG_VER > 10499
++	png_uint_32 _width,_height;
++	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
++	png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,
++		&_interlace_type,&_compression_type,&_filter_type);
++
++	if (info.nEscape == -1){
++		head.biWidth = _width;
++		head.biHeight= _height;
++		info.dwType = CXIMAGE_FORMAT_PNG;
++		longjmp(png_jmpbuf(png_ptr), 1);
++	}
++#else
+ 	if (info.nEscape == -1){
+ 		head.biWidth = info_ptr->width;
+ 		head.biHeight= info_ptr->height;
+ 		info.dwType = CXIMAGE_FORMAT_PNG;
+ 		longjmp(png_ptr->jmpbuf, 1);
+ 	}
++#endif
+ 
+ 	/* calculate new number of channels */
+ 	int channels=0;
++#if PNG_LIBPNG_VER > 10499
++	switch(_color_type){
++#else
+ 	switch(info_ptr->color_type){
++#endif
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	case PNG_COLOR_TYPE_PALETTE:
+ 		channels = 1;
+@@ -101,20 +127,49 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		break;
+ 	default:
+ 		strcpy(info.szLastError,"unknown PNG color type");
++#if PNG_LIBPNG_VER > 10499
++		longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 		longjmp(png_ptr->jmpbuf, 1);
++#endif
+ 	}
+ 
+ 	//find the right pixel depth used for cximage
++#if PNG_LIBPNG_VER > 10499
++	int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);
++#else
+ 	int pixel_depth = info_ptr->pixel_depth;
++#endif
+ 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
+ 	if (channels == 2) pixel_depth=8;
+ 	if (channels >= 3) pixel_depth=24;
+ 
++#if PNG_LIBPNG_VER > 10499
++	if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){
++		longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+ 		longjmp(png_ptr->jmpbuf, 1);
++#endif
+ 	}
+ 
+ 	/* get metrics */
++#if PNG_LIBPNG_VER > 10499
++	png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;
++	int _phys_unit_type;
++	png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);
++	switch (_phys_unit_type)
++	{
++	case PNG_RESOLUTION_UNKNOWN:
++		SetXDPI(_x_pixels_per_unit);
++		SetYDPI(_y_pixels_per_unit);
++		break;
++	case PNG_RESOLUTION_METER:
++		SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
++		SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
++		break;
++	}
++#else
+ 	switch (info_ptr->phys_unit_type)
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+@@ -126,46 +181,94 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+ 		break;
+ 	}
++#endif
+ 
++#if PNG_LIBPNG_VER > 10499
++	int _num_palette;
++	png_colorp _palette;
++	png_uint_32 _palette_ret;
++	_palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
++	if (_palette_ret && _num_palette>0){
++		SetPalette((rgb_color*)_palette,_num_palette);
++		SetClrImportant(_num_palette);
++	} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
++#else
+ 	if (info_ptr->num_palette>0){
+ 		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
+ 		SetClrImportant(info_ptr->num_palette);
+ 	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
++#endif
+ 		SetPaletteColor(0,0,0,0);
+ 		SetPaletteColor(1,85,85,85);
+ 		SetPaletteColor(2,170,170,170);
+ 		SetPaletteColor(3,255,255,255);
+ 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
+ 	
++#if PNG_LIBPNG_VER > 10499
++	int nshift = max(0,(_bit_depth>>3)-1)<<3;
++#else
+ 	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
++#endif
+ 
++#if PNG_LIBPNG_VER > 10499
++	png_bytep _trans_alpha;
++	int _num_trans;
++	png_color_16p _trans_color;
++	png_uint_32 _trans_ret;
++	_trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
++	if (_trans_ret && _num_trans!=0){ //palette transparency
++		if (_num_trans==1){
++			if (_color_type == PNG_COLOR_TYPE_PALETTE){
++#else
+ 	if (info_ptr->num_trans!=0){ //palette transparency
+ 		if (info_ptr->num_trans==1){
+ 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
++#endif
++#if PNG_LIBPNG_VER > 10499
++				info.nBkgndIndex = _trans_color->index;
++#else
+ #if PNG_LIBPNG_VER > 10399
+ 				info.nBkgndIndex = info_ptr->trans_color.index;
+ #else
+ 				info.nBkgndIndex = info_ptr->trans_values.index;
+ #endif
++#endif
+ 			} else{
++#if PNG_LIBPNG_VER > 10499
++				info.nBkgndIndex = _trans_color->gray>>nshift;
++#else
+ #if PNG_LIBPNG_VER > 10399
+ 				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+ #else
+ 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
+ #endif
++#endif
+ 			}
+ 		}
++#if PNG_LIBPNG_VER > 10499
++		if (_num_trans>1 && _trans_alpha!=NULL){
++#else
+ 		if (info_ptr->num_trans>1){
++#endif
+ 			RGBQUAD* pal=GetPalette();
+ 			if (pal){
+ 				DWORD ip;
++#if PNG_LIBPNG_VER > 10499
++				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
++					pal[ip].rgbReserved=_trans_alpha[ip];
++#else
+ 				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
++#endif
++#if PNG_LIBPNG_VER > 10499
++				for (ip=_num_trans;ip<head.biClrUsed;ip++){
++#else
+ 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
++#endif
+ 					pal[ip].rgbReserved=255;
+ 				}
+ 				info.bAlphaPaletteEnabled=true;
+@@ -178,6 +281,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		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 > 10499
++			info.nBkgndColor.rgbRed   = (BYTE)(_trans_color->red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(_trans_color->blue>>nshift);
++#else
+ #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);
+@@ -187,6 +295,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+ 			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
+ #endif
++#endif
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -202,15 +311,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 	}
+ 
+ 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
++#if PNG_LIBPNG_VER > 10499
++	if (_color_type & PNG_COLOR_MASK_COLOR){
++#else
+ 	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
++#endif
+ 		png_set_bgr(png_ptr);
+ 	}
+ 
+ 	// <vho> - handle cancel
++#if PNG_LIBPNG_VER > 10499
++	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++#endif
+ 
+ 	// row_bytes is the width x number of channels x (bit-depth / 8)
++#if PNG_LIBPNG_VER > 10499
++	row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
++#else
+ 	row_pointers = new BYTE[info_ptr->rowbytes + 8];
++#endif
+ 
+ 	// turn on interlace handling
+ 	int number_passes = png_set_interlace_handling(png_ptr);
+@@ -221,8 +342,16 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		SetCodecOption(0);
+ 	}
+ 
++#if PNG_LIBPNG_VER > 10499
++	int chan_offset = _bit_depth >> 3;
++#else
+ 	int chan_offset = info_ptr->bit_depth >> 3;
++#endif
++#if PNG_LIBPNG_VER > 10499
++	int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;
++#else
+ 	int pixel_offset = info_ptr->pixel_depth >> 3;
++#endif
+ 
+ 	for (int pass=0; pass < number_passes; pass++) {
+ 		iter.Upset();
+@@ -230,7 +359,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 		do	{
+ 
+ 			// <vho> - handle cancel
++#if PNG_LIBPNG_VER > 10499
++			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++#endif
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			if (AlphaIsValid()) {
+@@ -241,7 +374,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 				BYTE* prow= iter.GetRow(ay);
+ 
+ 				//recover data from previous scan
++#if PNG_LIBPNG_VER > 10499
++				if (_interlace_type && pass>0 && pass!=7){
++#else
+ 				if (info_ptr->interlace_type && pass>0 && pass!=7){
++#endif
+ 					for(ax=0;ax<head.biWidth;ax++){
+ 						long px = ax * pixel_offset;
+ 						if (channels == 2){
+@@ -278,10 +415,17 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ #endif // CXIMAGE_SUPPORT_ALPHA		// vho
+ 			{
+ 				//recover data from previous scan
++#if PNG_LIBPNG_VER > 10499
++				if (_interlace_type && pass>0){
++					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
++					//re-expand buffer for images with bit depth > 8
++					if (_bit_depth > 8){
++#else
+ 				if (info_ptr->interlace_type && pass>0){
+ 					iter.GetRow(row_pointers, info_ptr->rowbytes);
+ 					//re-expand buffer for images with bit depth > 8
+ 					if (info_ptr->bit_depth > 8){
++#endif
+ 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
+ 							row_pointers[ax*chan_offset] = row_pointers[ax];
+ 					}
+@@ -291,15 +435,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 				png_read_row(png_ptr, row_pointers, NULL);
+ 
+ 				//shrink 16 bit depth images down to 8 bits
++#if PNG_LIBPNG_VER > 10499
++				if (_bit_depth > 8){
++#else
+ 				if (info_ptr->bit_depth > 8){
++#endif
+ 					for(long ax=0;ax<(head.biWidth*channels);ax++)
+ 						row_pointers[ax] = row_pointers[ax*chan_offset];
+ 				}
+ 
+ 				//copy the pixels
++#if PNG_LIBPNG_VER > 10499
++				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
++#else
+ 				iter.SetRow(row_pointers, info_ptr->rowbytes);
++#endif
+ 				//<DP> expand 2 bpp images only in the last pass
++#if PNG_LIBPNG_VER > 10499
++				if (_bit_depth==2 && pass==(number_passes-1))
++#else
+ 				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
++#endif
+ 					expand2to4bpp(iter.GetRow());
+ 
+ 				//go on
+@@ -361,9 +517,13 @@ bool CxImagePNG::Encode(CxFile *hFile)
+    /* Set error handling.  REQUIRED if you aren't supplying your own
+     * error hadnling functions in the png_create_write_struct() call.
+     */
++#if PNG_LIBPNG_VER > 10499
++	if (setjmp(png_jmpbuf(png_ptr))){
++#else
+ 	if (setjmp(png_ptr->jmpbuf)){
+ 		/* If we get here, we had a problem reading the file */
+ 		if (info_ptr->palette) free(info_ptr->palette);
++#endif
+ 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
+ 		cx_throw("Error saving PNG file");
+ 	}
+@@ -372,9 +532,23 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	//png_init_io(png_ptr, hFile);
+ 
+ 	// use custom I/O functions
+-    png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
++	png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
+ 
+ 	/* set the file information here */
++#if PNG_LIBPNG_VER > 10499
++	/* use variables to hold the values so it isnt necessary to png_get them later */
++	png_uint_32 _width,_height;
++	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
++	png_byte _channels,_pixel_depth;
++
++	_width = GetWidth();
++	_height = GetHeight();
++	_pixel_depth = (BYTE)GetBpp();
++	_channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
++	_bit_depth = (BYTE)(GetBpp()/_channels);
++	_compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
++	_filter_type = PNG_FILTER_TYPE_DEFAULT;
++#else
+ 	info_ptr->width = GetWidth();
+ 	info_ptr->height = GetHeight();
+ 	info_ptr->pixel_depth = (BYTE)GetBpp();
+@@ -382,13 +556,22 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
+ 	info_ptr->compression_type = info_ptr->filter_type = 0;
+ 	info_ptr->valid = 0;
++#endif
+ 
+ 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
+ 	case 1:
++#if PNG_LIBPNG_VER > 10499
++		_interlace_type = PNG_INTERLACE_ADAM7;
++#else
+ 		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
++#endif
+ 		break;
+ 	default:
++#if PNG_LIBPNG_VER > 10499
++		_interlace_type = PNG_INTERLACE_NONE;
++#else
+ 		info_ptr->interlace_type = PNG_INTERLACE_NONE;
++#endif
+ 	}
+ 
+ 	/* set compression level */
+@@ -398,19 +581,38 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 
+ 	if (GetNumColors()){
+ 		if (bGrayScale){
++#if PNG_LIBPNG_VER > 10499
++			_color_type = PNG_COLOR_TYPE_GRAY;
++#else
+ 			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++#endif
+ 		} else {
++#if PNG_LIBPNG_VER > 10499
++			_color_type = PNG_COLOR_TYPE_PALETTE;
++#else
+ 			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++#endif
+ 		}
+ 	} else {
++#if PNG_LIBPNG_VER > 10499
++		_color_type = PNG_COLOR_TYPE_RGB;
++#else
+ 		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++#endif
+ 	}
+ #if CXIMAGE_SUPPORT_ALPHA
+ 	if (AlphaIsValid()){
++#if PNG_LIBPNG_VER > 10499
++		_color_type |= PNG_COLOR_MASK_ALPHA;
++		_channels++;
++		_bit_depth = 8;
++		_pixel_depth += 8;
++#else
+ 		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+ 		info_ptr->channels++;
+ 		info_ptr->bit_depth = 8;
+ 		info_ptr->pixel_depth += 8;
++#endif
+ 	}
+ #endif
+ 
+@@ -427,14 +629,30 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	/* set metrics */
+ 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
+ 
++#if PNG_LIBPNG_VER > 10499
++	png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,
++		_compression_type,_filter_type);
++#else
+ 	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
+ 				info_ptr->color_type, info_ptr->interlace_type,
+ 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
++#endif
+ 
+ 	//<DP> simple transparency
+ 	if (info.nBkgndIndex >= 0){
++#if PNG_LIBPNG_VER <= 10499
+ 		info_ptr->num_trans = 1;
+ 		info_ptr->valid |= PNG_INFO_tRNS;
++#endif
++#if PNG_LIBPNG_VER > 10499
++		png_color_16 _trans_color;
++		_trans_color.index = (BYTE)info.nBkgndIndex;
++		_trans_color.red   = tc.rgbRed;
++		_trans_color.green = tc.rgbGreen;
++		_trans_color.blue  = tc.rgbBlue;
++		_trans_color.gray  = _trans_color.index;
++		png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);
++#else
+ #if PNG_LIBPNG_VER > 10399
+ 		info_ptr->trans_alpha = trans;
+ 		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
+@@ -450,6 +668,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 		info_ptr->trans_values.blue  = tc.rgbBlue;
+ 		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
+ #endif
++#endif
+ 
+ 		// the transparency indexes start from 0 for non grayscale palette
+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -457,10 +676,16 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	}
+ 
+ 	/* set the palette if there is one */
++#if PNG_LIBPNG_VER > 10499
++	png_colorp _palette = NULL;
++	if (GetPalette()){
++		/* png_set_PLTE() will be called once the palette is ready */
++#else
+ 	if (GetPalette()){
+ 		if (!bGrayScale){
+ 			info_ptr->valid |= PNG_INFO_PLTE;
+ 		}
++#endif
+ 
+ 		int nc = GetClrImportant();
+ 		if (nc==0) nc = GetNumColors();
+@@ -468,20 +693,34 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 		if (info.bAlphaPaletteEnabled){
+ 			for(WORD ip=0; ip<nc;ip++)
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
++#if PNG_LIBPNG_VER <= 10499
+ 			info_ptr->num_trans = (WORD)nc;
+ 			info_ptr->valid |= PNG_INFO_tRNS;
++#endif
++#if PNG_LIBPNG_VER > 10499
++			png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);
++#else
+ #if PNG_LIBPNG_VER > 10399
+ 			info_ptr->trans_alpha = trans;
+ #else
+ 			info_ptr->trans = trans;
+ #endif
++#endif
+ 		}
+ 
+ 		// copy the palette colors
++#if PNG_LIBPNG_VER > 10499
++		_palette = new png_color[nc];
++		for (int i=0; i<nc; i++)
++			GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);
++
++		png_set_PLTE(png_ptr,info_ptr,_palette,nc);
++#else
+ 		info_ptr->palette = new png_color[nc];
+ 		info_ptr->num_palette = (png_uint_16) nc;
+ 		for (int i=0; i<nc; i++)
+ 			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
++#endif
+ 	}  
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+@@ -495,8 +734,12 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	}	}	}
+ #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 
++#if PNG_LIBPNG_VER > 10499
++	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
++#else
+ 	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
+ 	info_ptr->rowbytes = row_size;
++#endif
+ 	BYTE *row_pointers = new BYTE[row_size];
+ 
+ 	/* write the file information */
+@@ -514,7 +757,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 			if (AlphaIsValid()){
+ 				for (long ax=head.biWidth-1; ax>=0;ax--){
+ 					c = BlindGetPixelColor(ax,ay);
++#if PNG_LIBPNG_VER > 10499
++					int px = ax * _channels;
++#else
+ 					int px = ax * info_ptr->channels;
++#endif
+ 					if (!bGrayScale){
+ 						row_pointers[px++]=c.rgbRed;
+ 						row_pointers[px++]=c.rgbGreen;
+@@ -529,7 +776,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			{
+ 				iter.GetRow(row_pointers, row_size);
++#if PNG_LIBPNG_VER > 10499
++				if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
++#else
+ 				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
++#endif
+ 					RGBtoBGR(row_pointers, row_size);
+ 				png_write_row(png_ptr, row_pointers);
+ 			}
+@@ -546,9 +797,14 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ 	png_write_end(png_ptr, info_ptr);
+ 
+ 	/* if you malloced the palette, free it here */
++#if PNG_LIBPNG_VER > 10499
++	if (_palette){
++		delete [] (_palette);
++#else
+ 	if (info_ptr->palette){
+ 		delete [] (info_ptr->palette);
+ 		info_ptr->palette = NULL;
++#endif
+ 	}
+ 
+ 	/* clean up after the write, and free any memory allocated */
+--- a/lib/cximage-6.0/CxImage/ximapng.h
++++ b/lib/cximage-6.0/CxImage/ximapng.h
+@@ -69,8 +69,13 @@ class CxImagePNG: public CxImage
+ 
+     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ 	{
++#if PNG_LIBPNG_VER > 10499
++		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
++		longjmp(png_jmpbuf(png_ptr), 1);
++#else
+ 		strncpy((char*)png_ptr->error_ptr,error_msg,255);
+ 		longjmp(png_ptr->jmpbuf, 1);
++#endif
+ 	}
+ };
+ 
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 52a9abf1958f..b57d35746a3e 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.99 2012/02/04 19:50:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.100 2012/02/04 19:53:47 vapier Exp $
 
 EAPI="4"
 
@@ -111,6 +111,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11.0-libpng-1.5.patch #380127
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617