Fix building with libpng14 wrt #319113 by Manuel Nickschas.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 101 insertions, 14 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 80699a0aff61..aecf2de81c17 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.50 2010/04/07 20:39:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.51 2010/05/10 12:35:50 ssuominen Exp $
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild,
+  +files/xbmc-9.11-libpng14.patch:
+  Fix building with libpng14 wrt #319113 by Manuel Nickschas.
 
   07 Apr 2010; Patrick Lauer <patrick@gentoo.org> xbmc-9.11.ebuild,
   xbmc-9.11-r3.ebuild, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 4417e76348ad..c610dbf0b9a1 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
+AUX xbmc-9.11-libpng14.patch 4233 RMD160 88be2b989033f2529ff54d8e9570b6da8098aa85 SHA1 1ae96c28d4caa0d1d75c4e020249eca2bce0db96 SHA256 0a2922d7cf4c97bf8c769134c2bc9dbffbb0ba1aeafda790e38829318d6c5bbe
 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-9.11-r3.ebuild 4994 RMD160 5cb2452719764874f4377864a80498911368b7c8 SHA1 ac7e2d4e697e01f4b0b5ca9bc2121b4516c89559 SHA256 61a63fc5aa62e9ac39e5485ca797a9c62a3a0f2bec814c898795ca2874a2e475
+EBUILD xbmc-9.11-r3.ebuild 5045 RMD160 47dc73171045b03e54fa70e690835a60ad790521 SHA1 c2fed5a0bd61791521052bb162630e156ae45235 SHA256 c16351b3266b4354ee9a37746ca55574d6e6b462ff2922f191319bc0a3ce1a9a
 EBUILD xbmc-9.11.ebuild 4870 RMD160 a1f738d3d5647f8f19e11b8c0485f8d0512db411 SHA1 aa3f3552a9525ef278d595e73afdd95dbdc8a491 SHA256 326c6107cc741ebc95078152bdb7504c8f9433ef1d14b3476f82caf97cd4171d
 EBUILD xbmc-9999.ebuild 4692 RMD160 0bfdc087511bc54aaa9c9cd614beb25fdcf363c3 SHA1 39ccb0837dd50829b52059f9266db1e6247300a1 SHA256 e9d6d0da73944ae8a6e5652f069b02d6c3f9fa40fd2ff3ccdd766e4c17137a82
-MISC ChangeLog 8097 RMD160 a02d81c227ae13242bf0d3b8ac98bec428cda07c SHA1 2e455fe919eb2812145b39df8d77a2278b8c9635 SHA256 bf5bff687e145a8d6fb93ad342f5cecbbdf75f7c91618d003d76ed7d6633b0aa
+MISC ChangeLog 8270 RMD160 b31b2b1c07835b609986f933f6cc19db0ea18213 SHA1 e3b50be34c6a13f1b693767820bd473168969bdd SHA256 5f64f74ed7abcc1eb3cb66d6d53a632c4e6924510aec20889dae51c0189becd6
 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku87RkACgkQHB6c3gNBRYdVyQCeO0n4DfkYguPkZN+MRvsNe7Eb
-yScAn0oaXUWSO2K1xl5JfMxdFTOMURUo
-=MYyg
------END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9.11-libpng14.patch b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch
new file mode 100644
index 000000000000..2e66de904feb
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch
@@ -0,0 +1,91 @@
+http://repos.archlinux.org/wsvn/community/xbmc/trunk/libpng14.patch
+
+diff -Nur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
+--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2008-07-18 23:40:53.000000000 +0300
++++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2010-01-20 21:55:11.000000000 +0200
+@@ -142,9 +142,9 @@
+ 	if (info_ptr->num_trans!=0){ //palette transparency

+ 		if (info_ptr->num_trans==1){

+ 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){

+-				info.nBkgndIndex = info_ptr->trans_values.index;

++				info.nBkgndIndex = info_ptr->trans_color.index;

+ 			} else{

+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;

++				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;

+ 			}

+ 		}

+ 		if (info_ptr->num_trans>1){

+@@ -152,7 +152,7 @@
+ 			if (pal){

+ 				DWORD ip;

+ 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)

+-					pal[ip].rgbReserved=info_ptr->trans[ip];

++					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];

+ 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){

+ 					pal[ip].rgbReserved=255;

+ 				}

+@@ -166,9 +166,9 @@
+ 		int num_trans;

+ 		png_color_16 *image_background;

+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){

+-			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);

++			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);

+ 			info.nBkgndColor.rgbReserved = 0;

+ 			info.nBkgndIndex = 0;

+ 		}

+@@ -417,12 +417,12 @@
+ 	if (info.nBkgndIndex >= 0){

+ 		info_ptr->num_trans = 1;

+ 		info_ptr->valid |= PNG_INFO_tRNS;

+-		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;

++		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;

+ 

+ 		// the transparency indexes start from 0 for non grayscale palette

+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)

+@@ -443,7 +443,7 @@
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;

+ 			info_ptr->num_trans = (WORD)nc;

+ 			info_ptr->valid |= PNG_INFO_tRNS;

+-			info_ptr->trans = trans;

++			info_ptr->trans_alpha = trans;

+ 		}

+ 

+ 		// copy the palette colors

+diff -Nur xbmc-9.11.orig/xbmc/screensavers/rsxs-0.9/src/pngimage.cc xbmc-9.11/xbmc/screensavers/rsxs-0.9/src/pngimage.cc
+--- xbmc-9.11.orig/xbmc/screensavers/rsxs-0.9/src/pngimage.cc	2008-07-30 23:35:38.000000000 +0300
++++ xbmc-9.11/xbmc/screensavers/rsxs-0.9/src/pngimage.cc	2010-01-20 22:21:01.000000000 +0200
+@@ -65,7 +65,7 @@
+ 			(png_get_color_type(png, pngInfo) == PNG_COLOR_TYPE_GRAY) &&
+ 			png_get_bit_depth(png, pngInfo) < 8
+ 		)
+-			png_set_gray_1_2_4_to_8(png);
++			png_set_expand_gray_1_2_4_to_8(png);
+ 		if (png_get_valid(png, pngInfo, PNG_INFO_tRNS))
+ 			png_set_tRNS_to_alpha(png);
+ 		if (fullColor)
+diff -Nur xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c
+--- xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c	2008-08-04 05:05:51.000000000 +0300
++++ xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c	2010-01-20 22:16:23.000000000 +0200
+@@ -94,7 +94,7 @@
+ 		png_set_palette_to_rgb (png_ptr);
+ 
+ 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-		png_set_gray_1_2_4_to_8 (png_ptr);
++		png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ 	else if (color_type == PNG_COLOR_TYPE_GRAY ||
+ 					 color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ 			png_set_gray_to_rgb (png_ptr);
diff --git a/media-tv/xbmc/xbmc-9.11-r3.ebuild b/media-tv/xbmc/xbmc-9.11-r3.ebuild
index 21a90a4d83af..4c5c47fe07e3 100644
--- a/media-tv/xbmc/xbmc-9.11-r3.ebuild
+++ b/media-tv/xbmc/xbmc-9.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r3.ebuild,v 1.3 2010/04/07 20:39:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r3.ebuild,v 1.4 2010/05/10 12:35:50 ssuominen Exp $
 
 EAPI="2"
 
@@ -107,6 +107,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch # 319113
 	epatch "${FILESDIR}"/${P}-wavpack.patch
 	epatch "${FILESDIR}"/${P}-jpeg-speedup.patch #300909
 	epatch "${FILESDIR}"/${P}-use-cdio-system-headers-on-non-win32.patch #303030, upstream: #8026