Closing bug #22324.

3 files changed, 66 insertions, 2 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 817c6c3f6dd6..38c602229c2d 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.20 2003/06/04 23:03:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.21 2003/06/06 21:55:11 agenkin Exp $
 
   05 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> alsa-tools-0.9.4.ebuild :
   Switched to mirror://alsaproject in SRC_URI.
 
 *alsa-driver-0.9.4 (03 June 2003)
 
+  06 June 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Added patch by Jason Rhinelander <jason-gentoo@gossamer-threads.com>
+  (bug #22324) to fix compilation with gcc 3.3.
+
   03 June 2003; Arcady Genkin <agenkin@gentoo.org> :
   Version update.
 
diff --git a/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild b/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild
index f6cf0decbbee..5f89d19327c5 100644
--- a/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild,v 1.2 2003/06/04 23:03:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-0.9.4.ebuild,v 1.3 2003/06/06 21:55:11 agenkin Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="http://www.alsa-project.org"
@@ -18,6 +18,12 @@ S="${WORKDIR}/${P}"
 # This is a list of the tools in the package.
 ALSA_TOOLS="ac3dec as10k1 envy24control sb16_csp seq/sbiload"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-gcc3.3.patch || die
+}
+
 src_compile() {
     # Some of the tools don't make proper use of CFLAGS, even though
     # all of them seem to use autoconf.  This needs to be fixed.
diff --git a/media-sound/alsa-tools/files/alsa-tools-0.9.4-gcc3.3.patch b/media-sound/alsa-tools/files/alsa-tools-0.9.4-gcc3.3.patch
new file mode 100644
index 000000000000..c9c66191da65
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-0.9.4-gcc3.3.patch
@@ -0,0 +1,54 @@
+--- alsa-tools-0.9.4/as10k1/as10k1.c	2003-05-14 23:45:17.000000000 -0700
++++ alsa-tools-0.9.4-gcc33/as10k1/as10k1.c	2003-06-05 20:33:53.000000000 -0700
+@@ -43,29 +43,28 @@
+ 
+ char version[]="As10k1 assembler version " VERSION;
+ 
+-char help[]="
+-Usage: as10k1 [option...] asmfile
+-
+-The as10k1 assembler is for the emu10k1 dsp processor
+-found in Creative Lab's sblive series of sound cards.
+-
+-Author: Daniel Bertrand <d.bertrand@ieee.ca>
+-
+-Options:\n
+-     -l [listfile]         Specify a listing file, default is none.
+-     -o [emu10k1 file]     Specify an output file, default is based input,
+-                           Substituting .asm to .emu10k1
+-     -d [dbg_options...]   Turn on debug messages.
+-            s              prints all symbols                
+-            g              prints defined gprs
+-            t              prints tram usage
+-            i              prints instructions
+-     -h                    Prints this message  
+-     -v                    Prints version number. 
+-
+-This program is distributed under the GPL.
+-
+-";
++char help[]="\n"
++"Usage: as10k1 [option...] asmfile\n"
++"\n"
++"The as10k1 assembler is for the emu10k1 dsp processor\n"
++"found in Creative Lab's sblive series of sound cards.\n"
++"\n"
++"Author: Daniel Bertrand <d.bertrand@ieee.ca>\n"
++"\n"
++"Options:\n\n"
++"     -l [listfile]         Specify a listing file, default is none.\n"
++"     -o [emu10k1 file]     Specify an output file, default is based input,\n"
++"                           Substituting .asm to .emu10k1\n"
++"     -d [dbg_options...]   Turn on debug messages.\n"
++"            s              prints all symbols                \n"
++"            g              prints defined gprs\n"
++"            t              prints tram usage\n"
++"            i              prints instructions\n"
++"     -h                    Prints this message  \n"
++"     -v                    Prints version number. \n"
++"\n"
++"This program is distributed under the GPL.\n"
++"\n";
+ 
+ //  cli==Command-Line Interface && !Creative Labs Inc.
+