gcc2 patch submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in bug #44168.

4 files changed, 45 insertions, 5 deletions

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 5128d92dc56f..7fa582ed276a 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.35 2004/03/07 12:12:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.36 2004/03/11 04:47:21 eradicator Exp $
+
+  10 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> esound-0.2.33.ebuild,
+  files/esound-0.2.33-gcc2_fix.patch:
+  gcc2 patch submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk> in bug
+  #44168.
 
 *esound-0.2.33 (07 Mar 2004)
 
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index d480aeb21ac6..9d813737b2d3 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -1,11 +1,12 @@
-MD5 a4312f8efec883c54832ed5e47efae0e esound-0.2.33.ebuild 1302
+MD5 e7d3e6aad326754e3e716eea1175c658 esound-0.2.33.ebuild 1346
 MD5 03bfaf1832bc41993aba15c4b18d7384 esound-0.2.29.ebuild 1051
 MD5 c7f1591e1f3a3dbae01037aa5cfcaa3f esound-0.2.32.ebuild 1389
 MD5 aa9131cacc04531fcdb8d827ab12d844 esound-0.2.32-r1.ebuild 1424
 MD5 4309993b1011c7c830a9ce7cb2b636f1 esound-0.2.29-r1.ebuild 1650
-MD5 d3c5be3e8ce19bfe6427e8696e6121f9 ChangeLog 4634
+MD5 4f81b565d762217476bdb11dfa49ed68 ChangeLog 4845
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 MD5 675f9471a8062d3365ba0748546ade17 files/esound-0.2.32-new-alsa.patch 2831
+MD5 f14e22dbd99b25a4b76dcfe42cfb2099 files/esound-0.2.33-gcc2_fix.patch 1097
 MD5 75aca7b483f56968b69b28ce2fa2389e files/esound-0.2.29-local-vs-remote.diff 474
 MD5 340b8af9191cda014c7963617ede9b77 files/esound-0.2.29-alsa-period.diff 473
 MD5 249e1fd14f662bce76093bb7685f7eb2 files/digest-esound-0.2.29-r1 66
diff --git a/media-sound/esound/esound-0.2.33.ebuild b/media-sound/esound/esound-0.2.33.ebuild
index e3a492f9e9ce..61fbca6ac81f 100644
--- a/media-sound/esound/esound-0.2.33.ebuild
+++ b/media-sound/esound/esound-0.2.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.33.ebuild,v 1.2 2004/03/07 12:12:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.33.ebuild,v 1.3 2004/03/11 04:47:21 eradicator Exp $
 
 inherit libtool gnome.org eutils
 
@@ -22,7 +22,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-0.2.32-amd64.patch
-
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
 
 src_compile() {
diff --git a/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch b/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch
new file mode 100644
index 000000000000..6c3dcad9a242
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.33-gcc2_fix.patch
@@ -0,0 +1,34 @@
+diff -Naur esound-0.2.33.orig/audio_alsa09.c esound-0.2.33/audio_alsa09.c
+--- esound-0.2.33.orig/audio_alsa09.c	2004-03-01 13:32:49.000000000 -0500
++++ esound-0.2.33/audio_alsa09.c	2004-03-09 14:43:27.000000000 -0500
+@@ -94,6 +94,10 @@
+ 	snd_pcm_hw_params_t *hwparams;
+ 	int err;
+ 	int periods;
++#ifdef DRIVER_ALSA_09_NEW_PCM_API
++	int t_dir, t_speed;
++	snd_pcm_uframes_t t_bufsize;
++#endif
+   
+ 	err = snd_pcm_open(&handle, dev, mode, SND_PCM_NONBLOCK);
+ 	if (err < 0) {
+@@ -139,8 +143,8 @@
+ #ifndef DRIVER_ALSA_09_NEW_PCM_API
+ 	err = snd_pcm_hw_params_set_rate_near(handle, hwparams, speed, 0);
+ #else
+-    int t_dir=0;
+-    int t_speed=speed;
++    t_dir=0;
++    t_speed=speed;
+     err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &t_speed, &t_dir);
+ #endif
+ 	if (err < 0) {
+@@ -188,7 +192,7 @@
+ #ifndef DRIVER_ALSA_09_NEW_PCM_API
+ 	err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); 
+ #else
+-	snd_pcm_uframes_t t_bufsize=BUFFERSIZE;
++	t_bufsize=BUFFERSIZE;
+ 	err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &t_bufsize);
+ #endif
+ 	if (err < 0) {