diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 21:51:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 21:51:21 +0000 |
| commit | c2e6ed45a94e102a147b55acece29c71a031176a (patch) | |
| tree | 6d42dade294a41b97fe1a6f5bb9b717b6d3e4319 /games-fps | |
| parent | Marked ppc stable for bug #307001. (diff) | |
| download | gentoo-2-c2e6ed45a94e102a147b55acece29c71a031176a.tar.gz gentoo-2-c2e6ed45a94e102a147b55acece29c71a031176a.tar.bz2 gentoo-2-c2e6ed45a94e102a147b55acece29c71a031176a.zip | |
Fix building with libpng14 wrt #308739 by Rafał Mużyło.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/prboom/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/prboom/files/prboom-2.5.0-libpng14.patch | 20 | ||||
| -rw-r--r-- | games-fps/prboom/prboom-2.5.0.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog index 021881d79818..464414077418 100644 --- a/games-fps/prboom/ChangeLog +++ b/games-fps/prboom/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/prboom # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.29 2010/03/09 05:30:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.30 2010/03/09 21:51:20 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> prboom-2.5.0.ebuild, + +files/prboom-2.5.0-libpng14.patch: + Fix building with libpng14 wrt #308739 by Rafał Mużyło. 09 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> prboom-2.5.0.ebuild: add use deps for libsdl diff --git a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch new file mode 100644 index 000000000000..151c9e58ff85 --- /dev/null +++ b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch @@ -0,0 +1,20 @@ +--- src/SDL/i_sshot.c ++++ src/SDL/i_sshot.c +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0.ebuild index 47a4bb34563d..e90482178692 100644 --- a/games-fps/prboom/prboom-2.5.0.ebuild +++ b/games-fps/prboom/prboom-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.5.0.ebuild,v 1.2 2010/03/09 05:30:41 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.5.0.ebuild,v 1.3 2010/03/09 21:51:20 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs games @@ -28,6 +28,7 @@ src_prepare() { local ret=$? eend ${ret} "NVidia GL/prboom bug found ;(" [ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${P}-nvidia.patch + epatch "${FILESDIR}"/${P}-libpng14.patch sed -i \ -e '/^gamesdir/ s/\/games/\/bin/' \ src/Makefile.in \ |