Build with media-libs/libpng-1.5 Bug #380765

Package-Manager: portage-2.1.10.15/cvs/Linux i686

diff --git a/games-fps/alephone/ChangeLog b/games-fps/alephone/ChangeLog
index 27c2ada37144a35706dbe29f75b546af2dfd79d0..c383d887cd7fda67f0d10a07e9e3cc3d81678738 100644 (file)
--- a/games-fps/alephone/ChangeLog
+++ b/games-fps/alephone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/alephone
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.38 2011/01/20 23:34:46 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/ChangeLog,v 1.39 2011/09/13 08:45:26 tupone Exp $
+
+  13 Sep 2011; Tupone Alfredo <tupone@gentoo.org> alephone-20100424.ebuild,
+  +files/alephone-20100424-png15.patch:
+  Build with media-libs/libpng-1.5 Bug #380765 by Diego Elio Pettenò
 
   20 Jan 2011; Tupone Alfredo <tupone@gentoo.org> alephone-20100424.ebuild,
   +files/alephone-20100424-boost_145.patch:

diff --git a/games-fps/alephone/Manifest b/games-fps/alephone/Manifest
index 0acd928478fd9c16b1c3d36a1440ec65ce7a5fc0..1b455878b60ec1df1b954b3e465f8e4a4ad872b6 100644 (file)
--- a/games-fps/alephone/Manifest
+++ b/games-fps/alephone/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alephone-20100424-boost_145.patch 319 RMD160 48979916e285214b922d7e7d83da700e951fa560 SHA1 82a1bfbe3235512d63b1eec2ed01d19c539c9199 SHA256 9799b4bb6d23f8f0bb91d221d0739d188cd851d4946359eda5710ff4e2ed6d2e
+AUX alephone-20100424-png15.patch 697 RMD160 e21f50d8c8d1e3c769180a8fc1def9bf88eac664 SHA1 140a6b08c5b5cc5d964bbdc348867809cac6a0ee SHA256 681efd1f3e44c9fadc8345bfb1083fcbb1918cd05a71b64f56898f44dd79d034
 AUX alephone.sh 442 RMD160 f5bf19e2752d356e51fa886dbad9fedfe12f9d34 SHA1 317ab6a122227e30cd1d508e3957e27b8cafa9bd SHA256 03d4eaec18bed5fd909604ff7efbcf4ba737a2cc76ca80161bdcb4bdf527d8b9
 DIST AlephOne-20100424.tar.bz2 3180896 RMD160 cc6e0491b0aa7febd854c560c5df56c0a660c757 SHA1 3d3989703ccb1b5e8a6b6ab0028956f433e4f846 SHA256 d97089890ce99952027eaf6185baa6cb01b26c2882dfca9e68816dfe7076a5e6
-EBUILD alephone-20100424.ebuild 2401 RMD160 5f8f8872adaa24e3a16c3e8f023d3a08fac45594 SHA1 57b87571b2d63baaa74efbcd5dffedf014982761 SHA256 1f26ca96f4186c5d6c6db659064a5c18c8d3080309549bc243a5a9ba64d82867
-MISC ChangeLog 5523 RMD160 830cb576aa4f8e5f88f4d105f14d1a044e6f9cb4 SHA1 b96443971c368eacbad80453a465d5f10632a196 SHA256 632c2d9d132e490365cbfab0c65dd3c9aabf39a7de83773fbda5dd11c4f826a9
+EBUILD alephone-20100424.ebuild 2436 RMD160 80240483c6a96905277ef2f75bd2e89a7df3da44 SHA1 69abbfefb1bac22c8c2d392afb3b487b93e6b167 SHA256 60c7dbbfa8e9a08307b9dae3deaccb46def7149ef7c8fa833bc10a962846031c
+MISC ChangeLog 5710 RMD160 bf4addc41520653dd040eb02d0da02f8a5f40210 SHA1 03bddb541264954616d3a6c74d0a8ddb0122dbf7 SHA256 5f6ea59bbd7f214521b9c97a3bb74ea7317a3a4fbf23528d047c94dc7a0bcc56
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5vF9gACgkQIY77eQFFFC3OuwCg7arBvB/3nUoCM/k7k7A4DfJO
+KWQAn3j3IPYupdeu05URjC0RgcyO87gZ
+=7xWd
+-----END PGP SIGNATURE-----

diff --git a/games-fps/alephone/alephone-20100424.ebuild b/games-fps/alephone/alephone-20100424.ebuild
index 86642ffb87c346ae3f077c3706b13895db7ebb33..c6b42715273b684829ce4e924bf929cb9d284fdb 100644 (file)
--- a/games-fps/alephone/alephone-20100424.ebuild
+++ b/games-fps/alephone/alephone-20100424.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/games-fps/alephone/alephone-20100424.ebuild,v 1.4 2011/01/20 23:34:46 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alephone/alephone-20100424.ebuild,v 1.5 2011/09/13 08:45:26 tupone Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -52,7 +52,8 @@ src_prepare() {
                || die "sed failed"
        rm -rf Source_Files/Expat
 
-       epatch "${FILESDIR}"/${P}-boost_145.patch
+       epatch "${FILESDIR}"/${P}-boost_145.patch \
+               "${FILESDIR}"/${P}-png15.patch
 
        eautoreconf
 }

diff --git a/games-fps/alephone/files/alephone-20100424-png15.patch b/games-fps/alephone/files/alephone-20100424-png15.patch
new file mode 100644 (file)
index 0000000..da99a84
--- /dev/null
+++ b/games-fps/alephone/files/alephone-20100424-png15.patch
@@ -0,0 +1,19 @@
+--- Source_Files/RenderOther/IMG_savepng.c.old 2011-09-13 10:20:56.395157142 +0200
++++ Source_Files/RenderOther/IMG_savepng.c     2011-09-13 10:23:00.630142397 +0200
+@@ -29,6 +29,7 @@
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_byteorder.h>
+ #include <png.h>
++#include <zlib.h>
+ #include "IMG_savepng.h"
+ 
+ int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression, struct IMG_PNG_text* text, int num_text){
+@@ -85,7 +86,7 @@
+               goto savedone;
+       }
+       /* setup custom writer functions */
+-      png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL);
++      png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL);
+ 
+       if (setjmp(png_jmpbuf(png_ptr))){
+               SDL_SetError("Unknown error writing PNG");