From f798bfacaae7ac9af79a532cefe2c311a09c644f Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Fri, 9 Sep 2011 09:25:36 +0000 Subject: [PATCH] Build with libpng-1.5 Bug #381723 Package-Manager: portage-2.1.10.14/cvs/Linux i686 --- dev-games/crystalspace/ChangeLog | 6 +- dev-games/crystalspace/Manifest | 15 ++--- .../crystalspace/crystalspace-1.4.0.ebuild | 5 +- .../files/crystalspace-1.4.0-png15.patch | 56 +++++++++++++++++++ 4 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog index ca207ecd7573..bc219d81309c 100644 --- a/dev-games/crystalspace/ChangeLog +++ b/dev-games/crystalspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/crystalspace # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.52 2011/07/20 13:26:19 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.53 2011/09/09 09:25:36 tupone Exp $ + + 09 Sep 2011; Tupone Alfredo crystalspace-1.4.0.ebuild, + +files/crystalspace-1.4.0-png15.patch: + Build with libpng-1.5 Bug #381723 by Diego Elio Pettenò 20 Jul 2011; Thomas Kahle crystalspace-1.2.1.ebuild: Dropping to ~x86 wrt to bug 335921 diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest index d5efdcb4c46c..c798f6d301b2 100644 --- a/dev-games/crystalspace/Manifest +++ b/dev-games/crystalspace/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX crystalspace-1.2.1-libpng14.patch 450 RMD160 f9fe8361b5b3f01d03f6b0b15dae2775d1e3a775 SHA1 4e6f0ef4bf93df569ad29bb1b2d83da5f83ec0cc SHA256 7b2178396d6b729955d85e2e7563862cec1af36c8b1ba1e4383b8978d79c5f2e AUX crystalspace-1.4.0-bullet.patch 501 RMD160 8a5c37029c5c1470d1c73b5e0b38df0936e2a85a SHA1 d65deefa25dc49a6e4b7f3d641b9f8ab36565368 SHA256 0dc5ecb64d9a9a07a3da9e89c51080952beb1a4daed40e6b3eccc64ab9e4677f +AUX crystalspace-1.4.0-png15.patch 1695 RMD160 27b4f322ed4ff9f59ab1219ac93f331bf067cf6f SHA1 a9771d2d11959fbb51e4878cdd81328b2e55f4cf SHA256 f755eb090ce0a3df558c9c126d3f30c834807a392c824b8e2eda696fd54a1017 DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10 DIST crystalspace-src-1.4.0.tar.bz2 45670477 RMD160 af89e74a96bac7f55079a6cdad7fd938a38af602 SHA1 10f4dd50c654ad9292602a91189a0ee78a8fe353 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba EBUILD crystalspace-1.2.1.ebuild 3382 RMD160 f485c8f16331efa40c948def224eb27d5a182d99 SHA1 c820692bc4af5efeaa2915e8ba013b89b830b045 SHA256 0f753ae7d111e7cd949d2709bf4068407384bfa2d97c6665264a608c0a40eb75 -EBUILD crystalspace-1.4.0.ebuild 3576 RMD160 222edbdd424b18c9f236607ad6ab72556f739e1f SHA1 3490a0bbcf6cc8aecaa9a02b7adb243953c85edc SHA256 136dd2b6f838ecd999120ee0130150042970852058353c1e4125b5848405a33e -MISC ChangeLog 8067 RMD160 8d923f2fbeb719445b2065a50abcbe2ebb89f4e5 SHA1 f297f5e69a7d200928a0a1ba20f0b190826ab6b7 SHA256 372fbafecc55cd03aabd773c0645e65a6457a92fb72af6c254e48750f7026d97 +EBUILD crystalspace-1.4.0.ebuild 3610 RMD160 15ac83d2cea41fbddd98dc54bca8f30ed5c691b7 SHA1 9f9797d8cbf27404795fb61eb0acf9aebc7d09f9 SHA256 c77cac1476e968d9df97e17abf9d9875aeea3002a499296fa14558197732da4c +MISC ChangeLog 8246 RMD160 5714052b65ae94ad429cd9b7a72368135f1bf5a1 SHA1 80600616e1590036caffa1ac9784a12480e88e5c SHA256 7a8e37bdae1ba0a435412b6c2dbd910b34f0e4d8e1df0d5a302996fddce3319d MISC metadata.xml 1309 RMD160 4ec4d408ea75402333583b2b19d91dcd95b2be9c SHA1 4ed88885584d54c8dd3ddaad2ae7aefb972b180b SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk4m14IACgkQodBTJSDyo678tgD9HYbUAQK4unVR7U2iTbyEgWE/ -Rk3ReRCI8L04NVm9rHMA/0WLxHpZIRjq13QIhCeDx5BOQ8UQauV4E2RUJUWRbq9Y -=jOMB +iEYEARECAAYFAk5p20IACgkQIY77eQFFFC2TZACff2yIlB0xKIFF4V4VeAK3oNgt +kVEAoISuMgXrzokmgBPP6jNIwRsOQaPx +=WOGC -----END PGP SIGNATURE----- diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild index fa89d37f4e5b..b874d0226e5f 100644 --- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild +++ b/dev-games/crystalspace/crystalspace-1.4.0.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/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.8 2011/02/25 18:34:11 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.9 2011/09/09 09:25:36 tupone Exp $ EAPI=2 inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator @@ -59,7 +59,8 @@ src_prepare() { Jamfile.in \ docs/Jamfile \ || die "sed failed" - epatch "${FILESDIR}"/${P}-bullet.patch + epatch "${FILESDIR}"/${P}-bullet.patch \ + "${FILESDIR}"/${P}-png15.patch AT_M4DIR=mk/autoconf eautoreconf } diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch new file mode 100644 index 000000000000..314521eaf235 --- /dev/null +++ b/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch @@ -0,0 +1,56 @@ +--- plugins/video/loader/png/pngimage.cpp.old 2011-09-09 10:39:57.218570796 +0200 ++++ plugins/video/loader/png/pngimage.cpp 2011-09-09 10:46:45.733522309 +0200 +@@ -60,7 +60,7 @@ + + static void png_write (png_structp png, png_bytep data, png_size_t length) + { +- datastore *ds = (datastore *)png->io_ptr; ++ datastore *ds = (datastore *)png_get_io_ptr(png); + if (ds->pos + (long)length > ds->length) + { + ds->data = (unsigned char*)cs_realloc (ds->data, ds->pos + (long)length); +@@ -173,7 +173,7 @@ + } + + /* Catch processing errors */ +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + /* If we get here, we had a problem reading the file */ + png_destroy_write_struct (&png, &info); +@@ -355,7 +355,7 @@ + void ImagePngFile::PngLoader::ImagePngRead (png_structp png, png_bytep data, + png_size_t size) + { +- ImagePngRawData *self = (ImagePngRawData *) png->io_ptr; ++ ImagePngRawData *self = (ImagePngRawData *) png_get_io_ptr(png); + + if (self->r_size < size) + png_error (png, "Read Error"); +@@ -394,7 +394,7 @@ + return false; + } + +- if (setjmp (png->jmpbuf)) ++ if (setjmp (png_jmpbuf(png))) + { + nomem2: + // If we get here, we had a problem reading the file +@@ -524,7 +524,7 @@ + { + size_t rowbytes, exp_rowbytes; + +- if (setjmp (png->jmpbuf)) ++ if (setjmp (png_jmpbuf(png))) + { + nomem2: + // If we get here, we had a problem reading the file +@@ -560,7 +560,7 @@ + + png_bytep * const row_pointers = new png_bytep[Height]; + +- if (setjmp (png->jmpbuf)) // Set a new exception handler ++ if (setjmp (png_jmpbuf(png))) // Set a new exception handler + { + delete [] row_pointers; + goto nomem2; -- 2.26.2