diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 06:06:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 06:06:33 +0000 |
| commit | f3167623bf8564cb36abab316e52c00d63bd9127 (patch) | |
| tree | bda74efc6827faf25d64a0b65e9f811664d970cb /dev-games/crystalspace | |
| parent | add use deps for libsdl (diff) | |
| download | historical-f3167623bf8564cb36abab316e52c00d63bd9127.tar.gz historical-f3167623bf8564cb36abab316e52c00d63bd9127.tar.bz2 historical-f3167623bf8564cb36abab316e52c00d63bd9127.zip | |
Fix building with libpng14.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'dev-games/crystalspace')
| -rw-r--r-- | dev-games/crystalspace/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/crystalspace/Manifest | 5 | ||||
| -rw-r--r-- | dev-games/crystalspace/crystalspace-1.2.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch | 14 |
4 files changed, 26 insertions, 5 deletions
diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog index 5aba7c2802e5..d413c80a8238 100644 --- a/dev-games/crystalspace/ChangeLog +++ b/dev-games/crystalspace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/crystalspace # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.39 2010/02/22 12:40:28 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.40 2010/03/09 06:06:32 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + crystalspace-1.2.1.ebuild, +files/crystalspace-1.2.1-libpng14.patch: + Fix building with libpng14. 22 Feb 2010; Tupone Alfredo <tupone@gentoo.org> crystalspace-1.0.1.ebuild, crystalspace-1.2.1.ebuild: diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest index 36170f3d6a91..04b54b527484 100644 --- a/dev-games/crystalspace/Manifest +++ b/dev-games/crystalspace/Manifest @@ -1,6 +1,7 @@ +AUX crystalspace-1.2.1-libpng14.patch 536 RMD160 08312ba84933366d5b56926329dfb1af1c0e65ec SHA1 59a00a12a4ef642f3c02b3fae41166b0c9a2963c SHA256 e8dc73cab522a0e9200d41be28174f846c809e1363836f478ed8159c426a6399 DIST crystalspace-src-1.0.1.tar.bz2 36581454 RMD160 e9cca632623fbc487bb39a8c088fa93aa78e23d4 SHA1 457958e4cc7d96272157e1c8be7a816620051714 SHA256 3042b1fdc5b4ac23c7a4799df232a8e2134fd215448e0785180759ebba7f9ab2 DIST crystalspace-src-1.2.1.tar.bz2 47313388 RMD160 0f6582a9c68694189811a574bc63b5ce1a6a1166 SHA1 0f1b5604b217dfd9f65f54caeef5362d0ab92203 SHA256 23312a5a0330b281f517555207fed151e3d08c1096bb0cc9dd72dcabdced1b10 EBUILD crystalspace-1.0.1.ebuild 3464 RMD160 ad115a160b24cdfe1bfaabd106b31287dc88bd30 SHA1 71bb8bf38632c8e527881f1384f5240e59216716 SHA256 ca308d59837cf400184204b464b76f917bee8abbf6ab319fb48ada9eb6c5ce09 -EBUILD crystalspace-1.2.1.ebuild 3350 RMD160 440872d3f6961943a88248863deef86a98237bf5 SHA1 ea4a1b66c6af0f4346817f803448804c4e315ccc SHA256 f2cf95cc2d4a7b1d6d11ec83753457b4898feb0501c6dfa544f3d2ecc1afe196 -MISC ChangeLog 6173 RMD160 7c10607f067a3aa49bbd9c72017f89f970493387 SHA1 9c85240412345cb36e8fe3dc414735383325cd6e SHA256 51eb74f0980d14e0061fcb4d1d2cbc492e104bf5df30e9b69c10f58248b2a5d2 +EBUILD crystalspace-1.2.1.ebuild 3403 RMD160 63e9d1b2c61f6c4ac94d671c3ed1cca3b1a30f3f SHA1 b7cddf942433521787478e6b6c1feea09113d5db SHA256 daa366f660aab30094f848a5b1661e8404aeaafffc3d69cb65286da7fdf4229e +MISC ChangeLog 6332 RMD160 506b4c54dd43fc3abf89ea290cb48098a5751c94 SHA1 f30c959d2f9dc257183f8468776ca2c613ea68de SHA256 da22173ad4330fb8c797284a4d0b6ba2e090a2ef6b3497dad73c1e66e0cf34f0 MISC metadata.xml 1243 RMD160 1f23863f3940b9349b19a701d80f0888cc7b2242 SHA1 71931e463e50c1ab0af385a3c4d10d6ad5ed960a SHA256 f7125504551e256f5ceb9385b20e945f3717a1cda3dcf6f3ff5e9f88850025b0 diff --git a/dev-games/crystalspace/crystalspace-1.2.1.ebuild b/dev-games/crystalspace/crystalspace-1.2.1.ebuild index 833602b5f327..61fc607a0649 100644 --- a/dev-games/crystalspace/crystalspace-1.2.1.ebuild +++ b/dev-games/crystalspace/crystalspace-1.2.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.1.ebuild,v 1.2 2010/02/22 12:40:28 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.2.1.ebuild,v 1.3 2010/03/09 06:06:32 ssuominen Exp $ EAPI=2 -inherit flag-o-matic multilib wxwidgets +inherit eutils flag-o-matic multilib wxwidgets MY_P=${PN}-src-${PV} DESCRIPTION="Portable 3D Game Development Kit written in C++" @@ -51,6 +51,8 @@ src_prepare() { Jamfile.in \ docs/Jamfile \ || die "sed failed" + + epatch "${FILESDIR}"/${P}-libpng14.patch } src_configure() { diff --git a/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch b/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch new file mode 100644 index 000000000000..cb7998115a5b --- /dev/null +++ b/dev-games/crystalspace/files/crystalspace-1.2.1-libpng14.patch @@ -0,0 +1,14 @@ +http://permalink.gmane.org/gmane.comp.graphics.crystalspace.tracker/5630 +http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt + +--- plugins/video/loader/png/pngimage.cpp ++++ plugins/video/loader/png/pngimage.cpp +@@ -378,7 +378,7 @@ + const png_bytep iBuffer = dataSource->GetUint8(); + const size_t iSize = dataSource->GetSize(); + +- if (!png_check_sig (iBuffer, (int)iSize)) ++ if (png_sig_cmp (iBuffer, 0, (int)iSize)) + return false; + png = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + if (!png) |