diff options
| author |   Scott Stoddard <deltacow@gentoo.org> | 2006-03-14 20:23:43 +0000 |
|---|---|---|
| committer | Scott Stoddard <deltacow@gentoo.org> | 2006-03-14 20:23:43 +0000 |
| commit | 3d56dcc01c6153bbdd94de21620f74b084c951b1 (patch) | |
| tree | a658c754cda5565b5c516c98fd5127a2a62f24f1 /games-rpg/egoboo | |
| parent | Version Bump from upstream. (diff) | |
| download | gentoo-2-3d56dcc01c6153bbdd94de21620f74b084c951b1.tar.gz gentoo-2-3d56dcc01c6153bbdd94de21620f74b084c951b1.tar.bz2 gentoo-2-3d56dcc01c6153bbdd94de21620f74b084c951b1.zip | |
patched for amd64 and added ~amd64
(Portage version: 2.0.54)
Diffstat (limited to 'games-rpg/egoboo')
| -rw-r--r-- | games-rpg/egoboo/ChangeLog | 7 | ||||
| -rw-r--r-- | games-rpg/egoboo/egoboo-2.22.ebuild | 16 | ||||
| -rw-r--r-- | games-rpg/egoboo/files/2.22-amd64.patch | 12 |
3 files changed, 26 insertions, 9 deletions
diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog index b0b34e573a24..4a8fdbb3ed83 100644 --- a/games-rpg/egoboo/ChangeLog +++ b/games-rpg/egoboo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-rpg/egoboo # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.11 2006/03/14 04:18:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.12 2006/03/14 20:23:43 deltacow Exp $ + + 14 Mar 2006; Scott Stoddard <deltacow@gentoo.org> +files/2.22-amd64.patch, + egoboo-2.22.ebuild: + Added patch to determine correct endianness for amd64 submitted by Bruno + Roggeri <bruno.roggeri@metz.supelec.fr> and marked ~amd64. 14 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild: X is implicit diff --git a/games-rpg/egoboo/egoboo-2.22.ebuild b/games-rpg/egoboo/egoboo-2.22.ebuild index 30f8ccff1af6..d7263e717112 100644 --- a/games-rpg/egoboo/egoboo-2.22.ebuild +++ b/games-rpg/egoboo/egoboo-2.22.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/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.14 2006/03/14 04:18:53 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.15 2006/03/14 20:23:43 deltacow Exp $ inherit eutils flag-o-matic toolchain-funcs games @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ppc x86" +KEYWORDS="-* ~amd64 ppc x86" IUSE="" DEPEND="virtual/opengl @@ -20,27 +20,27 @@ DEPEND="virtual/opengl S=${WORKDIR}/${PN} src_unpack() { - replace-cpu-flags 'athlon*' pentium4 i686 + use !amd64 && replace-cpu-flags 'athlon*' pentium4 i686 unpack ${A} cd "${S}" - sed -i \ - -e "/^CC=/ s:=.*:=$(tc-getCC):" \ - -e "s:-ffast-math -funroll-loops -O3 -g:${CFLAGS}:" code/Makefile \ - || die "sed code/Makefile failed" sed \ -e "s:GENTOODIR:${GAMES_DATADIR}:" "${FILESDIR}/${P}.sh" \ > "${T}/egoboo" || die "sed wrapper failed" # Fix endianess using SDL epatch ${FILESDIR}/${PV}-endian.patch + + # amd64 patch must be applied after ${PV}-endian.patch + # this addresses bug #104271 + epatch ${FILESDIR}/${PV}-amd64.patch } src_compile() { cd code make clean || die "make clean failed" - emake egoboo || die "emake failed" + emake FLAGS="-D_LINUX ${CFLAGS}" CC="$(tc-getCC)" egoboo || die "emake failed" } src_install () { diff --git a/games-rpg/egoboo/files/2.22-amd64.patch b/games-rpg/egoboo/files/2.22-amd64.patch new file mode 100644 index 000000000000..5e3ea57a0c1a --- /dev/null +++ b/games-rpg/egoboo/files/2.22-amd64.patch @@ -0,0 +1,12 @@ +diff -ur egoboo/code/egobootypedef.h egoboo.new/code/egobootypedef.h
+--- egoboo/code/egobootypedef.h 2005-08-31 18:16:26.000000000 +0200
++++ egoboo/code/egobootypedef.h 2005-08-31 18:08:12.000000000 +0200
+@@ -99,7 +99,7 @@
+ /*Return the result*/
+ return data.f;
+ }
+-#elif __i386__
++#elif defined( __i386__ ) || defined( __x86_64__ )
+ #define _LITTLE_ENDIAN
+ #else
+ #define _BIG_ENDIAN
|