diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2006-10-26 21:37:27 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2006-10-26 21:37:27 +0000 |
| commit | f3f67efaac2cb5f1479471596608f9ad0c13e84b (patch) | |
| tree | 6188860e87dda439a896c1e60ccc27ce6d90ca03 /dev-games | |
| parent | Stable on amd64/x86 wrt bug #152887. (diff) | |
| download | gentoo-2-f3f67efaac2cb5f1479471596608f9ad0c13e84b.tar.gz gentoo-2-f3f67efaac2cb5f1479471596608f9ad0c13e84b.tar.bz2 gentoo-2-f3f67efaac2cb5f1479471596608f9ad0c13e84b.zip | |
Fix compile errors with recent SDL versions, bug #152628
(Portage version: 2.1.2_pre3-r9)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/kyra/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/kyra/files/kyra-2.0.7-sdl.patch | 23 | ||||
| -rw-r--r-- | dev-games/kyra/kyra-2.0.7.ebuild | 12 |
3 files changed, 35 insertions, 6 deletions
diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog index b5e0d16fed18..f1a1475a78ee 100644 --- a/dev-games/kyra/ChangeLog +++ b/dev-games/kyra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/kyra # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.9 2006/04/27 15:13:46 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.10 2006/10/26 21:37:27 nyhm Exp $ + + 26 Oct 2006; Tristan Heaven <nyhm@gentoo.org> +files/kyra-2.0.7-sdl.patch, + kyra-2.0.7.ebuild: + Fix compile errors with recent SDL versions, bug #152628 27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-kyra-2.0.7, Manifest: diff --git a/dev-games/kyra/files/kyra-2.0.7-sdl.patch b/dev-games/kyra/files/kyra-2.0.7-sdl.patch new file mode 100644 index 000000000000..28139e1b1fa5 --- /dev/null +++ b/dev-games/kyra/files/kyra-2.0.7-sdl.patch @@ -0,0 +1,23 @@ +--- engine/namefield.h ++++ engine/namefield.h +@@ -31,6 +31,7 @@ + #include "../util/gltypes.h" + #include "../util/gllist.h" + #include "SDL_endian.h" ++#include "SDL_rwops.h" + + + +--- util/gltypes.h ++++ util/gltypes.h +@@ -40,8 +40,8 @@ + typedef Sint32 S32; + + #ifdef SDL_HAS_64BIT_TYPE +- typedef SDL_HAS_64BIT_TYPE S64; +- typedef unsigned SDL_HAS_64BIT_TYPE U64; ++ typedef Sint64 S64; ++ typedef Uint64 U64; + #else + #error No 64-bit integer. + #endif diff --git a/dev-games/kyra/kyra-2.0.7.ebuild b/dev-games/kyra/kyra-2.0.7.ebuild index 16545b0437ec..3c992c711a51 100644 --- a/dev-games/kyra/kyra-2.0.7.ebuild +++ b/dev-games/kyra/kyra-2.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.11 2006/04/04 17:56:38 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.0.7.ebuild,v 1.12 2006/10/26 21:37:27 nyhm Exp $ inherit eutils @@ -13,16 +13,18 @@ SLOT="0" KEYWORDS="~amd64 ppc sparc x86" IUSE="doc opengl" -DEPEND=">=media-libs/libsdl-1.2 - >=media-libs/sdl-image-1.2 +DEPEND="media-libs/libsdl + media-libs/sdl-image opengl? ( virtual/opengl )" -S="${WORKDIR}/${PN}" +S=${WORKDIR}/${PN} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-gcc41.patch + epatch \ + "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}"/${P}-sdl.patch } src_compile() { |