Added patches to fix segfault on ppc64 and remove ARCH_BIG from the makefile.

Package-Manager: portage-2.1.2-r7

diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 7e52253a94bf38b5715ed16a2142a4a6b870052d..8ffe68466145518e981220d717a03d49dbd6ded4 100644 (file)
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -6,6 +6,14 @@ AUX espeak-1.18-parallel.patch 409 RMD160 89849b86aafb3bdfeb15b66c22aa7e07132fe9
 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
+AUX espeak-1.19-big-endian.patch 622 RMD160 c4b2d372ea0021a14027889f221583bfb5900b1e SHA1 eb118f7b56606ffc2aed520759dbdefee3d70402 SHA256 fa39adc9133d44952c9b98410cd278526084afda6eef932223da28407bee9893
+MD5 c057609a517073d8e8f4e32f7dc1654f files/espeak-1.19-big-endian.patch 622
+RMD160 c4b2d372ea0021a14027889f221583bfb5900b1e files/espeak-1.19-big-endian.patch 622
+SHA256 fa39adc9133d44952c9b98410cd278526084afda6eef932223da28407bee9893 files/espeak-1.19-big-endian.patch 622
+AUX espeak-1.19-ppc64-segfault.patch 354 RMD160 b29461b997a41043f2b28a8e48fa0ee8d5a316be SHA1 ede6544c87d122037c022ccdd38f82530b871422 SHA256 c1e876365013fcf8ab67e8ed8c0a84e05e700345ab0d4d48c7ee7f34858e057f
+MD5 0ba2b29ae1337deecaa5d0ef9473b27b files/espeak-1.19-ppc64-segfault.patch 354
+RMD160 b29461b997a41043f2b28a8e48fa0ee8d5a316be files/espeak-1.19-ppc64-segfault.patch 354
+SHA256 c1e876365013fcf8ab67e8ed8c0a84e05e700345ab0d4d48c7ee7f34858e057f files/espeak-1.19-ppc64-segfault.patch 354
 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
 DIST espeak-1.19-source.zip 669628 RMD160 a544181d60561e9f2ed8948b31e47b733562e121 SHA1 0f5ed89c99acadd04f664819f986f04b734f0e47 SHA256 32ded8994f317b9f5f12a2ee5fff621acc4770d5906aaccde6d6d97b06568c79
@@ -17,10 +25,10 @@ EBUILD espeak-1.18.ebuild 1198 RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 S
 MD5 0371066906461208a1240dc96534d86f espeak-1.18.ebuild 1198
 RMD160 1f8f3e8b436830ede9b4aff1c2e129e93c5ffba2 espeak-1.18.ebuild 1198
 SHA256 d6d83238e87562d82b9b5aad33e1736dc4e5ac3b66237c5fa337e11e7af5c774 espeak-1.18.ebuild 1198
-EBUILD espeak-1.19.ebuild 1036 RMD160 f79d19a564bd75aec4e0f15199762583b137a552 SHA1 e8cb08eeba651eedcdb10c0683ee4c028b9f38ad SHA256 cf0d9b4d4a6353b865f9efd4d2d376e0c901288422e10272dd0df5b2d9f2369f
-MD5 f1b1258359fbb32a087a3b5b1f25a29b espeak-1.19.ebuild 1036
-RMD160 f79d19a564bd75aec4e0f15199762583b137a552 espeak-1.19.ebuild 1036
-SHA256 cf0d9b4d4a6353b865f9efd4d2d376e0c901288422e10272dd0df5b2d9f2369f espeak-1.19.ebuild 1036
+EBUILD espeak-1.19.ebuild 1206 RMD160 ab95eb1f7113d0c89ff1e0f572d262069d66e466 SHA1 0a06a54d13a61851ba3a4e2d7d29c5310ba8a8b6 SHA256 98fcc7ffae4b3e7c7a3338fefcdf7e7c52d5f04386ee039ed65d63ddd0aeaa14
+MD5 82f98415c411c467442ef75101600aad espeak-1.19.ebuild 1206
+RMD160 ab95eb1f7113d0c89ff1e0f572d262069d66e466 espeak-1.19.ebuild 1206
+SHA256 98fcc7ffae4b3e7c7a3338fefcdf7e7c52d5f04386ee039ed65d63ddd0aeaa14 espeak-1.19.ebuild 1206
 MISC ChangeLog 1118 RMD160 a768570a8d8c683c057fd09ba6c148a55693626c SHA1 bf266c49febf7fa4bb48d653d13f603ee259a23a SHA256 45526990c151d64cf80f5b58a8be148754b04c022f7a05b710fd89e2f5c84426
 MD5 e4029df29eaa13a74e4c5fc50b618959 ChangeLog 1118
 RMD160 a768570a8d8c683c057fd09ba6c148a55693626c ChangeLog 1118

diff --git a/app-accessibility/espeak/espeak-1.19.ebuild b/app-accessibility/espeak/espeak-1.19.ebuild
index 04f6a961efb571238e3a10296defe976cda0718b..ea84f4326f8de91b8e824069b9a24e24bbbc5fae 100644 (file)
--- a/app-accessibility/espeak/espeak-1.19.ebuild
+++ b/app-accessibility/espeak/espeak-1.19.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/app-accessibility/espeak/espeak-1.19.ebuild,v 1.1 2007/01/31 06:00:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.19.ebuild,v 1.2 2007/02/06 06:27:38 williamh Exp $
 
 inherit eutils
 
@@ -30,6 +30,10 @@ src_unpack() {
        if has_version "=media-libs/portaudio-19*" ; then
                mv -f "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
        fi
+       # Apply patch to support big-endian processors
+       epatch ${FILESDIR}/${P}-big-endian.patch
+       # Apply patch for ppc64 segfault
+       epatch ${FILESDIR}/${P}-ppc64-segfault.patch
 }
 
 src_compile() {

diff --git a/app-accessibility/espeak/files/espeak-1.19-big-endian.patch b/app-accessibility/espeak/files/espeak-1.19-big-endian.patch
new file mode 100644 (file)
index 0000000..bf23aca
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.19-big-endian.patch
@@ -0,0 +1,24 @@
+--- src/Makefile       2007-02-05 21:09:47.000000000 -0600
++++ src/Makefile       2007-02-05 22:10:32.000000000 -0600
+@@ -39,9 +39,6 @@
+ LIBS3=-lstdc++ ./libespeak.so
+ 
+ CXXFLAGS=-O2
+-ifeq ($(shell uname -m), ppc)
+-      CXXFLAGS += -D ARCH_BIG
+-endif
+ 
+ 
+ all: $(BIN_NAME) $(LIB_NAME) $(BIN2_NAME)
+--- src/speech.h       2007-02-05 22:06:44.000000000 -0600
++++ src/speech.h       2007-02-05 23:15:02.000000000 -0600
+@@ -31,6 +31,9 @@
+ #define USE_ASYNC
+ #endif
+ 
++#if defined(BYTE_ORDER) && BYTE_ORDER == BIG_ENDIAN
++#define ARCH_BIG
++#endif
+ 
+ // will look for espeak_data directory here, and also in user's home directory
+ #ifndef PATH_ESPEAK_DATA

diff --git a/app-accessibility/espeak/files/espeak-1.19-ppc64-segfault.patch b/app-accessibility/espeak/files/espeak-1.19-ppc64-segfault.patch
new file mode 100644 (file)
index 0000000..ac39760
--- /dev/null
+++ b/app-accessibility/espeak/files/espeak-1.19-ppc64-segfault.patch
@@ -0,0 +1,13 @@
+--- src/speak_lib.cpp   2007-02-01 19:34:01.360979913
++0000
++++ src/speak_lib.cpp        2007-02-01 19:34:13.708979913
++0000
+@@ -238,7 +238,7 @@
+ char *Alloc(int size)
+ {//==================
+   char *p;
+-  if((p = (char *)malloc(size)) == NULL)
++  if((p = (char *)malloc(size+1)) == NULL)
+     fprintf(stderr,"Can't allocate memory\n");
+   return(p);
+ }