From 6f12512d4e72717c3d088925f8ce8aa8e9334a73 Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Wed, 24 Jan 2007 18:52:12 +0000 Subject: Added a couple of patches to fix compilation in parallel, and in amd64. (Portage version: 2.1.2) --- app-accessibility/espeak/ChangeLog | 7 ++- app-accessibility/espeak/espeak-1.18.ebuild | 25 ++++++--- .../espeak/files/espeak-1.18-64bits.patch | 64 ++++++++++++++++++++++ .../espeak/files/espeak-1.18-parallel.patch | 12 ++++ 4 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 app-accessibility/espeak/files/espeak-1.18-64bits.patch create mode 100644 app-accessibility/espeak/files/espeak-1.18-parallel.patch (limited to 'app-accessibility') 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 + +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/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 @@ + //> + //