diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-07-03 06:13:17 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-07-03 06:13:17 +0000 |
| commit | 7935c808bbb5547f473616f59321ffc827aeea07 (patch) | |
| tree | 38115e7daa463b9eddf24c2249bb8828a43ad9ba /games-arcade | |
| parent | Stable amd64. (Manifest recommit) (diff) | |
| download | gentoo-2-7935c808bbb5547f473616f59321ffc827aeea07.tar.gz gentoo-2-7935c808bbb5547f473616f59321ffc827aeea07.tar.bz2 gentoo-2-7935c808bbb5547f473616f59321ffc827aeea07.zip | |
Fix loading of the sound samples when using sdl-mixer (bug #55932)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/sdlroids/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/sdlroids/files/1.3.4-sound.patch | 15 | ||||
| -rw-r--r-- | games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild | 11 |
3 files changed, 27 insertions, 5 deletions
diff --git a/games-arcade/sdlroids/ChangeLog b/games-arcade/sdlroids/ChangeLog index 4ba28a3a834a..a20bf04ab645 100644 --- a/games-arcade/sdlroids/ChangeLog +++ b/games-arcade/sdlroids/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/sdlroids # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdlroids/ChangeLog,v 1.5 2004/06/24 22:11:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdlroids/ChangeLog,v 1.6 2004/07/03 06:13:17 mr_bones_ Exp $ + + 02 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> + +files/1.3.4-sound.patch, sdlroids-1.3.4-r3.ebuild: + Fix loading of the sound samples when using sdl-mixer (bug #55932) *sdlroids-1.3.4-r3 (24 Jan 2004) diff --git a/games-arcade/sdlroids/files/1.3.4-sound.patch b/games-arcade/sdlroids/files/1.3.4-sound.patch new file mode 100644 index 000000000000..00da03f94252 --- /dev/null +++ b/games-arcade/sdlroids/files/1.3.4-sound.patch @@ -0,0 +1,15 @@ +--- sdlsound.c.orig 2004-07-02 23:03:03.000000000 -0700 ++++ sdlsound.c 2004-07-02 23:05:37.000000000 -0700 +@@ -205,9 +205,9 @@ + int load_sample(int num) { + + if((samples[num] = Mix_LoadWAV(samplename[num])) || +- Mix_LoadWAV(datafilename(NULL, samplename[num])) || +- Mix_LoadWAV(datafilename(DATADIR, samplename[num])) || +- Mix_LoadWAV(datafilename(bindir, samplename[num]))) ++ (samples[num] = Mix_LoadWAV(datafilename(NULL, samplename[num]))) || ++ (samples[num] = Mix_LoadWAV(datafilename(DATADIR, samplename[num]))) || ++ (samples[num] = Mix_LoadWAV(datafilename(bindir, samplename[num])))) + return 1; + return 0; + } diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild index 6c3efb870e32..531304ae94ca 100644 --- a/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild +++ b/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild,v 1.4 2004/06/24 22:11:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild,v 1.5 2004/07/03 06:13:17 mr_bones_ Exp $ -inherit games +inherit eutils games DESCRIPTION="Asteroids Clone for X using SDL" HOMEPAGE="http://david.hedbor.org/projects/sdlroids/" @@ -13,17 +13,20 @@ SLOT="0" KEYWORDS="x86 ppc ~amd64" IUSE="" -RDEPEND=">=media-libs/libsdl-1.1.8" +RDEPEND=">=media-libs/libsdl-1.1.8 + media-libs/sdl-mixer" DEPEND="${RDEPEND} >=sys-apps/sed-4" src_unpack() { unpack ${A} + cd "${S}" sed -i \ -e 's/$(SOUNDSDIR)/$(DESTDIR)$(SOUNDSDIR)/' \ - -e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' ${S}/Makefile.in \ + -e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' Makefile.in \ || die "sed Makefile.in failed" + epatch "${FILESDIR}/${PV}-sound.patch" } src_install() { |