diff options
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/scummvm/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/scummvm/scummvm-0.10.0.ebuild | 26 |
2 files changed, 20 insertions, 12 deletions
diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog index f836ca5792c7..4ea8de3fc7ad 100644 --- a/games-engines/scummvm/ChangeLog +++ b/games-engines/scummvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/scummvm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.49 2007/07/06 17:47:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.50 2007/07/30 04:52:36 mr_bones_ Exp $ + + 30 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org> + scummvm-0.10.0.ebuild: + make the nasm call more yasm friendly 06 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> scummvm-0.10.0.ebuild: Add a pkg_setup check for midi USE flag in alsa-lib. diff --git a/games-engines/scummvm/scummvm-0.10.0.ebuild b/games-engines/scummvm/scummvm-0.10.0.ebuild index 079fbb155298..83151d211e90 100644 --- a/games-engines/scummvm/scummvm-0.10.0.ebuild +++ b/games-engines/scummvm/scummvm-0.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.10.0.ebuild,v 1.3 2007/07/06 17:47:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.10.0.ebuild,v 1.4 2007/07/30 04:52:36 mr_bones_ Exp $ inherit eutils games @@ -38,19 +38,23 @@ pkg_setup() { } src_unpack() { + local f + unpack ${A} cd "${S}" - if use x86 ; then - local f - for f in graphics/scaler/{hq3x_i386.asm,hq2x_i386.asm} - do - cat >> $f <<EOF - %ifidn __OUTPUT_FORMAT__,elf - section .note.GNU-stack noalloc noexec nowrite progbits - %endif + # -g isn't needed for nasm here + sed -i \ + -e '/NASMFLAGS/ s/-g//' \ + ./Makefile.common \ + || die "sed failed" + for f in graphics/scaler/{hq3x_i386.asm,hq2x_i386.asm} + do + cat >> $f <<EOF + %ifidn __OUTPUT_FORMAT__,elf + section .note.GNU-stack noalloc noexec nowrite progbits + %endif EOF - done - fi + done } src_compile() { |