diff options
Diffstat (limited to 'games-fps/warsow')
| -rw-r--r-- | games-fps/warsow/ChangeLog | 8 | ||||
| -rw-r--r-- | games-fps/warsow/Manifest | 14 | ||||
| -rw-r--r-- | games-fps/warsow/warsow-0.5-r1.ebuild | 8 |
3 files changed, 14 insertions, 16 deletions
diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index 7f9a538d2455..f9aee3c9c946 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/warsow -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.25 2009/11/14 17:04:23 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.26 2010/01/19 15:38:23 ssuominen Exp $ + + 19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> warsow-0.5-r1.ebuild: + Fix building (conflicting type of jpeg_mem_src) with jpeg-8 wrt #301450 by + Jimmy Jazz. *warsow-0.5-r1 (14 Nov 2009) diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest index a11fb0f876dc..2f038ea9d55a 100644 --- a/games-fps/warsow/Manifest +++ b/games-fps/warsow/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX warsow-0.4.2-build.patch 1720 RMD160 9a6181acfea494fab37eefaf31a8d19197f88591 SHA1 82555ec5d7f7217f6dc92da7e0d681414c9f00a2 SHA256 4212b21cc58adc3af57c8cfc63313df19c901f760d88a303a7b042975e2a3fa6 AUX warsow-0.5-build.patch 2995 RMD160 18edaf6577496dc6a843fa92c249a78b25d50b93 SHA1 1a0c7a720c617b0b6bea76231440e63b94895139 SHA256 cbd7ddbfa45e12644f33a910dc453ff3b7d60a5e9e1dc14b71fb818e8bbd0e8c AUX warsow-0.5-openal.patch 304 RMD160 58055a1197ce0569e7ece3bdaa671928421e0fe1 SHA1 ed06409b5b6bf48ab63f23ce2ac031f7e7123d70 SHA256 6eb943201d4c5d6b8a902cda4efc75ea6ce6c8849d5ea10b39e12650c810d4df @@ -11,13 +8,6 @@ DIST warsow_0.42_unified.zip 193348129 RMD160 76f0ad8477320bd375411e7d6e4f4f86fe DIST warsow_0.5_sdk.zip 34213675 RMD160 eb92f0e9e83f3ff1a8bdd44c7648bb4bebb26756 SHA1 faa58805b0aedfb5b44e35cd21384088314d2be3 SHA256 35cc937b4b38659df803d84f6b3fd6e9d5a5480ecadb4b642d991b99e3401f05 DIST warsow_0.5_unified.zip 256768515 RMD160 eb93e0c2b08465b98fcd27ac309a1575476ad875 SHA1 71b9b9b43578ad2ccc9b73fe5435dd018faf7772 SHA256 66ac784277def8d90a8368d44e7ca72cd1d3a50b63cee4ad7c3e102cf16f5100 EBUILD warsow-0.4.2.ebuild 3173 RMD160 a41704cff49d0973ad07e3ff022a7743310c538c SHA1 7fc3c127e89125acdb5e17438f44e439da9e0ec4 SHA256 717db550357c4e2b66269eb3da22b2f9ed4ead29969c083675395d03b74a8078 -EBUILD warsow-0.5-r1.ebuild 3231 RMD160 caa72e9a85f7cc2d96977f03d1b6dc71e60db437 SHA1 c25fd6aafe12cb5fda70bcaf84929da98b47ef7f SHA256 8873f35960579c4f72b21114476278a4e130de04642791fe334dab9cec1fec0f -MISC ChangeLog 3818 RMD160 a690e9e4b4fbe637d98fde304144106b004c760f SHA1 c251c21021038e99b2d585fdab7769a7dc49d133 SHA256 c71a0bef271787bb7244dd3d63c9281ce199fa12cc95fa09ae6b34a185307946 +EBUILD warsow-0.5-r1.ebuild 3302 RMD160 b2b32c8d94e35f50759640f61447bffa14ae9dd3 SHA1 d2a010c16a85d7ce0764eceb321b26afdf272446 SHA256 a497f95e4674a068e6dbd2b38a0203dda7a556ef9919d39da18a1a9145c03926 +MISC ChangeLog 3991 RMD160 12493f24ed686cd61a2dd7ae16bc7d1b27dd2322 SHA1 388e4258ec3ac69bce9963424616172c510a8799 SHA256 b9ba05e2a8557920711b4455f89698774e1e2bf1390035cf364a01aabb888186 MISC metadata.xml 287 RMD160 78042c7cef987a054185106e0d002716402ec9e0 SHA1 ab38f2b4bec87f92ab5465438f029b6ba4e03c3a SHA256 f48eacb17b39a68ff1f05cd10b43aa703b9b9f0edc1fc67848f7918ecce3876d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.12 (GNU/Linux) - -iEYEARECAAYFAkr+4x0ACgkQdz7hIScOURHiIwCgoYsYghPMH/Ft4aBxazqmVYZ5 -Yw8AoJN8fp24TP0/ZEGPM2CMtZ8ckV82 -=fFqa ------END PGP SIGNATURE----- diff --git a/games-fps/warsow/warsow-0.5-r1.ebuild b/games-fps/warsow/warsow-0.5-r1.ebuild index 9f1c0420aace..da60ab32eb15 100644 --- a/games-fps/warsow/warsow-0.5-r1.ebuild +++ b/games-fps/warsow/warsow-0.5-r1.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-fps/warsow/warsow-0.5-r1.ebuild,v 1.1 2009/11/14 17:04:23 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5-r1.ebuild,v 1.2 2010/01/19 15:38:23 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs versionator games @@ -45,6 +45,10 @@ src_prepare() { -e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \ qcommon/files.c \ || die "sed files.c failed" + + sed -i \ + -e "s:jpeg_mem_src:_&:" \ + ref_gl/r_image.c || die cd "${WORKDIR}" rm -rf docs/old |