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 | d36ff5a9dcfa080bc15ac5acbaa5e35c2c938b2d (patch) | |
| tree | fb52520b3a38420cf578ad8adeb2c118650eeaaf /games-strategy | |
| parent | Do not pass CFLAGS to make link rules. Thanks to Dmitry V. Levin <ldv at altl... (diff) | |
| download | historical-d36ff5a9dcfa080bc15ac5acbaa5e35c2c938b2d.tar.gz historical-d36ff5a9dcfa080bc15ac5acbaa5e35c2c938b2d.tar.bz2 historical-d36ff5a9dcfa080bc15ac5acbaa5e35c2c938b2d.zip | |
Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by Jimmy Jazz.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/ufo-ai/ChangeLog | 8 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/Manifest | 4 | ||||
| -rw-r--r-- | games-strategy/ufo-ai/ufo-ai-2.2.1.ebuild | 8 |
3 files changed, 14 insertions, 6 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/Manifest b/games-strategy/ufo-ai/Manifest index 8051995b08a9..8a0ffbbd94c8 100644 --- a/games-strategy/ufo-ai/Manifest +++ b/games-strategy/ufo-ai/Manifest @@ -1,6 +1,6 @@ AUX ufo-ai-2.2.1-gentoo.patch 2273 RMD160 2cb17341e638a955cf6fcde610a9bbf67c3ee797 SHA1 74814edd9747de7077eaabf6c4ef2e16960126b7 SHA256 62711814268a142bb0ba304b0645735f077a5cc984c36b0f1e781a4c03759ff2 DIST ufoai-2.2.1-data.tar 390502400 RMD160 af91dd473f59c73e705181759059bd37ba215f62 SHA1 eb071333478bd6860179e12d8655301980f87d60 SHA256 639c37867733feb5c8cf0852cee6a183c4bc6cd8e31f4c39356b275790a6bd0a DIST ufoai-2.2.1-source.tar.bz2 7640531 RMD160 980405a5d38bcbb5ae2cea4e25c54374c7dd8e99 SHA1 6ad1b8c357fdbbe9a31839b3bf8de46ad17a40eb SHA256 0c0ff8fc72038963e44ae0420eacedbd7dfe4f9115527ec3554d8c707d0d5ee5 -EBUILD ufo-ai-2.2.1.ebuild 2515 RMD160 c6f5d66e1443e6103b71b269ecc1663facf52081 SHA1 151bfec9a7b5b8aa7289672720449211b87566d5 SHA256 523ceea99835705e9533aedea570e3b1afc8d54a9f50caa4686661046b132553 -MISC ChangeLog 2916 RMD160 21d496451645743726bf5b008330f8270cd1ec4a SHA1 d79fdd78db291c629705ab9f3ff463fce7b68f18 SHA256 7575c396897d39f03221224936fc7b98d741f3042ba5134988c72e9206833a46 +EBUILD ufo-ai-2.2.1.ebuild 2619 RMD160 0ee910d317ecbdb42bbc4e1e523ec1447a5a2d83 SHA1 361f735b4ca516309f309564753f7853e3b260ca SHA256 d62800c7256662d6a28ecf2e468df6eefee4b0d7a434789c9f570256be6966ec +MISC ChangeLog 3083 RMD160 7dce8dabc935b805a096967715f9c56ed17f1449 SHA1 b576ff76be2f37e78609e21fe1aa5d8f45e978cf SHA256 5645da9c834acce8d136abdc888c50bccfd25a063d2ceeab02a344c79f4b9a3d MISC metadata.xml 219 RMD160 145b5b398d86f7dfb219d32e4394ed0f1ffd5873 SHA1 485e12874a226aaf92ccbbbf5b2b1c902dd68110 SHA256 266385ce0470b911b2b3ca5fe6b237ad5dfc2d480533be5453537328a08cb2eb 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() { |