From: Daniel Gryniewicz <dang@gentoo.org>
Date: Mon, 19 Mar 2007 18:53:21 +0000 (+0000)
Subject: Fix building with debug; bug #170971
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=672076d805af96ff9bf2a7011b24fdfd8ca8a0f0;p=gentoo.git

Fix building with debug; bug #170971
Package-Manager: portage-2.1.2.2
---

diff --git a/media-sound/esound/ChangeLog b/media-sound/esound/ChangeLog
index 2d3cddde78cb..ee546d306170 100644
--- a/media-sound/esound/ChangeLog
+++ b/media-sound/esound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/esound
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.92 2007/03/14 17:22:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/ChangeLog,v 1.93 2007/03/19 18:53:21 dang Exp $
+
+  19 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/esound-0.2.37-debug.patch, esound-0.2.37.ebuild:
+  Fix building with debug; bug #170971
 
 *esound-0.2.37 (14 Mar 2007)
 
diff --git a/media-sound/esound/Manifest b/media-sound/esound/Manifest
index 547c8951700f..38f9c07e9775 100644
--- a/media-sound/esound/Manifest
+++ b/media-sound/esound/Manifest
@@ -17,6 +17,10 @@ AUX esound-0.2.36-ppc-macos.patch 4067 RMD160 7c7cc864b14df4e3ce38ecacaf3607890e
 MD5 defad2b109b564a607b57788a05e139d files/esound-0.2.36-ppc-macos.patch 4067
 RMD160 7c7cc864b14df4e3ce38ecacaf3607890efb1e61 files/esound-0.2.36-ppc-macos.patch 4067
 SHA256 de559ed0dff54fb7746ae7aabee60d8e3815b6c60f09509737dbaec5cde07c97 files/esound-0.2.36-ppc-macos.patch 4067
+AUX esound-0.2.37-debug.patch 846 RMD160 7005e42b4927b6c5a4f30d4e873c770748e09e2f SHA1 ae214c89066332aa6746aa35fa77160068ed0cc4 SHA256 ca7b64f70b085f83bb16b822d56ceeb77cfe6257d373cb104aea159455c5bacb
+MD5 a144261a56102548893d1276ff6ce3ff files/esound-0.2.37-debug.patch 846
+RMD160 7005e42b4927b6c5a4f30d4e873c770748e09e2f files/esound-0.2.37-debug.patch 846
+SHA256 ca7b64f70b085f83bb16b822d56ceeb77cfe6257d373cb104aea159455c5bacb files/esound-0.2.37-debug.patch 846
 AUX esound.conf.d 737 RMD160 a8c11bc892cf58b2ae99a4898c3adc50c483087d SHA1 e4ee0fb3eb877afb29bcb99eeac7503eb8631ef1 SHA256 cbdec56c59d79c438606eda307ba5a25f35d1f51d0c5caed09057aba99a81fab
 MD5 6a04ae174ae4b2bb4ad9734fe09d32e2 files/esound.conf.d 737
 RMD160 a8c11bc892cf58b2ae99a4898c3adc50c483087d files/esound.conf.d 737
@@ -39,14 +43,14 @@ EBUILD esound-0.2.36-r2.ebuild 2064 RMD160 725e574ff9471c0c5c91256d4cb33e091263d
 MD5 44636a5ea87de80085ec35335b8a0f38 esound-0.2.36-r2.ebuild 2064
 RMD160 725e574ff9471c0c5c91256d4cb33e091263d675 esound-0.2.36-r2.ebuild 2064
 SHA256 5d489c8dec511ce8c0e43a24c39f1c52f448679d42d6898408c24cfd8599dc3b esound-0.2.36-r2.ebuild 2064
-EBUILD esound-0.2.37.ebuild 2092 RMD160 acd27307f6ade0d39e05ba52e5da03bc1b30e65b SHA1 44c0a54c1ef519fb655303fd17ac273c97deafb0 SHA256 95acd9f3ec296875fac7c9e6be0f3adb3940d24e0e7e5b21252cf383b5a91f4a
-MD5 d702f516551c439767ea90fa973382d5 esound-0.2.37.ebuild 2092
-RMD160 acd27307f6ade0d39e05ba52e5da03bc1b30e65b esound-0.2.37.ebuild 2092
-SHA256 95acd9f3ec296875fac7c9e6be0f3adb3940d24e0e7e5b21252cf383b5a91f4a esound-0.2.37.ebuild 2092
-MISC ChangeLog 12128 RMD160 82e9d7f00ee9379d98dcd2baac21f5f6d8d0958d SHA1 17504d05f26e915dd158e6a4dc390f92a331daf6 SHA256 7dc1b73fc1b2e7245a454a6564f8a5017d244c7883362740bda57822a389e7c5
-MD5 5bc329f1a852d9a9c66469fdafda6d76 ChangeLog 12128
-RMD160 82e9d7f00ee9379d98dcd2baac21f5f6d8d0958d ChangeLog 12128
-SHA256 7dc1b73fc1b2e7245a454a6564f8a5017d244c7883362740bda57822a389e7c5 ChangeLog 12128
+EBUILD esound-0.2.37.ebuild 2178 RMD160 8edafa45510068b1cbe0f939fb293df082ccd6ce SHA1 1c2d9417386aef2c5eb4f49648817b2e7f39d881 SHA256 5140978145433a296e9bb8848f32e69ed0a8b8950511a4fbb8753cd3a2af425b
+MD5 0c958d63c5f42cbbfe5cc7fdf9045c30 esound-0.2.37.ebuild 2178
+RMD160 8edafa45510068b1cbe0f939fb293df082ccd6ce esound-0.2.37.ebuild 2178
+SHA256 5140978145433a296e9bb8848f32e69ed0a8b8950511a4fbb8753cd3a2af425b esound-0.2.37.ebuild 2178
+MISC ChangeLog 12277 RMD160 6987f3c3e55d02c6513cc124b6855c53f66bf4ea SHA1 31ed11a4e7e7dc2999c88edbbb4fb6593a91a98e SHA256 73bac12a01d5ccb6835421c065dd0da3cd8bd9f2f2821c5647dff00cd44590ce
+MD5 a38369f66fe58924eb0128e055133a0b ChangeLog 12277
+RMD160 6987f3c3e55d02c6513cc124b6855c53f66bf4ea ChangeLog 12277
+SHA256 73bac12a01d5ccb6835421c065dd0da3cd8bd9f2f2821c5647dff00cd44590ce ChangeLog 12277
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
@@ -63,7 +67,7 @@ SHA256 72b8cd9f0d4ee6501c2c4671c0e6745af03cc90be5751823dca63fc5af3b15d1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+C7QomPajV0RnrERAubNAJ9qM7GuIpJ80JgwvhcxN43E8EDkLgCeJbYv
-NDcgGBV7TCOS1SHs4hO+kWc=
-=fu24
+iD8DBQFF/twkomPajV0RnrERAppYAJ9ZCE8XHN8frRX353jxJe2ge5tiyACfRIqM
+W8cbt80ylPlsl4Po++d+CEQ=
+=yyDb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/esound/esound-0.2.37.ebuild b/media-sound/esound/esound-0.2.37.ebuild
index 1f13d77e1dc8..545791cd680d 100644
--- a/media-sound/esound/esound-0.2.37.ebuild
+++ b/media-sound/esound/esound-0.2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37.ebuild,v 1.1 2007/03/14 17:22:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/esound-0.2.37.ebuild,v 1.2 2007/03/19 18:53:21 dang Exp $
 
 WANT_AUTOMAKE=1.10
 inherit libtool gnome.org eutils autotools flag-o-matic
@@ -35,6 +35,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-0.2.36-mode_t.patch"
 	epatch "${FILESDIR}/${PN}-0.2.36-asneeded.patch"
+	# Fix compile with debug; bug #170971
+	epatch "${FILESDIR}/${PN}-0.2.37-debug.patch"
 
 
 	AT_M4DIR="m4" eautomake
diff --git a/media-sound/esound/files/esound-0.2.37-debug.patch b/media-sound/esound/files/esound-0.2.37-debug.patch
new file mode 100644
index 000000000000..66f5502a7e34
--- /dev/null
+++ b/media-sound/esound/files/esound-0.2.37-debug.patch
@@ -0,0 +1,20 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN esound-0.2.37.orig/players.c esound-0.2.37/players.c
+--- esound-0.2.37.orig/players.c	2007-01-01 18:56:06.000000000 -0500
++++ esound-0.2.37/players.c	2007-03-19 14:47:06.000000000 -0400
+@@ -303,14 +303,13 @@ int read_player( esd_player_t *player )
+ 			   &rd_fds, NULL, NULL, &timeout ) ;
+ 	if ( can_read > 0 )
+ 	{
+-	    int bytes_read;
+ 	    player->actual_length = 0;
+ 	    do {
+-		bytes_read = ESD_READ_BIN( player->source_id,
++		ESD_READ_BIN( player->source_id,
+ 			      player->data_buffer + player->actual_length, 
+ 			      player->buffer_length - player->actual_length,
+ 			      actual, "str rd" );
+-		if (bytes_read < player->buffer_length - player->actual_length)
++		if (actual < player->buffer_length - player->actual_length)
+ 			break;
+ 		
+ 		/* check for end of stream */