diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 18:37:23 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-10 18:37:23 +0000 |
| commit | 1abb4122729f4c5b92b1b549d7f858c353eb93a9 (patch) | |
| tree | a885b67e3a2800d77a5cdd11facf2fff8cd3cf32 /games-strategy/ufo-ai | |
| parent | Set PYTHON_DEPEND. (diff) | |
| download | gentoo-2-1abb4122729f4c5b92b1b549d7f858c353eb93a9.tar.gz gentoo-2-1abb4122729f4c5b92b1b549d7f858c353eb93a9.tar.bz2 gentoo-2-1abb4122729f4c5b92b1b549d7f858c353eb93a9.zip | |
Fix building with libpng14 wrt #308863 by Locke Shinseiko.
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/ufo-ai')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch | 22 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index 5db3b2392d76..c7b3cb52dc39 100644 --- a/games-strategy/ufo-ai/ChangeLog +++ b/games-strategy/ufo-ai/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/ufo-ai # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.24 2010/03/02 10:44:00 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.25 2010/03/10 18:37:22 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ufo-ai-2.2.1.ebuild, + +files/ufo-ai-2.2.1-libpng14.patch: + Fix building with libpng14 wrt #308863 by Locke Shinseiko. 02 Mar 2010; Tupone Alfredo <tupone@gentoo.org> ufo-ai-2.2.1.ebuild, +files/ufo-ai-2.2.1-noelfonshared.patch: diff --git a/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch new file mode 100644 index 000000000000..d4c4eb01199e --- /dev/null +++ b/games-strategy/ufo-ai/files/ufo-ai-2.2.1-libpng14.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/308863 + +--- src/renderer/r_image.c ++++ src/renderer/r_image.c +@@ -207,7 +207,7 @@ static int R_LoadPNG (const char *name, + return 0; + + /* Parse the PNG file */ +- if ((png_check_sig(PngFileBuffer.buffer, 8)) == 0) { ++ if ((png_sig_cmp(PngFileBuffer.buffer, 0, 8)) == 0) { + Com_Printf("LoadPNG: Not a PNG file: %s\n", name); + FS_FreeFile(PngFileBuffer.buffer); + return 0; +@@ -254,7 +254,7 @@ static int R_LoadPNG (const char *name, + png_set_palette_to_rgb(png_ptr); + /* convert 1-2-4 bits grayscale images to 8 bits grayscale */ + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png_ptr); + diff --git a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild b/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild index a153d4b99799..992c9ff4ea2f 100644 --- a/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild +++ b/games-strategy/ufo-ai/ufo-ai-2.2.1.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-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.7 2010/03/02 10:44:00 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.8 2010/03/10 18:37:22 ssuominen Exp $ EAPI=2 inherit eutils games @@ -46,7 +46,8 @@ src_prepare() { # Set basedir & fixes bug in finding text files - it should use fs_basedir epatch "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-noelfonshared.patch + "${FILESDIR}"/${P}-noelfonshared.patch \ + "${FILESDIR}"/${P}-libpng14.patch sed -i \ -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ |