diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2004-02-01 12:13:18 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2004-02-01 12:13:18 +0000 |
| commit | a6f3fd8d00392526d9360b505e945e3b8e3f41b3 (patch) | |
| tree | 9943886c9bd7501d0d03f9f49d2ab1480c353eb7 | |
| parent | previous commit had a few echo statements left in from debugging the bugs, re... (diff) | |
| download | gentoo-2-a6f3fd8d00392526d9360b505e945e3b8e3f41b3.tar.gz gentoo-2-a6f3fd8d00392526d9360b505e945e3b8e3f41b3.tar.bz2 gentoo-2-a6f3fd8d00392526d9360b505e945e3b8e3f41b3.zip | |
Closing 38992.
| -rw-r--r-- | games-emulation/stella/ChangeLog | 7 | ||||
| -rw-r--r-- | games-emulation/stella/Manifest | 9 | ||||
| -rw-r--r-- | games-emulation/stella/files/stella-1.3-alsa-fix.patch | 30 | ||||
| -rw-r--r-- | games-emulation/stella/stella-1.3-r1.ebuild | 11 |
4 files changed, 49 insertions, 8 deletions
diff --git a/games-emulation/stella/ChangeLog b/games-emulation/stella/ChangeLog index 1b3f88e5a622..b4ab0998bf52 100644 --- a/games-emulation/stella/ChangeLog +++ b/games-emulation/stella/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/stella -# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.3 2003/12/06 22:54:05 lanius Exp $ +# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/ChangeLog,v 1.4 2004/02/01 12:13:02 ferringb Exp $ + + 01 Feb 2004; Brian Harring <ferringb@gentoo.org> stella-1.3-r1.ebuild: + Patch for fixing alsalib-1.0* compilation issue (38992) *stella-1.3-r1 (06 Dec 2003) diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest index 9b8a16179782..ebbc3349c859 100644 --- a/games-emulation/stella/Manifest +++ b/games-emulation/stella/Manifest @@ -1,7 +1,8 @@ -MD5 86feb9877c54bafffaad6d88c76ac0a8 stella-1.3.ebuild 1262 -MD5 dd95b2cf217a0b274a75b93298e28bac ChangeLog 685 MD5 29f58d8ac5598d702edeef2324ea75c6 stella-1.2.ebuild 1114 -MD5 766e61c189dd9d34747403a30da0751b stella-1.3-r1.ebuild 1261 -MD5 5af9244b91231a9124ae00e7620ad00e files/digest-stella-1.3-r1 66 +MD5 bcfe3f4680395d5c05e8ae985a6c48c4 ChangeLog 819 +MD5 86feb9877c54bafffaad6d88c76ac0a8 stella-1.3.ebuild 1262 +MD5 e598816335d2efb933951aede7a20fa4 stella-1.3-r1.ebuild 1386 +MD5 50234c4f315b2cce6869a5f5976046af files/stella-1.3-alsa-fix.patch 1112 MD5 4ed8ab29f9d3ab27873b12516dfd9fdf files/digest-stella-1.2 66 MD5 5af9244b91231a9124ae00e7620ad00e files/digest-stella-1.3 66 +MD5 5af9244b91231a9124ae00e7620ad00e files/digest-stella-1.3-r1 66 diff --git a/games-emulation/stella/files/stella-1.3-alsa-fix.patch b/games-emulation/stella/files/stella-1.3-alsa-fix.patch new file mode 100644 index 000000000000..fd603b286a72 --- /dev/null +++ b/games-emulation/stella/files/stella-1.3-alsa-fix.patch @@ -0,0 +1,30 @@ +diff -ur stella-1.3/src/ui/sound/SoundALSA.cxx stella-1.3-fixed/src/ui/sound/SoundALSA.cxx +--- stella-1.3/src/ui/sound/SoundALSA.cxx 2003-02-17 19:19:44.000000000 -0600 ++++ stella-1.3-fixed/src/ui/sound/SoundALSA.cxx 2004-01-22 00:57:30.000000000 -0600 +@@ -16,6 +16,11 @@ + // $Id: stella-1.3-alsa-fix.patch,v 1.1 2004/02/01 12:13:02 ferringb Exp $ + //============================================================================ + ++#include <alsa/version.h> ++#if SND_LIB_MAJOR==1 ++#define ALSA_PCM_OLD_HW_PARAMS_API ++#define ALSA_PCM_NEW_HW_PARAMS_API ++#endif + #include <alsa/asoundlib.h> + #include <stdio.h> + +diff -ur stella-1.3/src/ui/sound/SoundALSA.hxx stella-1.3-fixed/src/ui/sound/SoundALSA.hxx +--- stella-1.3/src/ui/sound/SoundALSA.hxx 2003-02-17 19:19:44.000000000 -0600 ++++ stella-1.3-fixed/src/ui/sound/SoundALSA.hxx 2004-01-22 00:57:01.000000000 -0600 +@@ -19,6 +19,11 @@ + #ifndef SOUNDALSA_HXX + #define SOUNDALSA_HXX + ++#include <alsa/version.h> ++#if SND_LIB_MAJOR==1 ++#define ALSA_PCM_OLD_HW_PARAMS_API ++#define ALSA_PCM_NEW_HW_PARAMS_API ++#endif + #include <alsa/asoundlib.h> + + #include "Sound.hxx" diff --git a/games-emulation/stella/stella-1.3-r1.ebuild b/games-emulation/stella/stella-1.3-r1.ebuild index 560ab373a450..8c8dd58d20c7 100644 --- a/games-emulation/stella/stella-1.3-r1.ebuild +++ b/games-emulation/stella/stella-1.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-1.3-r1.ebuild,v 1.1 2003/12/06 22:54:05 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-1.3-r1.ebuild,v 1.2 2004/02/01 12:13:02 ferringb Exp $ DESCRIPTION="Stella Atari 2600 VCS Emulator" HOMEPAGE="http://stella.sourceforge.net/" @@ -19,6 +19,13 @@ DEPEND="|| ( media-libs/libpng )" +src_unpack() { + unpack ${A} || die + cd ${S} + epatch ${FILESDIR}/${P}-alsa-fix.patch || die \ + "Alsalib 1.0 fix failed" +} + src_compile() { # let's just default joystick & snapshot support to on MYOPTS="JOYSTICK_SUPPORT=1 SNAPSHOT_SUPPORT=1" |