diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 20:19:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 20:19:13 +0000 |
| commit | ebed526dd0bf95c6b4624ab12bded14f80498625 (patch) | |
| tree | bd8deb6fe09e449dc1b01fb0382fdd07f818be35 /games-strategy/scorched3d | |
| parent | UTF8 not permitted in USE flag descriptions. (diff) | |
| download | gentoo-2-ebed526dd0bf95c6b4624ab12bded14f80498625.tar.gz gentoo-2-ebed526dd0bf95c6b4624ab12bded14f80498625.tar.bz2 gentoo-2-ebed526dd0bf95c6b4624ab12bded14f80498625.zip | |
Fix building with libpng14 wrt #308867 by Locke Shinseiko.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/scorched3d')
| -rw-r--r-- | games-strategy/scorched3d/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch | 40 | ||||
| -rw-r--r-- | games-strategy/scorched3d/scorched3d-42.1.ebuild | 6 |
3 files changed, 49 insertions, 5 deletions
diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index ed5d45c6e99a..d11e0d9e4213 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/scorched3d -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.66 2009/12/22 04:22:38 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.67 2010/03/10 20:19:11 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + scorched3d-42.1.ebuild, +files/scorched3d-42.1-libpng14.patch: + Fix building with libpng14 wrt #308867 by Locke Shinseiko. 22 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> +files/scorched3d-42.1-win32.patch: diff --git a/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch b/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch new file mode 100644 index 000000000000..d61a2b6ac485 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-42.1-libpng14.patch @@ -0,0 +1,40 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308867 + +--- src/common/image/ImagePng.cpp ++++ src/common/image/ImagePng.cpp +@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ /* If we get here, we had a problem reading the file */
+ return false;
+ }
+@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + }
+ else
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ Logger::log(S3D::formatStringBuffer(
+ "Invalid PNG format.\n"
+@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + // END NEW CODE
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* that's it */
+ return true;
diff --git a/games-strategy/scorched3d/scorched3d-42.1.ebuild b/games-strategy/scorched3d/scorched3d-42.1.ebuild index e161bd390845..3319d0ef634d 100644 --- a/games-strategy/scorched3d/scorched3d-42.1.ebuild +++ b/games-strategy/scorched3d/scorched3d-42.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.5 2009/11/12 17:40:53 volkmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.6 2010/03/10 20:19:11 ssuominen Exp $ EAPI=2 WX_GTK_VER=2.8 @@ -18,7 +18,7 @@ IUSE="dedicated mysql" DEPEND="media-libs/libsdl media-libs/sdl-net media-libs/libpng - media-libs/jpeg + media-libs/jpeg:0 dev-libs/expat !dedicated? ( virtual/opengl |