speech_tools: fix x86_64 build, closing #1427. (#1505)

app-accessibility/speech_tools/patches/speech_tools-2.4.patchset

@@ -1,4 +1,4 @@
-From e6652c7af6115fb1e3465f79fa7344fcb030389e Mon Sep 17 00:00:00 2001
+From cbadc0e1b395e06f42ca18d3b545d79e4ddba44b Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:13:10 -0800
 Subject: Proper compiling routines
@@ -171,10 +171,10 @@ index af07781..71b271c 100644
  # Make sure we actually have a .mak file for it, otherwise fall back
  # to sensible defaults (for example, kernel version and architecture
 -- 
-1.8.3.4
+2.12.2
 
 
-From 0eca7062ef526b969b4bc63a396bf380838369ee Mon Sep 17 00:00:00 2001
+From 516999ab4c8de184d0c6dd4ee468157808ceaa1c Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:14:58 -0800
 Subject: Use datadir for architecure-independent runtime libs
@@ -349,10 +349,10 @@ index c17bab4..62a0de8 100644
 +	$(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIR=\"$(EST_HOME)/lib\" -DESTDATADIR=\"$(EST_HOME)/share\" -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c
  
 -- 
-1.8.3.4
+2.12.2
 
 
-From 30567c705c2e5aaf1c45737ebc409a87e70bf690 Mon Sep 17 00:00:00 2001
+From 67e64e0b2130de880ec28389c89b577ecebee29c Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:17:52 -0800
 Subject: Use standard headers
@@ -377,10 +377,10 @@ index a54a0c5..7807f8a 100644
  #include "EST_model_types.h"
  
 -- 
-1.8.3.4
+2.12.2
 
 
-From a03f11db6ac385ceb2f2897214e56fec6a477eff Mon Sep 17 00:00:00 2001
+From 6969349755bb2c3a8037d9f956a07ba44d7bb7c3 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:19:24 -0800
 Subject: Force the use of actual template of EST_TIterator
@@ -412,10 +412,10 @@ index 7ce188e..832e8e3 100644
    /// Create an iterator not associated with any specific container.
    EST_TRwStructIterator() {this->cont=NULL;}
 -- 
-1.8.3.4
+2.12.2
 
 
-From 5a0d0a6091371c358a47f4a6c14eadbd300b1ac0 Mon Sep 17 00:00:00 2001
+From b5d411d7f459c8026eb83f96fe1ed51f02537b7c Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:22:25 -0800
 Subject: Modify data loading memory management to avoid crashes
@@ -443,10 +443,10 @@ index ba8a362..7f07a31 100644
      }
  
 -- 
-1.8.3.4
+2.12.2
 
 
-From 2a470daf58bcebc49461b08c678bb4dd694adf1b Mon Sep 17 00:00:00 2001
+From 7db80adc82bb793078b2a4a90ded4fa4a2024dd3 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:24:19 -0800
 Subject: Use 3-clause BSD license for the files derived from BSD
@@ -508,10 +508,10 @@ index 578c968..8b310ae 100644
   *    without specific prior written permission.
   *
 -- 
-1.8.3.4
+2.12.2
 
 
-From 3de08ae8da37beb2665fb8a256311315f5edd31c Mon Sep 17 00:00:00 2001
+From 9f0186790e87491d73eae5969b3772edd2f956ee Mon Sep 17 00:00:00 2001
 From: Sergio Oller <sergioller@gmail.com>
 Date: Thu, 25 Dec 2014 14:33:54 -0800
 Subject: Seeking and reading interface to istreams in EST_TokenStream
@@ -563,10 +563,10 @@ index 4287d19..533467d 100644
  	if ((buffer_length-pos)/size < nitems)
  	    items_read = (buffer_length-pos)/size;
 -- 
-1.8.3.4
+2.12.2
 
 
-From 1a4805cb16dd6d322b8736c0846748f1bf8fa2f0 Mon Sep 17 00:00:00 2001
+From 57cf7be3c400c95b680605a373b5decdb09388b9 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:48:11 -0800
 Subject: Add ALAW support
@@ -1076,10 +1076,10 @@ index b656ff3..fa4aee1 100644
  -scale <float> Scaling factor. Increase or descrease the amplitude
      of the whole waveform by the factor given
 -- 
-1.8.3.4
+2.12.2
 
 
-From 77a6c8d1f2fa93c2809ede4833d21e19b757df14 Mon Sep 17 00:00:00 2001
+From 0afdb15c90ebd9dd43976991eec12f6565aaa011 Mon Sep 17 00:00:00 2001
 From: Sergio Oller <sergioller@gmail.com>
 Date: Thu, 25 Dec 2014 14:48:54 -0800
 Subject: Allow saving wave files in parts
@@ -2301,10 +2301,10 @@ index 9af6096..406e4b1 100644
 +
  #endif /* __EST_WAVEP_H__ */
 -- 
-1.8.3.4
+2.12.2
 
 
-From cbb58d2c46f59b918f8bae060db2e7d2846edcca Mon Sep 17 00:00:00 2001
+From d1abb3502dfbb1c2236460fed8063839d68a0424 Mon Sep 17 00:00:00 2001
 From: Sergio Oller <sergioller@gmail.com>
 Date: Thu, 25 Dec 2014 14:50:41 -0800
 Subject: Allow writing ALAW files in parts
@@ -2427,10 +2427,10 @@ index 406e4b1..aa78512 100644
  	 *num_samples, int *num_channels, int *word_size, int
  	 *sample_rate,  enum EST_sample_type_t *sample_type, int *bo, int
 -- 
-1.8.3.4
+2.12.2
 
 
-From 22e096d3b4122b80cce76b203fcdb8d2e75413ca Mon Sep 17 00:00:00 2001
+From b67bbc285178a51b15e51a13295647c2d8bda1bd Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:52:30 -0800
 Subject: Check all fread() calls
@@ -2621,10 +2621,10 @@ index 1bdaf4f..d3a35f0 100644
  	sizeof(struct audlabsh) +
  	    sizeof(struct audlabsd);
 -- 
-1.8.3.4
+2.12.2
 
 
-From 644690fc0c8e45fe5c58caa9bd928eedb178fa49 Mon Sep 17 00:00:00 2001
+From 921d066c84a2f69bc4b04dbbd68ce2b1a5941d64 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 14:55:07 -0800
 Subject: Fix a few memory handling bugs
@@ -2690,10 +2690,10 @@ index f151888..89d3d74 100644
      }
  
 -- 
-1.8.3.4
+2.12.2
 
 
-From cd3aafe3b063606879972e54ac73108553ec4021 Mon Sep 17 00:00:00 2001
+From 6626a041733d52e7a449a21a45a4e05e33357bfe Mon Sep 17 00:00:00 2001
 From: Sergio Oller <sergioller@gmail.com>
 Date: Thu, 25 Dec 2014 14:56:46 -0800
 Subject: Allow `-pc longest` in lower case
@@ -2716,10 +2716,10 @@ index 3e74a12..e7859ac 100644
  		    sig.resize(sigload.num_samples());
  		else /* "first" or sig is longer */
 -- 
-1.8.3.4
+2.12.2
 
 
-From 295c71122265d274429dd6712323d8f624a712fa Mon Sep 17 00:00:00 2001
+From 78ed2a2abe0755c57d79ec413f67b33659ebf8d3 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 15:27:31 -0800
 Subject: Add Haiku configurations
@@ -2882,10 +2882,10 @@ index 0000000..3822625
 +include $(EST)/config/systems/Haiku.mak
 +
 -- 
-1.8.3.4
+2.12.2
 
 
-From ce49b8a8bf93cf694281be2e979ec58c3950635e Mon Sep 17 00:00:00 2001
+From 657bc1ff9380b9291fd9feb178fff4bcd15bdad7 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 15:30:42 -0800
 Subject: Haiku-specific configuration
@@ -2924,10 +2924,10 @@ index 15d563e..e7e6a65 100644
  # Language specific includes should be set to correct site paths
  CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/
 -- 
-1.8.3.4
+2.12.2
 
 
-From a88060a26c29c6f61b6e18824d0164f82456c6ac Mon Sep 17 00:00:00 2001
+From 1db89598020655f47d6b7ebda9e73adc0138d30d Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Thu, 25 Dec 2014 16:30:07 -0800
 Subject: Add missing library major version
@@ -2946,10 +2946,10 @@ index 2578fc1..11884c5 100644
  PROJECT_STATE = release
  
 -- 
-1.8.3.4
+2.12.2
 
 
-From f50c1e621e9d510f475032474438b2df97ac07a0 Mon Sep 17 00:00:00 2001
+From 7ceef872a108b54c3c27af47684dfb27670bcf79 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Fri, 26 Dec 2014 02:35:24 +0000
 Subject: config/system.sh: Use `uname -p` for machine type
@@ -2973,9 +2973,10 @@ index 71b271c..b7ac4a1 100644
  	    -e 's/ip[0-9]*/ip/'\
  	    -e 's/ /_/g'\
 -- 
-1.8.3.4
+2.12.2
 
-From d1dec5aa5d0de6e3f83fcf1ad07b2486a5f62e63 Mon Sep 17 00:00:00 2001
+
+From 52ee1ccb6c7b7c87fc72096132018ea3f4789b83 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Fri, 26 Dec 2014 23:17:23 -0800
 Subject: Remove -lstdc++ from linking command
@@ -3011,5 +3012,19 @@ index befcd31..0be771d 100644
  ## special ways of doing things, blank means default
  
 -- 
-1.8.3.4
+2.12.2
+
+
+From a9da8e35a553a66269473ca594593a878fa4ce8f Mon Sep 17 00:00:00 2001
+From: Philippe Houdoin <philippe.houdoin@gmail.com>
+Date: Mon, 10 Jul 2017 15:31:17 +0000
+Subject: Haiku: fix x86_64 build
+
+
+diff --git a/config/systems/x86_64_Haiku.mak b/config/systems/ix86_64_Haiku.mak
+similarity index 100%
+rename from config/systems/x86_64_Haiku.mak
+rename to config/systems/ix86_64_Haiku.mak
+-- 
+2.12.2
 

app-accessibility/speech_tools/speech_tools-2.4.recipe

@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SOURCE_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz"
 CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010"
 SOURCE_DIR="speech_tools"
-REVISION="3"
+REVISION="4"
 
 # Although individually many files have different licenses, as a whole this
 # license covers all the files.
@@ -28,7 +28,7 @@ COPYRIGHT="
 	1999-2003 Language Technologies Institute, Carnegie Mellon University
 	"
 
-ARCHITECTURES="!x86_gcc2 x86 !x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
 
 PROVIDES="