diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 14:41:41 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-19 14:41:41 +0000 |
| commit | 6570c57ed7350c79b89709c75de922730d5bd504 (patch) | |
| tree | 4d8cda76f5f247d346e7bc8205fbd0dad174f9c3 /games-strategy/ufo-ai | |
| parent | Do not pass CFLAGS to make link rules. Thanks to Dmitry V. Levin <ldv at altl... (diff) | |
| download | gentoo-2-6570c57ed7350c79b89709c75de922730d5bd504.tar.gz gentoo-2-6570c57ed7350c79b89709c75de922730d5bd504.tar.bz2 gentoo-2-6570c57ed7350c79b89709c75de922730d5bd504.zip | |
Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by Jimmy Jazz.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'games-strategy/ufo-ai')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/games-strategy/ufo-ai/ChangeLog b/games-strategy/ufo-ai/ChangeLog index 9903de0bf655..413b70c8101b 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.21 2009/08/10 00:35:30 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ChangeLog,v 1.22 2010/01/19 14:41:41 ssuominen Exp $ + + 19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> ufo-ai-2.2.1.ebuild: + Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by + Jimmy Jazz. 10 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org> ufo-ai-2.2.1.ebuild: EAPI=2 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 8694d3ab853d..3cdae3b6d726 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-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/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.3 2009/09/22 19:43:02 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild,v 1.4 2010/01/19 14:41:41 ssuominen Exp $ EAPI=2 inherit eutils games @@ -54,6 +54,10 @@ src_prepare() { src/client/cl_main.c \ src/client/cl_language.c \ || die "sed failed" + + sed -i \ + -e "s:jpeg_mem_src:_&:" \ + src/{renderer/r_image,tools/ufo2map/common/imagelib}.c || die } src_configure() { |