Fix building with libpng15 wrt #378521 by Diego Elio Pettenò

Package-Manager: portage-2.1.10.16/cvs/Linux x86_64

4 files changed, 104 insertions, 8 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 618672a9d839..73d326fa5bbd 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/tucnak2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.31 2011/07/17 14:37:49 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.32 2011/09/14 18:53:42 tomjbe Exp $
+
+  14 Sep 2011; Thomas Beierlein <tomjbe@gentoo.org>
+  +files/tucnak2-libpng15.patch, tucnak2-2.43.ebuild:
+  Fix building with libpng15 wrt #378521 by Diego Elio Pettenò
 
 *tucnak2-2.43 (17 Jul 2011)
 
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index 97686698e78b..e7e64302bdb6 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -7,6 +7,7 @@ AUX tucnak2-2.34-hamlib.diff 469 RMD160 04613134294aa03fea9cbd5ef474f4b85ea70794
 AUX tucnak2-2.37-hamlib.diff 445 RMD160 4a239174a6acc419388f90d034718126b886d0b0 SHA1 140f6061c47d49ddc4371c56c927eee04fdfbb11 SHA256 7998477b69ce534abe57488f80e183ed5396f8c1205674546bce4da201521b4a
 AUX tucnak2-2.39-doc.diff 511 RMD160 0fbec4ee56c38ba89dc3eba8ff07dde35c4de081 SHA1 3a90e7f8567a2c030ab0ef8de5ce7ff2ae051505 SHA256 329b1ee35a1108a7739732f73c480d7ad3db024aca4a2561d4732ae291ba4c20
 AUX tucnak2-2.42-appname.diff 795 RMD160 71eab08568a0b2617715a918b71ff68d4a9f8b7d SHA1 55ec5da512e6cfc538166314fc69f8ddde2a6a06 SHA256 ce423961d9800c18c673c6f8928be4226c0904464712c9168a5e3f4bf3464635
+AUX tucnak2-libpng15.patch 2861 RMD160 8ddd31b7b5ddb4cfded4bd91e457884a8745a588 SHA1 c233c2558f75e7468747fdfce2a33597667db773 SHA256 78f13dfce6e2468d149691eca70f70c2d4f8b56f8680715868d000095504dbf5
 DIST tucnak2-2.34.tar.gz 2677943 RMD160 c0df1e39d2a428bde0f8fc6c5cc836fd624580b6 SHA1 2ed3e4a2301f8b2e93d0aafa38b7e53e29b27f4f SHA256 1a0ed63223b2aff6abb9763d1ccdf8c1ccc233f97e254a8bece0d877b7f1e1be
 DIST tucnak2-2.37.tar.gz 2826665 RMD160 1a173421de78e565357571900f39b360cf764ae1 SHA1 3623898c83a6e545df86a1974dd5aa39a04f5005 SHA256 2f06d0380c3b8331cc4b05edc83de99ecff96f5850c513c04064e5f2ceeba3f0
 DIST tucnak2-2.39.tar.gz 2833176 RMD160 34a23c3ec3bd98afc1e865e09b373b922cc0a76c SHA1 10f363788b4376c146c40e6b320345984ee22042 SHA256 08a18de7ab039b2c30e162616d92a99886a5d43fa3b6a23858f07da6cdcfc756
@@ -16,13 +17,13 @@ EBUILD tucnak2-2.34.ebuild 2063 RMD160 1b62d599bf646ea843a0d182727720a48a5eadeb
 EBUILD tucnak2-2.37.ebuild 2064 RMD160 8c743c28b9267a55f1134b56be08ae37731efe34 SHA1 e27632219e53e399eaea698a1dee1715e258679c SHA256 c6324c1c605c04a5c6c95dee5b32e132721c19e4dedb881db46051eb10413938
 EBUILD tucnak2-2.39.ebuild 2029 RMD160 cc349667e006c6e6eccfba69b79e2a242ecd1b95 SHA1 3973c86bb3e5499927ad7649a2a666d80a6e12c7 SHA256 d36f07f3e610b9ea451cf880b51527a5c4c30fdf7cb078504da84d1f994ab860
 EBUILD tucnak2-2.42.ebuild 2025 RMD160 be3857619a37aab0c40d2e7b44ccf5cd59ce4b7a SHA1 eb5f06447a369a91886259f1a9ce7f8723092202 SHA256 e62fad5730e47a744660619c795e22781d8cda76fd58793208664e81c6e20cfe
-EBUILD tucnak2-2.43.ebuild 2031 RMD160 d5ceb6d004fa02e25063f84b9577ad88bd09018e SHA1 a6db95d572d8941c4744e4068043b84afd1ebd26 SHA256 6253c9c3e03c313a7a7830e4a59aba00a13f52f076e0a1defb6346560cb4842f
-MISC ChangeLog 4932 RMD160 828b2981482086a2e50d1d9cf865c31890341d64 SHA1 eeeb9dc041e3f20b5bd785a70f6fdac1310fcc84 SHA256 28bb1d770c23ee768afd690ad14cf4f67f5ad88df03f8438abaca7294e4d3fa2
+EBUILD tucnak2-2.43.ebuild 2070 RMD160 ebb4912ceb85e84b79ca083f2ed082d77c20a620 SHA1 3d74ba161a09a56ae02e6efb9da601869f7273c7 SHA256 0a648205043bd0e0bbfc588ece755d7c0b94a7d01ad7d7f69461c7616a771bdd
+MISC ChangeLog 5103 RMD160 e69731e99967ba99f84418b8fcdbaa0e84f3194f SHA1 6a0d723e0efb288b1beb8168a07236139798beca SHA256 4268510c18aae4ac9f513bb71e8c77775a20931d34eebcfcda0d27b08b925a67
 MISC metadata.xml 477 RMD160 e3fa311545f698694203c0207a8bad555ad812f9 SHA1 54cb6e5873d1e9c7235b88bcd590b5a40c633cd0 SHA256 e56e7d59b3da1ddc7ea1aca9926d8d2e77790a5397c631a4b64381afc53222cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4i89IACgkQQe4uqXYgU9WrOACfZYw3aFsVQ3amJ3yYUKefEf4d
-kc8AoIjQbcbODhI7UxfOrdUbM3DpTxvj
-=q/yT
+iEYEARECAAYFAk5w+EQACgkQQe4uqXYgU9XqLgCfYUYeFYHoH4QO3AHXFvdYhroA
+21UAnjAFIuXIX71mQJHj79E3/zfCbdXa
+=jT6O
 -----END PGP SIGNATURE-----
diff --git a/media-radio/tucnak2/files/tucnak2-libpng15.patch b/media-radio/tucnak2/files/tucnak2-libpng15.patch
new file mode 100644
index 000000000000..7470765eaae6
--- /dev/null
+++ b/media-radio/tucnak2/files/tucnak2-libpng15.patch
@@ -0,0 +1,90 @@
+--- src/img_png.c.old	2011-09-14 17:20:02.000000000 +0000
++++ src/img_png.c	2011-09-14 18:17:39.000000000 +0000
+@@ -112,6 +112,8 @@
+ 	Uint32 Bmask;
+ 	Uint32 Amask;
+ 	SDL_Palette *palette;
++	png_colorp png_palette;
++	int png_num_palette;
+ 	png_bytep *volatile row_pointers;
+ 	int row, i;
+ 	volatile int ckey = -1;
+@@ -144,7 +146,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		IMG_SetError("Error reading the PNG file.");
+ 		goto done;
+ 	}
+@@ -213,9 +215,11 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) 
++				? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4)
++				? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -223,7 +227,8 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr),
++			Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		IMG_SetError("Out of memory");
+ 		goto done;
+@@ -264,6 +269,8 @@
+ 	*/
+ 
+ 	/* Load the palette, if any */
++	png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
++
+ 	palette = surface->format->palette;
+ 	if ( palette ) {
+ 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
+@@ -273,12 +280,12 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else if (png_num_palette > 0 ) {
++		palette->ncolors = png_num_palette; 
++		for( i=0; i<png_num_palette; ++i ) {
++		    palette->colors[i].b = png_palette[i].blue;
++		    palette->colors[i].g = png_palette[i].green;
++		    palette->colors[i].r = png_palette[i].red;
+ 		}
+ 	    }
+ 	}
+--- src/gfx_png.c.old	2011-09-14 17:09:33.000000000 +0000
++++ src/gfx_png.c	2011-09-14 17:14:05.000000000 +0000
+@@ -56,12 +56,9 @@
+ 	    
+     png_init_io(png_ptr, fi);
+ 
+-    info_ptr->width = surf->w;
+-    info_ptr->height = surf->h;
+-    info_ptr->bit_depth = 8;
+-    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-    info_ptr->interlace_type = 1;
+-    info_ptr->valid = 0;
++    png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8,
++    	PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_DEFAULT, 
++	PNG_FILTER_TYPE_DEFAULT);
+ 
+     /* Set headers */
+ 
diff --git a/media-radio/tucnak2/tucnak2-2.43.ebuild b/media-radio/tucnak2/tucnak2-2.43.ebuild
index e297b2db50d3..c5b87b9901e4 100644
--- a/media-radio/tucnak2/tucnak2-2.43.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.43.ebuild,v 1.1 2011/07/17 14:37:49 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.43.ebuild,v 1.2 2011/09/14 18:53:42 tomjbe Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.39-doc.diff" \
-		"${FILESDIR}/${PN}-2.42-appname.diff"
+		"${FILESDIR}/${PN}-2.42-appname.diff" \
+		"${FILESDIR}/${PN}-libpng15.patch"
 	eautoreconf
 }