diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2007-06-13 15:00:14 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2007-06-13 15:00:14 +0000 |
| commit | 9624edbb16e0ed77248d3e9dc21460e94e89d852 (patch) | |
| tree | a406dbbbfb68b6562b4a5e2ced4875b2294afc08 /games-action/nighthawk | |
| parent | Keyword for arm. (diff) | |
| download | gentoo-2-9624edbb16e0ed77248d3e9dc21460e94e89d852.tar.gz gentoo-2-9624edbb16e0ed77248d3e9dc21460e94e89d852.tar.bz2 gentoo-2-9624edbb16e0ed77248d3e9dc21460e94e89d852.zip | |
Patch for gcc-4.2
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-action/nighthawk')
| -rw-r--r-- | games-action/nighthawk/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/nighthawk/files/nighthawk-2.2-gcc42.patch | 24 | ||||
| -rw-r--r-- | games-action/nighthawk/nighthawk-2.2.ebuild | 10 |
3 files changed, 36 insertions, 6 deletions
diff --git a/games-action/nighthawk/ChangeLog b/games-action/nighthawk/ChangeLog index 0761fde0e47b..da81be5a9d25 100644 --- a/games-action/nighthawk/ChangeLog +++ b/games-action/nighthawk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/nighthawk -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/ChangeLog,v 1.11 2006/10/06 21:55:25 wolf31o2 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/ChangeLog,v 1.12 2007/06/13 15:00:14 nyhm Exp $ + + 13 Jun 2007; Tristan Heaven <nyhm@gentoo.org> + +files/nighthawk-2.2-gcc42.patch, nighthawk-2.2.ebuild: + Patch for gcc-4.2 06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> nighthawk-2.2.ebuild: Removed reference to virtual/x11. diff --git a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch new file mode 100644 index 000000000000..619acd37f71f --- /dev/null +++ b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch @@ -0,0 +1,24 @@ +--- src_sound/dsp_mixxer.c ++++ src_sound/dsp_mixxer.c +@@ -302,10 +302,8 @@ + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { + if(chmix[chan_no].funkctrl & 0x2) +-#pragma pack(1) + sam = *((sDB *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); +-#pragma pack() + else + sam = 0; + +@@ -364,10 +362,8 @@ + for(sample_no = 0;sample_no < mix_buffer_size;sample_no++) + { + if(chmix[chan_no].funkctrl & 0x2) +-#pragma pack(1) + sam = *((sDW *)chmix[chan_no].sample_addr + + (unsigned long)chmix[chan_no].sample_ptr); +-#pragma pack() + else + sam = 0; + #ifdef DIGITAL_ECHOING diff --git a/games-action/nighthawk/nighthawk-2.2.ebuild b/games-action/nighthawk/nighthawk-2.2.ebuild index 1c1962837ba8..f79c0fc69622 100644 --- a/games-action/nighthawk/nighthawk-2.2.ebuild +++ b/games-action/nighthawk/nighthawk-2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/nighthawk-2.2.ebuild,v 1.10 2006/10/06 21:55:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/nighthawk-2.2.ebuild,v 1.11 2007/06/13 15:00:14 nyhm Exp $ inherit eutils games @@ -18,10 +18,12 @@ DEPEND="x11-libs/libXpm" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/nighthawk.patch" + epatch \ + "${FILESDIR}"/nighthawk.patch \ + "${FILESDIR}"/${P}-gcc42.patch } src_install () { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" prepgamesdirs } |