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

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

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index bd364d9c8d6af24128308a614eb9d0b2b05b123a..1acf5e8193ed4c0be8ca0e886fc4b9527423bfab 100644 (file)
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/coot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.41 2011/07/16 13:14:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/ChangeLog,v 1.42 2011/09/14 17:49:30 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +files/0.6.2-libpng15.patch, coot-0.6.2.ebuild:
+  Fix building with libpng15 wrt #378349 by Diego Elio Pettenò
 
   16 Jul 2011; Justin Lecher <jlec@gentoo.org> +files/0.6.2-ssm.patch,
   coot-0.6.2.ebuild:

diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index c5b9dc62d7cf8d713ac0148d5783c3dae777ab0f..6c3f2a8d5568b2170e194bfe055f8c6b4800eef1 100644 (file)
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0.6.1-libpng14.patch 950 RMD160 c2d1c298ada419272d79d49972b13e414a234cd3 SHA1 bfd4828ab8e05863ce197c59865901ce3186fb66 SHA256 7b121a0bccd49da0c459003512a2c61368eeab41b33a6726525ace501eb03559
 AUX 0.6.2-clipper-config.patch 431 RMD160 7a00939760bc4c062bbde1a65f53b9556b93c3bc SHA1 0d72c4c898fd29802c74d237b54f715444922956 SHA256 9ae9129e733d845ad2e4dd505bc5e0987147fc3a5e5dd2457b5857643809db2f
 AUX 0.6.2-gl.patch 383 RMD160 6460e87e4da57ff845f96f072dec1354ed117bee SHA1 00bc0bbfc7d4fb00ebc8477941469bef2ed6b670 SHA256 9d47a6cf2d0c7644b945f88acdc7af146df4f9a5a8f883a0e72e1bc8ccf8b380
+AUX 0.6.2-libpng15.patch 1396 RMD160 a7295bf9b312df0f19f82aec3f9458b4d7881606 SHA1 dfa904f324398cc4c7169ec223fb1cec9e72f482 SHA256 e1a1a172f92702aab5921943201baeba36643f9c5bbf1aa40151c4d4dd9dfee6
 AUX 0.6.2-mmdb-config.patch 432 RMD160 8418198b08d15af9ee5d80b15ea46bb9efd2b973 SHA1 3e6f5c888b476d8d37da4effa67a8053784a7a3c SHA256 41484424f2f7f61b0555c893a51884d02f7bd471e70c4c0903c8740dcc273f77
 AUX 0.6.2-ssm.patch 1276 RMD160 8c7eef0034efc2c57bd774fe8ebb1bd0ba9c7aa2 SHA1 8812f35fba16a45b21ecce5243fd26d6105e29e3 SHA256 42f1098b0d56f85125293ca24410061e7a9bee10c94ba6e9fd3496439368bf75
 AUX 0.6.2-test.patch 457 RMD160 1a3e0956d8b7f051fdd964524c0ba9eabf8c2aca SHA1 a8f9584be09cc58e7cb55801115e9649b05aa910 SHA256 494ef09e407c3047145c250c70b90c7679a1c5b9f84c57a680e40580bd980397
@@ -12,13 +13,13 @@ DIST coot-0.6.2.tar.gz 13597123 RMD160 707eb3df47681a011f42874210b940329a748bc7
 DIST greg-data-0.6.1.tar.gz 7930213 RMD160 e9a17d1ef2d3f15b3792ea5c7204901e0105b76b SHA1 f4158fa440406b88d0bb72880cdee9a3653c4233 SHA256 658a557b85ee6b90fc446cb3c605556586a2a5a0575ddd11b42265e019eb74a0
 DIST greg-data-0.6.2.tar.gz 8044588 RMD160 065acee98384540d0c2ffaf2511dfd1aa400b11c SHA1 92cec24dab594d8024f41047af2bf6760e9e7d00 SHA256 c9fedf6e1fa60fda178753bbfb539671c274f64d4daca2b63ab49c59bd4c5856
 EBUILD coot-0.6.1.ebuild 3934 RMD160 6376495fce52056acbaaf0df862fbb502b8a7600 SHA1 0ecc3bfa5760bb663d62c67c98c6146f3f77e707 SHA256 7ac1bd7397140da0386b360ef613067a2932d381d0a85e9ad97218fac20f944d
-EBUILD coot-0.6.2.ebuild 4007 RMD160 9a2bf9ec0350b5fe3dd3213509a6d009194c3af9 SHA1 46a091ef6974ab8e4a4d831b43834924476ae7eb SHA256 898ca3da1d4c6d118ad666c910f13c03c2bd33527faa082d16fe187379898f1a
-MISC ChangeLog 6361 RMD160 8d577dadb6986167bae1e15406864469fa3300c1 SHA1 74e2ea8cfa43e7e3ebe9e730c3a12043069778ed SHA256 0c6daefdf925b493b928feac4b28d22d2025446eb95eefbb0093b22bce5551b0
+EBUILD coot-0.6.2.ebuild 4048 RMD160 8817857eb10692a10a5c714060f058da1e670a8e SHA1 747e7ef5f12c44152298506ba90c9e7043e1a21c SHA256 715db2860f77033836798e83d245d432c5ab661f60bac24754aca0f36b8379f1
+MISC ChangeLog 6535 RMD160 54dcbb18cf3a7f11a43ba0964f0efe5b866470ee SHA1 b2a70ed20499e1943aff7de8be97c5b537e92888 SHA256 73a356c18b66ac2205de5cd22bf3c03dc36873c51f76b3035236eb12c049dd6a
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk4hjsEACgkQgAnW8HDreRau3gCgo4Yw9pywVc2lUzM1U3uSBnAc
-lfcAoLIVrYTRstA1Z9VMPzutXdl7QoNN
-=7OtJ
+iF4EAREIAAYFAk5w6WEACgkQXkR9YqOcLPGb2wD/TnkKvAAepBkOnC1D68690tqg
+Sfb5+BZgh7cEzQ/tfPcBAIaCuBuO6x0AAqzldGI3xfF0pvK3foQNDTamWdWhpeIW
+=K7+o
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/coot/coot-0.6.2.ebuild b/sci-chemistry/coot/coot-0.6.2.ebuild
index 30ae440df9797c046914186f14be44832079439d..4fe66230d07f16668a4015deb6b6a7b3f469fa58 100644 (file)
--- a/sci-chemistry/coot/coot-0.6.2.ebuild
+++ b/sci-chemistry/coot/coot-0.6.2.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/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.4 2011/07/16 13:14:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/coot/coot-0.6.2.ebuild,v 1.5 2011/09/14 17:49:30 ssuominen Exp $
 
 EAPI=3
 
@@ -80,6 +80,7 @@ PATCHES=(
        "${FILESDIR}"/${PV}-gl.patch
        "${FILESDIR}"/${PV}-test.patch
        "${FILESDIR}"/${PV}-ssm.patch
+       "${FILESDIR}"/${PV}-libpng15.patch
        )
 
 src_prepare() {

diff --git a/sci-chemistry/coot/files/0.6.2-libpng15.patch b/sci-chemistry/coot/files/0.6.2-libpng15.patch
new file mode 100644 (file)
index 0000000..bddd251
--- /dev/null
+++ b/sci-chemistry/coot/files/0.6.2-libpng15.patch
@@ -0,0 +1,29 @@
+--- ccp4mg-utils/ppmutil.cc
++++ ccp4mg-utils/ppmutil.cc
+@@ -2494,15 +2494,21 @@
+ 
+   pixels = new unsigned char[width*height*colourspace];
+ 
++  png_colorp palette;
++  int num_trans;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
++  png_bytep trans_alpha;
++#endif
++
+   for (int i=0; i<height; i++){
+     if(color_type==PNG_COLOR_TYPE_PALETTE){
+       for (int j=0; j<width; j++){
+-        pixels[i*width*colourspace+j*colourspace] = png_ptr->palette[row_pointers[i][j]].red;
+-        pixels[i*width*colourspace+j*colourspace+1] = png_ptr->palette[row_pointers[i][j]].green;
+-        pixels[i*width*colourspace+j*colourspace+2] = png_ptr->palette[row_pointers[i][j]].blue;
+-        if(row_pointers[i][j]<png_ptr->num_trans){
++        pixels[i*width*colourspace+j*colourspace] = palette[row_pointers[i][j]].red;
++        pixels[i*width*colourspace+j*colourspace+1] = palette[row_pointers[i][j]].green;
++        pixels[i*width*colourspace+j*colourspace+2] = palette[row_pointers[i][j]].blue;
++        if(row_pointers[i][j]<num_trans){
+ #if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
+-         pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans_alpha[row_pointers[i][j]];
++         pixels[i*width*colourspace+j*colourspace+3] = trans_alpha[row_pointers[i][j]];
+ #else
+          pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans[row_pointers[i][j]];
+ #endif