From: Leonardo Boshell <leonardop@gentoo.org>
Date: Wed, 24 Jan 2007 18:52:12 +0000 (+0000)
Subject: Added a couple of patches to fix compilation in parallel, and in amd64.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8751aa8297e3959ed3434cf180a783970c0e22a;p=gentoo.git

Added a couple of patches to fix compilation in parallel, and in amd64.
Package-Manager: portage-2.1.2
---

diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog
index 27f7ddcc91d7..cdb8f8825ee5 100644
--- a/app-accessibility/espeak/ChangeLog
+++ b/app-accessibility/espeak/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/espeak
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.3 2007/01/22 18:53:25 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.4 2007/01/24 18:52:12 leonardop Exp $
+
+  24 Jan 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/espeak-1.18-64bits.patch, +files/espeak-1.18-parallel.patch,
+  espeak-1.18.ebuild:
+  Added a couple of patches to fix compilation in parallel, and in amd64.
 
 *espeak-1.18 (22 Jan 2007)
 
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 9317ab630e97..1c6b2919c588 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,17 +1,25 @@
+AUX espeak-1.18-64bits.patch 2496 RMD160 db313d18e90e458ed2c12687dd25e381d2817c53 SHA1 2879e4614d21f9721ddbff2cc9751b7de0f14548 SHA256 97d71fdb3c4b7c19436e37396747bd2828fa08ed5c6c0aa1a4db15e387aebae4
+MD5 0311d084162c3fc6c7150c438e882c16 files/espeak-1.18-64bits.patch 2496
+RMD160 db313d18e90e458ed2c12687dd25e381d2817c53 files/espeak-1.18-64bits.patch 2496
+SHA256 97d71fdb3c4b7c19436e37396747bd2828fa08ed5c6c0aa1a4db15e387aebae4 files/espeak-1.18-64bits.patch 2496
+AUX espeak-1.18-parallel.patch 409 RMD160 89849b86aafb3bdfeb15b66c22aa7e07132fe961 SHA1 446e06a4856b088d99f9a4f166a505cb4726e2c4 SHA256 391574549f981cf3587489b37df4087d1bbbb23fd5f26961f0a9374187f89031
+MD5 557155f1fbb7dce6a97cd6c18ea937c4 files/espeak-1.18-parallel.patch 409
+RMD160 89849b86aafb3bdfeb15b66c22aa7e07132fe961 files/espeak-1.18-parallel.patch 409
+SHA256 391574549f981cf3587489b37df4087d1bbbb23fd5f26961f0a9374187f89031 files/espeak-1.18-parallel.patch 409
 DIST espeak-1.16-source.zip 528920 RMD160 56a0504e9909022194603394a203651fa5945e13 SHA1 28c45c3ca8b520be54d0dfc78e72b25a3ae56311 SHA256 cdb213b50bff0c092a4d1941038eadac831251acee64acb48943e13ccae3471b
 DIST espeak-1.18-source.zip 658805 RMD160 9097e6f241a7830a8301b0e268cc767e661b81aa SHA1 8c98dac2ab5484d16f8a16fcb91fec14f338a1df SHA256 7d20b69419a5b19d3fb901701edd18b272f2cbf97dee1dd5775f50e44503a878
 EBUILD espeak-1.16.ebuild 1242 RMD160 2206faeb21b3835fb585eac495834b85ae938e61 SHA1 b98f1e86e53101a04601f016451b38a6ddd796e0 SHA256 92650bc7c106982b3a211a61d75105f7dbf9a3af82b0798c9a180dfe12f7fdae
 MD5 fba44395ff1c12a775fa0a529ceb47a9 espeak-1.16.ebuild 1242
 RMD160 2206faeb21b3835fb585eac495834b85ae938e61 espeak-1.16.ebuild 1242
 SHA256 92650bc7c106982b3a211a61d75105f7dbf9a3af82b0798c9a180dfe12f7fdae espeak-1.16.ebuild 1242
-EBUILD espeak-1.18.ebuild 1031 RMD160 64ce6c0a90f9b71ea1f29c8f04f3cb975d2a4907 SHA1 c6e1985205e4886ef941d9e95570210282f9b0b2 SHA256 eb699237fad8c3dbb0cd69db1d3295660d3e33fb1e4237494b88c14641005910
-MD5 384d09f8fe1e798986d6a8248fe63be3 espeak-1.18.ebuild 1031
-RMD160 64ce6c0a90f9b71ea1f29c8f04f3cb975d2a4907 espeak-1.18.ebuild 1031
-SHA256 eb699237fad8c3dbb0cd69db1d3295660d3e33fb1e4237494b88c14641005910 espeak-1.18.ebuild 1031
-MISC ChangeLog 780 RMD160 56d616964058c1b4176ebec13b259c8ccefc8a39 SHA1 bae20e66d66c77ba94e0bf33ead9f65df12155a0 SHA256 f0dc45243185e491519cea93f21c7b7841aebbf61d22b07f3390b9c9224226a1
-MD5 c9329c6b4e8fc64f25876a5b1f01c5d2 ChangeLog 780
-RMD160 56d616964058c1b4176ebec13b259c8ccefc8a39 ChangeLog 780
-SHA256 f0dc45243185e491519cea93f21c7b7841aebbf61d22b07f3390b9c9224226a1 ChangeLog 780
+EBUILD espeak-1.18.ebuild 1198 RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 SHA1 cb79f5d1cce1a900011b1a6404997a37c06b2ff2 SHA256 d6d83238e87562d82b9b5aad33e1736dc4e5ac3b66237c5fa337e11e7af5c774
+MD5 0371066906461208a1240dc96534d86f espeak-1.18.ebuild 1198
+RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 espeak-1.18.ebuild 1198
+SHA256 d6d83238e87562d82b9b5aad33e1736dc4e5ac3b66237c5fa337e11e7af5c774 espeak-1.18.ebuild 1198
+MISC ChangeLog 1002 RMD160 237104df96d11da6cf0cf3527d1558be163437a9 SHA1 18aca5839e86d451dd42dac676b700cd0d3f3778 SHA256 ec07055d85f4a9acc26561f9ae4c158d5708a1294ef1c028b10e6b9355fb6639
+MD5 396c6d58ea9cd71bda1af561dc4cb94e ChangeLog 1002
+RMD160 237104df96d11da6cf0cf3527d1558be163437a9 ChangeLog 1002
+SHA256 ec07055d85f4a9acc26561f9ae4c158d5708a1294ef1c028b10e6b9355fb6639 ChangeLog 1002
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
 MD5 82235b237bf37d432e6987e3be2235d1 metadata.xml 229
 RMD160 7f8d6a0235529eccff705022803122c9534628d7 metadata.xml 229
diff --git a/app-accessibility/espeak/espeak-1.18.ebuild b/app-accessibility/espeak/espeak-1.18.ebuild
index a07cff77965e..89e6e8fad3b4 100644
--- a/app-accessibility/espeak/espeak-1.18.ebuild
+++ b/app-accessibility/espeak/espeak-1.18.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.18.ebuild,v 1.1 2007/01/22 18:53:25 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.18.ebuild,v 1.2 2007/01/24 18:52:12 leonardop Exp $
+
+inherit eutils
 
 MY_P="${P}-source"
 
@@ -20,14 +22,19 @@ S=${WORKDIR}/${MY_P}
 
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}/src"
-
-	# select the version of portaudio to use
-	if has_version "=media-libs/portaudio-18*" ; then
-		mv -f portaudio18.h portaudio.h
-	elif has_version "=media-libs/portaudio-19*" ; then
-		mv -f portaudio19.h portaudio.h
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix compilation in 64bit systems (e.g. amd64)
+	epatch "${FILESDIR}/${P}-64bits.patch"
+
+	# Fix parallel compilation
+	epatch "${FILESDIR}/${P}-parallel.patch"
+
+	# portaudio.h is by default the same as portaudio18.h, but use the version
+	# 19 API if available
+	if has_version "=media-libs/portaudio-19*" ; then
+		mv -f "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
 	fi
 }
 
diff --git a/app-accessibility/espeak/files/espeak-1.18-64bits.patch b/app-accessibility/espeak/files/espeak-1.18-64bits.patch
new file mode 100644
index 000000000000..8d3b778610ca
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.18-64bits.patch
@@ -0,0 +1,64 @@
+diff -NurdB espeak-1.18-source/src/dictionary.cpp espeak-1.18-source-patched/src/dictionary.cpp
+--- espeak-1.18-source/src/dictionary.cpp	2007-01-13 15:56:33.000000000 +0000
++++ espeak-1.18-source-patched/src/dictionary.cpp	2007-01-24 16:25:23.000000000 +0000
+@@ -592,7 +592,12 @@
+ int Translator::IsLetter(int letter, int group)
+ {//============================================
+ 	if(letter_type_list[group] != NULL)
+-		return((int)wcschr(letter_type_list[group],letter));
++	{
++		if(wcschr(letter_type_list[group],letter) == NULL)
++			return(0);
++		else
++			return(1);
++	}
+ 
+ 	if(letter_bits_offset > 0)
+ 	{
+diff -NurdB espeak-1.18-source/src/speak_lib.cpp espeak-1.18-source-patched/src/speak_lib.cpp
+--- espeak-1.18-source/src/speak_lib.cpp	2007-01-13 15:56:33.000000000 +0000
++++ espeak-1.18-source-patched/src/speak_lib.cpp	2007-01-24 17:14:10.000000000 +0000
+@@ -73,7 +73,7 @@
+ 
+ 	int a_wave_can_be_played = fifo_is_command_enabled();
+ 
+-	SHOW("*** dispatch_audio > uid=%d, [write=%x (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", 
++	SHOW("*** dispatch_audio > uid=%d, [write=%p (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", 
+        (event) ? event->unique_identifier : 0, wave_test_get_write_buffer(), 2*length, 
+        (event) ? event->sample : 0,
+        a_wave_can_be_played);
+diff -NurdB espeak-1.18-source/src/wave.cpp espeak-1.18-source-patched/src/wave.cpp
+--- espeak-1.18-source/src/wave.cpp	2007-01-13 15:56:34.000000000 +0000
++++ espeak-1.18-source-patched/src/wave.cpp	2007-01-24 17:13:27.000000000 +0000
+@@ -877,9 +877,9 @@
+ //>
+ //<wave_test_get_write_buffer
+ 
+-uint32_t wave_test_get_write_buffer()
++char *wave_test_get_write_buffer()
+ {
+-  return (uint32_t)myWrite;
++  return myWrite;
+ }
+ 
+ 
+@@ -897,7 +897,7 @@
+ uint32_t wave_get_remaining_time(uint32_t sample) {return 0;}
+ typedef int (t_wave_callback)(void);
+ void wave_set_callback_is_output_enabled(t_wave_callback* cb) {}
+-extern uint32_t wave_test_get_write_buffer() {return 0;}
++extern char *wave_test_get_write_buffer() {return NULL;}
+ 
+ #endif  // of USE_PORTAUDIO
+ 
+diff -NurdB espeak-1.18-source/src/wave.h espeak-1.18-source-patched/src/wave.h
+--- espeak-1.18-source/src/wave.h	2007-01-13 15:56:34.000000000 +0000
++++ espeak-1.18-source-patched/src/wave.h	2007-01-24 17:13:54.000000000 +0000
+@@ -33,6 +33,6 @@
+ extern void add_time_in_ms(struct timespec *ts, int time_in_ms);
+ 
+ // for tests
+-extern uint32_t wave_test_get_write_buffer();
++extern char * wave_test_get_write_buffer();
+ 
+ #endif
diff --git a/app-accessibility/espeak/files/espeak-1.18-parallel.patch b/app-accessibility/espeak/files/espeak-1.18-parallel.patch
new file mode 100644
index 000000000000..3d72b2ed889f
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.18-parallel.patch
@@ -0,0 +1,12 @@
+diff -NurdB espeak-1.18-source/src/Makefile espeak-1.18-source-patched/src/Makefile
+--- espeak-1.18-source/src/Makefile	2007-01-15 01:08:03.000000000 +0000
++++ espeak-1.18-source-patched/src/Makefile	2007-01-24 18:17:25.000000000 +0000
+@@ -50,7 +50,7 @@
+ $(BIN_NAME): $(OBJS1)
+ 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
+ 
+-$(BIN2_NAME): $(OBJS3)
++$(BIN2_NAME): $(OBJS3) $(LIB_NAME)
+ 	$(CXX) -o $@ $(OBJS3) $(LIBS3)
+ 
+