[arch-commits] Commit in festival/repos/extra-x86_64 (10 files)

Jelle van der Waa jelle at archlinux.org
Sun Sep 13 12:59:12 UTC 2020


    Date: Sunday, September 13, 2020 @ 12:59:12
  Author: jelle
Revision: 395990

archrelease: copy trunk to extra-x86_64

Added:
  festival/repos/extra-x86_64/PKGBUILD
    (from rev 395989, festival/trunk/PKGBUILD)
  festival/repos/extra-x86_64/festconfig.patch
    (from rev 395989, festival/trunk/festconfig.patch)
  festival/repos/extra-x86_64/festival-2.5.0-compile.patch
    (from rev 395989, festival/trunk/festival-2.5.0-compile.patch)
  festival/repos/extra-x86_64/festival-shared-build.patch
    (from rev 395989, festival/trunk/festival-shared-build.patch)
  festival/repos/extra-x86_64/speechconfig.patch
    (from rev 395989, festival/trunk/speechconfig.patch)
Deleted:
  festival/repos/extra-x86_64/PKGBUILD
  festival/repos/extra-x86_64/festconfig.patch
  festival/repos/extra-x86_64/festival-2.5.0-compile.patch
  festival/repos/extra-x86_64/festival-shared-build.patch
  festival/repos/extra-x86_64/speechconfig.patch

------------------------------+
 PKGBUILD                     |  277 ++++++++++++++++++++---------------------
 festconfig.patch             |  168 ++++++++++++------------
 festival-2.5.0-compile.patch |   24 +--
 festival-shared-build.patch  |  144 ++++++++++-----------
 speechconfig.patch           |  242 +++++++++++++++++------------------
 5 files changed, 428 insertions(+), 427 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-13 12:58:59 UTC (rev 395989)
+++ PKGBUILD	2020-09-13 12:59:12 UTC (rev 395990)
@@ -1,138 +0,0 @@
-# Maintainer:
-# Contributor: netcrusher < tobias AT miglix DOT eu >
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Simo Leone <neotuli at gmail.com>
-
-pkgname=festival
-pkgver=2.5.0
-pkgrel=3
-pkgdesc="A general multi-lingual speech synthesis system"
-arch=(x86_64)
-url="http://festvox.org/festival/"
-license=(BSD GPL custom)
-depends=(perl alsa-lib)
-options=('!makeflags')
-source=(http://festvox.org/packed/festival/${pkgver%.*}/festival-$pkgver-release.tar.gz
-        http://festvox.org/packed/festival/${pkgver%.*}/speech_tools-$pkgver-release.tar.gz
-        http://festvox.org/packed/festival/${pkgver%.*}/festlex_CMU.tar.gz
-        http://festvox.org/packed/festival/${pkgver%.*}/festlex_OALD.tar.gz
-        http://festvox.org/packed/festival/${pkgver%.*}/festlex_POSLEX.tar.gz
-        speechconfig.patch
-        festconfig.patch
-        festival-shared-build.patch
-        festival-2.5.0-compile.patch)
-sha512sums=('529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1'
-            '013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7'
-            'c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b'
-            'dc7ec5db71ef331f4c4460a741392d548e037369d47080dc734e912aa312bd5c11e66cdcb94bdc4746a3f6c16c0e0294ce159f07b46e350b85c0afab07cc2064'
-            'd7f96621fd98bcd3c84f0188fc6ac5a006e2cbb535279693be3341d51148344360f68e67962f08c4041df1e3527de9b30705b13fb9859ad91e3c804704eb5348'
-            'd48f899826914a94efcf4005d0e029cebd577ad2c4feb3e1af2e094259e9ca5a5829a6b5c08f22900049c6032ade926af159200d55613cc8d4f3d17e579edd3a'
-            'a3d92ae83bf4b55e9bc83469b85eb1540675c3ed06b9bffa8f99a8a0c4fbdb0cb3fc1abe8c8a4fa5b2c22c77d84bbca36b6b2db3ae0e5ef2d7ddfa214a049372'
-            'cd14a06e7eaef8755be08635a6354380c0cd67e533d1ec908413f4096b271c5594c054499d016ec4d255180288a68b55d24b891e06e5d04595e3004f2bb62d49'
-            '1e00f531710eb7bb4d7fcfd48f53a485023d37a068cfc87323df1fcfd8c358ca3dce21e261dfc73c5a9d724da64f60ea4fca46656215e1cc5055d4f038110567')
-
-prepare() {
-  patch -Np0 -i speechconfig.patch
-  patch -Np0 -i festconfig.patch
-
-  # build shared libs - taken from Mageia
-  patch -Np0 -i festival-shared-build.patch
-
-  patch -p0 -i festival-2.5.0-compile.patch # Fix build (OpenMandriva)
-
-  # Avoid make failure on making scripts and docs
-  sed -i "s|examples bin doc|examples|" festival/Makefile
-}
-
-build() {
-  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-
-  # Build Speech Tools first
-  cd speech_tools
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
-
-  # Build Festival itself
-  cd ../festival
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
-}
-
-package() {
-  # Install Speech Tools first
-  cd speech_tools
-  install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
-
-  #binaries
-  #move binaries over wrappers (FS#7864)
-  for i in $(grep -l 'EST shared script' bin/*); do
-    cp -f main/$(basename $i) bin;
-  done
-  install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
-  rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
-
-  #libraries
-  install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
-  ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
-  ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
-  ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
-
-  #headers
-  for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
-    install -m644 -t "$pkgdir"/usr/include/speech_tools/$dir include/$dir/*.h
-  done
-
-  # Install Festival itself
-  cd "$srcdir"/festival
-
-  #binaries
-  install -m755 src/main/festival "$pkgdir"/usr/bin/
-  install -m755 src/main/festival_client "$pkgdir"/usr/bin/
-  install -m755 examples/benchmark "$pkgdir"/usr/bin/
-  install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
-  install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
-  install -m755 examples/latest "$pkgdir"/usr/bin/
-  install -m755 examples/make_utts "$pkgdir"/usr/bin/
-  install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
-  install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
-  install -m755 examples/saytime "$pkgdir"/usr/bin/
-  install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
-  install -m755 examples/text2pos "$pkgdir"/usr/bin/
-  install -m755 examples/text2wave "$pkgdir"/usr/bin
-
-  #libraries
-  install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
-  ln -sf libFestival.so.2.5.0.0 "$pkgdir"/usr/lib/libFestival.so
-
-  #headers
-  install -dm755 "$pkgdir"/usr/include/festival
-  install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
-
-  mkdir -p "$pkgdir"/usr/share/festival
-  cp -aR lib/* "$pkgdir"/usr/share/festival
-  rm -fv $(find "$pkgdir"/usr/share/festival -name Makefile)
-  rm -fv $(find "$pkgdir"/usr/bin -name Makefile)
-
-  #create voices directory
-  install -dm755 "$pkgdir"/usr/share/festival/voices
-
-  #licenses
-  install -D -m644 "$srcdir"/festival/COPYING \
-    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  install -D -m644 "$srcdir"/speech_tools/README.md \
-    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
-
-  # Ok now some general cleanups
-  for i in $(find "$pkgdir"/usr/include/ -type f); do
-    sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-      -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-      -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
-      -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g' \
-      -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \
-      -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \
-      -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \
-      -e 's,"festival\.h",\<festival/festival.h\>,g' \
-      -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \
-      -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i
-  done
-}

Copied: festival/repos/extra-x86_64/PKGBUILD (from rev 395989, festival/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-13 12:59:12 UTC (rev 395990)
@@ -0,0 +1,139 @@
+# Maintainer:
+# Contributor: netcrusher < tobias AT miglix DOT eu >
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Simo Leone <neotuli at gmail.com>
+
+pkgname=festival
+pkgver=2.5.0
+pkgrel=4
+pkgdesc="A general multi-lingual speech synthesis system"
+arch=(x86_64)
+url="http://festvox.org/festival/"
+license=(BSD GPL custom)
+depends=(perl alsa-lib)
+options=('!makeflags')
+source=(http://festvox.org/packed/festival/${pkgver%.*}/festival-$pkgver-release.tar.gz
+        http://festvox.org/packed/festival/${pkgver%.*}/speech_tools-$pkgver-release.tar.gz
+        http://festvox.org/packed/festival/${pkgver%.*}/festlex_CMU.tar.gz
+        http://festvox.org/packed/festival/${pkgver%.*}/festlex_OALD.tar.gz
+        http://festvox.org/packed/festival/${pkgver%.*}/festlex_POSLEX.tar.gz
+        speechconfig.patch
+        festconfig.patch
+        festival-shared-build.patch
+        festival-2.5.0-compile.patch)
+sha512sums=('529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1'
+            '013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7'
+            'c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b'
+            'dc7ec5db71ef331f4c4460a741392d548e037369d47080dc734e912aa312bd5c11e66cdcb94bdc4746a3f6c16c0e0294ce159f07b46e350b85c0afab07cc2064'
+            'd7f96621fd98bcd3c84f0188fc6ac5a006e2cbb535279693be3341d51148344360f68e67962f08c4041df1e3527de9b30705b13fb9859ad91e3c804704eb5348'
+            'd48f899826914a94efcf4005d0e029cebd577ad2c4feb3e1af2e094259e9ca5a5829a6b5c08f22900049c6032ade926af159200d55613cc8d4f3d17e579edd3a'
+            'a3d92ae83bf4b55e9bc83469b85eb1540675c3ed06b9bffa8f99a8a0c4fbdb0cb3fc1abe8c8a4fa5b2c22c77d84bbca36b6b2db3ae0e5ef2d7ddfa214a049372'
+            'cd14a06e7eaef8755be08635a6354380c0cd67e533d1ec908413f4096b271c5594c054499d016ec4d255180288a68b55d24b891e06e5d04595e3004f2bb62d49'
+            '1e00f531710eb7bb4d7fcfd48f53a485023d37a068cfc87323df1fcfd8c358ca3dce21e261dfc73c5a9d724da64f60ea4fca46656215e1cc5055d4f038110567')
+
+prepare() {
+  patch -Np0 -i speechconfig.patch
+  patch -Np0 -i festconfig.patch
+
+  # build shared libs - taken from Mageia
+  patch -Np0 -i festival-shared-build.patch
+
+  patch -p0 -i festival-2.5.0-compile.patch # Fix build (OpenMandriva)
+
+  # Avoid make failure on making scripts and docs
+  sed -i "s|examples bin doc|examples|" festival/Makefile
+}
+
+build() {
+  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+
+  # Build Speech Tools first
+  cd speech_tools
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+
+  # Build Festival itself
+  cd ../festival
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+}
+
+package() {
+  # Install Speech Tools first
+  cd speech_tools
+  install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
+
+  #binaries
+  #move binaries over wrappers (FS#7864)
+  for i in $(grep -l 'EST shared script' bin/*); do
+    cp -f main/$(basename $i) bin;
+  done
+  install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
+  rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
+
+  #libraries
+  install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
+  ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
+  ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
+  ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
+
+  #headers
+  for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
+    install -m644 -t "$pkgdir"/usr/include/speech_tools/$dir include/$dir/*.h
+  done
+
+  # Install Festival itself
+  cd "$srcdir"/festival
+
+  #binaries
+  install -m755 src/main/festival "$pkgdir"/usr/bin/
+  install -m755 src/main/festival_client "$pkgdir"/usr/bin/
+  install -m755 examples/benchmark "$pkgdir"/usr/bin/
+  install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
+  install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
+  install -m755 examples/latest "$pkgdir"/usr/bin/
+  install -m755 examples/make_utts "$pkgdir"/usr/bin/
+  install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
+  install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
+  install -m755 examples/saytime "$pkgdir"/usr/bin/
+  install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
+  install -m755 examples/text2pos "$pkgdir"/usr/bin/
+  install -m755 examples/text2wave "$pkgdir"/usr/bin
+  install -m755 examples/text2utt "$pkgdir"/usr/bin
+
+  #libraries
+  install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
+  ln -sf libFestival.so.2.5.0.0 "$pkgdir"/usr/lib/libFestival.so
+
+  #headers
+  install -dm755 "$pkgdir"/usr/include/festival
+  install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
+
+  mkdir -p "$pkgdir"/usr/share/festival
+  cp -aR lib/* "$pkgdir"/usr/share/festival
+  rm -fv $(find "$pkgdir"/usr/share/festival -name Makefile)
+  rm -fv $(find "$pkgdir"/usr/bin -name Makefile)
+
+  #create voices directory
+  install -dm755 "$pkgdir"/usr/share/festival/voices
+
+  #licenses
+  install -D -m644 "$srcdir"/festival/COPYING \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 "$srcdir"/speech_tools/README.md \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
+
+  # Ok now some general cleanups
+  for i in $(find "$pkgdir"/usr/include/ -type f); do
+    sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
+      -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
+      -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
+      -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g' \
+      -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \
+      -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \
+      -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \
+      -e 's,"festival\.h",\<festival/festival.h\>,g' \
+      -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \
+      -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i
+  done
+}

Deleted: festconfig.patch
===================================================================
--- festconfig.patch	2020-09-13 12:58:59 UTC (rev 395989)
+++ festconfig.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -1,84 +0,0 @@
-diff -Nru festival.orig/config/config.in festival/config/config.in
---- festival.orig/config/config.in	2004-06-21 15:52:42.000000000 -0500
-+++ festival/config/config.in	2005-05-30 19:50:45.000000000 -0500
-@@ -20,7 +20,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
- 
--FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
-+FESTIVAL_HOME := /usr
- 
- ###########################################################################
- ## Feature selection.
-diff -Nru festival.orig/config/project.mak festival/config/project.mak
---- festival.orig/config/project.mak	2004-07-12 10:39:37.000000000 -0500
-+++ festival/config/project.mak	2005-05-30 19:50:45.000000000 -0500
-@@ -112,6 +112,5 @@
- DOCXX_DIRS = $(TOP)/src 
- MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl
- 
--FTLIBDIR = $(FESTIVAL_HOME)/lib 
--
-+FTLIBDIR = /usr/share/festival
- 
-diff -Nru festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
---- festival.orig/config/systems/Linux.mak	2001-04-04 06:55:32.000000000 -0500
-+++ festival/config/systems/Linux.mak	2005-05-30 19:51:28.000000000 -0500
-@@ -40,13 +40,13 @@
- 
- include $(EST)/config/systems/default.mak
- 
--DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
-+DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
- JAVA=/usr/bin/java
- JAVAC=/usr/bin/javac
- JAVAH=/usr/bin/javah
- 
- TCL_LIBRARY = -ltcl
--OS_LIBS = -ldl 
-+OS_LIBS = -ldl -lncurses 
- 
- ## the native audio module for this type of system
- NATIVE_AUDIO_MODULE = LINUX16
-diff -Nru festival.orig/config/systems/default.mak festival/config/systems/default.mak
---- festival.orig/config/systems/default.mak	2001-04-04 06:55:32.000000000 -0500
-+++ festival/config/systems/default.mak	2005-05-30 19:50:45.000000000 -0500
-@@ -40,7 +40,7 @@
- ###########################################################################
- ## Installation directories
- 
--INSTALL_PREFIX=/usr/local
-+INSTALL_PREFIX=/usr
- 
- BINDIR=$(INSTALL_PREFIX)/bin
- LIBDIR=$(INSTALL_PREFIX)/lib
-@@ -63,8 +63,8 @@
- ###########################################################################
- ## Where to find Enlightenment Speech Demon
- 
--ESD_INCLUDE = /usr/local/include
--ESD_LIB = /usr/local/lib
-+ESD_INCLUDE = /usr/include
-+ESD_LIB = /usr/lib
- 
- ###########################################################################
- ## Where to find X11
-@@ -75,14 +75,14 @@
- ###########################################################################
- ## TCL support
- 
--TCL_INCLUDE = /usr/local/include
--TCL_LIB     = /usr/local/lib
--TCL_LIBRARY = -ltcl7.6
-+TCL_INCLUDE = /usr/include
-+TCL_LIB     = /usr/lib
-+TCL_LIBRARY = -ltcl
- 
- ###########################################################################
- ## Efence library for malloc debugging
- 
--EFENCE_LIB = /usr/local/lib
-+EFENCE_LIB = /usr/lib
- 
- ###########################################################################
- ## Commands.

Copied: festival/repos/extra-x86_64/festconfig.patch (from rev 395989, festival/trunk/festconfig.patch)
===================================================================
--- festconfig.patch	                        (rev 0)
+++ festconfig.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -0,0 +1,84 @@
+diff -Nru festival.orig/config/config.in festival/config/config.in
+--- festival.orig/config/config.in	2004-06-21 15:52:42.000000000 -0500
++++ festival/config/config.in	2005-05-30 19:50:45.000000000 -0500
+@@ -20,7 +20,7 @@
+ ## You may need to set this explicitly if automounter or NFS
+ ## side effects cause problems
+ 
+-FESTIVAL_HOME := $(shell (cd $(TOP); pwd))
++FESTIVAL_HOME := /usr
+ 
+ ###########################################################################
+ ## Feature selection.
+diff -Nru festival.orig/config/project.mak festival/config/project.mak
+--- festival.orig/config/project.mak	2004-07-12 10:39:37.000000000 -0500
++++ festival/config/project.mak	2005-05-30 19:50:45.000000000 -0500
+@@ -112,6 +112,5 @@
+ DOCXX_DIRS = $(TOP)/src 
+ MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl
+ 
+-FTLIBDIR = $(FESTIVAL_HOME)/lib 
+-
++FTLIBDIR = /usr/share/festival
+ 
+diff -Nru festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
+--- festival.orig/config/systems/Linux.mak	2001-04-04 06:55:32.000000000 -0500
++++ festival/config/systems/Linux.mak	2005-05-30 19:51:28.000000000 -0500
+@@ -40,13 +40,13 @@
+ 
+ include $(EST)/config/systems/default.mak
+ 
+-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
+ 
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl 
++OS_LIBS = -ldl -lncurses 
+ 
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16
+diff -Nru festival.orig/config/systems/default.mak festival/config/systems/default.mak
+--- festival.orig/config/systems/default.mak	2001-04-04 06:55:32.000000000 -0500
++++ festival/config/systems/default.mak	2005-05-30 19:50:45.000000000 -0500
+@@ -40,7 +40,7 @@
+ ###########################################################################
+ ## Installation directories
+ 
+-INSTALL_PREFIX=/usr/local
++INSTALL_PREFIX=/usr
+ 
+ BINDIR=$(INSTALL_PREFIX)/bin
+ LIBDIR=$(INSTALL_PREFIX)/lib
+@@ -63,8 +63,8 @@
+ ###########################################################################
+ ## Where to find Enlightenment Speech Demon
+ 
+-ESD_INCLUDE = /usr/local/include
+-ESD_LIB = /usr/local/lib
++ESD_INCLUDE = /usr/include
++ESD_LIB = /usr/lib
+ 
+ ###########################################################################
+ ## Where to find X11
+@@ -75,14 +75,14 @@
+ ###########################################################################
+ ## TCL support
+ 
+-TCL_INCLUDE = /usr/local/include
+-TCL_LIB     = /usr/local/lib
+-TCL_LIBRARY = -ltcl7.6
++TCL_INCLUDE = /usr/include
++TCL_LIB     = /usr/lib
++TCL_LIBRARY = -ltcl
+ 
+ ###########################################################################
+ ## Efence library for malloc debugging
+ 
+-EFENCE_LIB = /usr/local/lib
++EFENCE_LIB = /usr/lib
+ 
+ ###########################################################################
+ ## Commands.

Deleted: festival-2.5.0-compile.patch
===================================================================
--- festival-2.5.0-compile.patch	2020-09-13 12:58:59 UTC (rev 395989)
+++ festival-2.5.0-compile.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -1,12 +0,0 @@
---- festival/src/modules/clustergen/HTS_vocoder_me.cc.omv~	2017-12-28 22:12:57.990128926 +0100
-+++ festival/src/modules/clustergen/HTS_vocoder_me.cc	2017-12-28 22:16:12.636790019 +0100
-@@ -91,6 +91,9 @@
- HTS_VOCODER_ME_C_START;
- 
- #include "./HTS_vocoder_me.h"
-+#define HTS_Vocoder_initialize HTS_Vocoder_initialize_nodupes
-+#define HTS_Vocoder_synthesize HTS_Vocoder_synthesize_nodupes
-+#define HTS_Vocoder_clear HTS_Vocoder_clear_nodupes
- #include "../hts_engine/HTS_vocoder.c"
- 
- /* HTS_Vocoder_initialize_me: initialize vocoder (mixed excitation) */

Copied: festival/repos/extra-x86_64/festival-2.5.0-compile.patch (from rev 395989, festival/trunk/festival-2.5.0-compile.patch)
===================================================================
--- festival-2.5.0-compile.patch	                        (rev 0)
+++ festival-2.5.0-compile.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -0,0 +1,12 @@
+--- festival/src/modules/clustergen/HTS_vocoder_me.cc.omv~	2017-12-28 22:12:57.990128926 +0100
++++ festival/src/modules/clustergen/HTS_vocoder_me.cc	2017-12-28 22:16:12.636790019 +0100
+@@ -91,6 +91,9 @@
+ HTS_VOCODER_ME_C_START;
+ 
+ #include "./HTS_vocoder_me.h"
++#define HTS_Vocoder_initialize HTS_Vocoder_initialize_nodupes
++#define HTS_Vocoder_synthesize HTS_Vocoder_synthesize_nodupes
++#define HTS_Vocoder_clear HTS_Vocoder_clear_nodupes
+ #include "../hts_engine/HTS_vocoder.c"
+ 
+ /* HTS_Vocoder_initialize_me: initialize vocoder (mixed excitation) */

Deleted: festival-shared-build.patch
===================================================================
--- festival-shared-build.patch	2020-09-13 12:58:59 UTC (rev 395989)
+++ festival-shared-build.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -1,72 +0,0 @@
---- speech_tools/config/rules/defaults.mak.orig	2007-03-16 12:39:12.000000000 -0400
-+++ speech_tools/config/rules/defaults.mak	2007-03-16 12:39:19.000000000 -0400
-@@ -69,15 +69,21 @@
- 	MADE_FROM_ABOVE:=$(N)
- endif
- 
-+ifneq ($(SHARED),0)
-+    LIBTYPE=so
-+else
-+    LIBTYPE=a   
-+endif
-+
- ifndef PROJECT_LIBDEPS
--    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a)
-+    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
- endif
- ifndef PROJECT_LIBS
-     PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
- endif
- 
- ifndef REQUIRED_LIBDEPS
--    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a)
-+    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
- endif
- ifndef REQUIRED_LIBS
-     REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))
---- festival/config/project.mak.orig	2007-03-16 13:01:40.000000000 -0400
-+++ festival/config/project.mak	2007-03-16 13:02:24.000000000 -0400
-@@ -83,6 +83,8 @@
- PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib
- PROJECT_DEFAULT_LIBRARY = Festival
- 
-+PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0
-+
- # Libraries used from other projects
- 
- REQUIRED_LIBRARIES = estools estbase eststring
-diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
---- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
-+++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
-@@ -83,7 +83,7 @@ SHARED_CXXFLAGS  = -fPIC
- ifndef GCC_MAKE_SHARED_LIB
- # Older versions of gcc might have required -fno-shared-data
- #    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
--    MAKE_SHARED_LIB = $(CXX) -shared -o XXX
-+    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
-diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
---- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
-@@ -103,14 +103,14 @@ endif
-  ###########################################################################
- 
- lib%.so : lib%.a
--	@echo Make Shared Library $*
-+	@echo Make Shared Library $(*F)
- 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
- 	@(cd shared_space ; $(AR) x ../$< ) 
--	@echo Link Shared Library $*
--	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
--	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
-+	@echo Link Shared Library $(*F)
-+	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
-+	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
- 	@$(RM) -f shared_space/*.o $@
--	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
-+	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
- 
-  ###########################################################################
-  ##                                                                       ##

Copied: festival/repos/extra-x86_64/festival-shared-build.patch (from rev 395989, festival/trunk/festival-shared-build.patch)
===================================================================
--- festival-shared-build.patch	                        (rev 0)
+++ festival-shared-build.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -0,0 +1,72 @@
+--- speech_tools/config/rules/defaults.mak.orig	2007-03-16 12:39:12.000000000 -0400
++++ speech_tools/config/rules/defaults.mak	2007-03-16 12:39:19.000000000 -0400
+@@ -69,15 +69,21 @@
+ 	MADE_FROM_ABOVE:=$(N)
+ endif
+ 
++ifneq ($(SHARED),0)
++    LIBTYPE=so
++else
++    LIBTYPE=a   
++endif
++
+ ifndef PROJECT_LIBDEPS
+-    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a)
++    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
+ endif
+ ifndef PROJECT_LIBS
+     PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
+ endif
+ 
+ ifndef REQUIRED_LIBDEPS
+-    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a)
++    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
+ endif
+ ifndef REQUIRED_LIBS
+     REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))
+--- festival/config/project.mak.orig	2007-03-16 13:01:40.000000000 -0400
++++ festival/config/project.mak	2007-03-16 13:02:24.000000000 -0400
+@@ -83,6 +83,8 @@
+ PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib
+ PROJECT_DEFAULT_LIBRARY = Festival
+ 
++PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0
++
+ # Libraries used from other projects
+ 
+ REQUIRED_LIBRARIES = estools estbase eststring
+diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
+--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
++++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
+@@ -83,7 +83,7 @@ SHARED_CXXFLAGS  = -fPIC
+ ifndef GCC_MAKE_SHARED_LIB
+ # Older versions of gcc might have required -fno-shared-data
+ #    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
+-    MAKE_SHARED_LIB = $(CXX) -shared -o XXX
++    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
+ else
+     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
+--- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
+@@ -103,14 +103,14 @@ endif
+  ###########################################################################
+ 
+ lib%.so : lib%.a
+-	@echo Make Shared Library $*
++	@echo Make Shared Library $(*F)
+ 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
+ 	@(cd shared_space ; $(AR) x ../$< ) 
+-	@echo Link Shared Library $*
+-	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
+-	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
++	@echo Link Shared Library $(*F)
++	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
++	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
+ 	@$(RM) -f shared_space/*.o $@
+-	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
++	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
+ 
+  ###########################################################################
+  ##                                                                       ##

Deleted: speechconfig.patch
===================================================================
--- speechconfig.patch	2020-09-13 12:58:59 UTC (rev 395989)
+++ speechconfig.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -1,121 +0,0 @@
-diff -aur speech_tools.old//config/compilers/jdk.mak speech_tools/config/compilers/jdk.mak
---- speech_tools.old//config/compilers/jdk.mak	2001-04-04 19:55:32.000000000 +0800
-+++ speech_tools/config/compilers/jdk.mak	2010-12-08 12:14:56.076668109 +0800
-@@ -52,7 +52,7 @@
- endif
- endif
- 
--JAVAFLAGS = -depend
-+JAVAFLAGS =
- 
- DEBUG_JAVAFLAGS = -g
- 
-diff -aur speech_tools.old//config/config.in speech_tools/config/config.in
---- speech_tools.old//config/config.in	2008-10-29 03:20:49.000000000 +0800
-+++ speech_tools/config/config.in	2010-12-08 12:17:50.110001443 +0800
-@@ -15,7 +15,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
- 
--EST_HOME := $(shell (cd $(EST); pwd))
-+EST_HOME := /usr
- 
- ###########################################################################
- ## System type. 
-@@ -28,14 +28,14 @@
- ## 
- ## Examples: sparc_SunOS5 intel_Linux2.0
- 
--SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
-+SYSTEM_TYPE=Linux
- 
- ###########################################################################
- ## Compiler.
- ## The definitions are in compilers/$(COMPILER).mak
- ## Examples: gcc suncc egcs gcc28
- 
--COMPILER=@COMPILERTYPE@
-+COMPILER=gcc
- 
- ###########################################################################
- ## Java system to use if you include the Java interface.
-@@ -61,7 +61,7 @@
- # VERBOSE=1
- #DEBUG=1
- # PROFILE=gprof
--#SHARED=2
-+SHARED=2
- 
- ## Directory specific selections which override the above
- 
-@@ -98,7 +98,7 @@
- ## It may not work under all systems, so may be optionally omitted.
- INCLUDE_MODULES += EDITLINE
- 
--TERMCAPLIB = @TERMCAPLIB@
-+TERMCAPLIB = 
- # speech recognition
- #INCLUDE_MODULES += ASR
- 
-Only in speech_tools/config: config.in.orig
-diff -aur speech_tools.old//config/systems/default.mak speech_tools/config/systems/default.mak
---- speech_tools.old//config/systems/default.mak	2005-07-17 21:06:49.000000000 +0800
-+++ speech_tools/config/systems/default.mak	2010-12-08 12:14:56.076668109 +0800
-@@ -40,7 +40,7 @@
- ###########################################################################
- ## Installation directories
- 
--INSTALL_PREFIX=/usr/local
-+INSTALL_PREFIX=/usr
- 
- BINDIR=$(INSTALL_PREFIX)/bin
- LIBDIR=$(INSTALL_PREFIX)/lib
-@@ -63,8 +63,8 @@
- ###########################################################################
- ## Where to find Enlightenment Speech Demon
- 
--ESD_INCLUDE = /usr/local/include
--ESD_LIB = /usr/local/lib
-+ESD_INCLUDE = /usr/include
-+ESD_LIB = /usr/lib
- 
- ###########################################################################
- ## Where to find X11
-@@ -75,14 +75,14 @@
- ###########################################################################
- ## TCL support
- 
--TCL_INCLUDE = /usr/local/include
--TCL_LIB     = /usr/local/lib
--TCL_LIBRARY = -ltcl7.6
-+TCL_INCLUDE = /usr/include
-+TCL_LIB     = /usr/lib
-+TCL_LIBRARY = -ltcl
- 
- ###########################################################################
- ## Efence library for malloc debugging
- 
--EFENCE_LIB = /usr/local/lib
-+EFENCE_LIB = /usr/lib
- 
- ###########################################################################
- ## Commands.
-diff -aur speech_tools.old//config/systems/Linux.mak speech_tools/config/systems/Linux.mak
---- speech_tools.old//config/systems/Linux.mak	2001-04-04 19:55:32.000000000 +0800
-+++ speech_tools/config/systems/Linux.mak	2010-12-08 12:14:56.076668109 +0800
-@@ -40,13 +40,13 @@
- 
- include $(EST)/config/systems/default.mak
- 
--DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
-+DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
- JAVA=/usr/bin/java
- JAVAC=/usr/bin/javac
- JAVAH=/usr/bin/javah
- 
- TCL_LIBRARY = -ltcl
--OS_LIBS = -ldl 
-+OS_LIBS = -ldl -lncurses 
- 
- ## the native audio module for this type of system
- NATIVE_AUDIO_MODULE = LINUX16

Copied: festival/repos/extra-x86_64/speechconfig.patch (from rev 395989, festival/trunk/speechconfig.patch)
===================================================================
--- speechconfig.patch	                        (rev 0)
+++ speechconfig.patch	2020-09-13 12:59:12 UTC (rev 395990)
@@ -0,0 +1,121 @@
+diff -aur speech_tools.old//config/compilers/jdk.mak speech_tools/config/compilers/jdk.mak
+--- speech_tools.old//config/compilers/jdk.mak	2001-04-04 19:55:32.000000000 +0800
++++ speech_tools/config/compilers/jdk.mak	2010-12-08 12:14:56.076668109 +0800
+@@ -52,7 +52,7 @@
+ endif
+ endif
+ 
+-JAVAFLAGS = -depend
++JAVAFLAGS =
+ 
+ DEBUG_JAVAFLAGS = -g
+ 
+diff -aur speech_tools.old//config/config.in speech_tools/config/config.in
+--- speech_tools.old//config/config.in	2008-10-29 03:20:49.000000000 +0800
++++ speech_tools/config/config.in	2010-12-08 12:17:50.110001443 +0800
+@@ -15,7 +15,7 @@
+ ## You may need to set this explicitly if automounter or NFS
+ ## side effects cause problems
+ 
+-EST_HOME := $(shell (cd $(EST); pwd))
++EST_HOME := /usr
+ 
+ ###########################################################################
+ ## System type. 
+@@ -28,14 +28,14 @@
+ ## 
+ ## Examples: sparc_SunOS5 intel_Linux2.0
+ 
+-SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
++SYSTEM_TYPE=Linux
+ 
+ ###########################################################################
+ ## Compiler.
+ ## The definitions are in compilers/$(COMPILER).mak
+ ## Examples: gcc suncc egcs gcc28
+ 
+-COMPILER=@COMPILERTYPE@
++COMPILER=gcc
+ 
+ ###########################################################################
+ ## Java system to use if you include the Java interface.
+@@ -61,7 +61,7 @@
+ # VERBOSE=1
+ #DEBUG=1
+ # PROFILE=gprof
+-#SHARED=2
++SHARED=2
+ 
+ ## Directory specific selections which override the above
+ 
+@@ -98,7 +98,7 @@
+ ## It may not work under all systems, so may be optionally omitted.
+ INCLUDE_MODULES += EDITLINE
+ 
+-TERMCAPLIB = @TERMCAPLIB@
++TERMCAPLIB = 
+ # speech recognition
+ #INCLUDE_MODULES += ASR
+ 
+Only in speech_tools/config: config.in.orig
+diff -aur speech_tools.old//config/systems/default.mak speech_tools/config/systems/default.mak
+--- speech_tools.old//config/systems/default.mak	2005-07-17 21:06:49.000000000 +0800
++++ speech_tools/config/systems/default.mak	2010-12-08 12:14:56.076668109 +0800
+@@ -40,7 +40,7 @@
+ ###########################################################################
+ ## Installation directories
+ 
+-INSTALL_PREFIX=/usr/local
++INSTALL_PREFIX=/usr
+ 
+ BINDIR=$(INSTALL_PREFIX)/bin
+ LIBDIR=$(INSTALL_PREFIX)/lib
+@@ -63,8 +63,8 @@
+ ###########################################################################
+ ## Where to find Enlightenment Speech Demon
+ 
+-ESD_INCLUDE = /usr/local/include
+-ESD_LIB = /usr/local/lib
++ESD_INCLUDE = /usr/include
++ESD_LIB = /usr/lib
+ 
+ ###########################################################################
+ ## Where to find X11
+@@ -75,14 +75,14 @@
+ ###########################################################################
+ ## TCL support
+ 
+-TCL_INCLUDE = /usr/local/include
+-TCL_LIB     = /usr/local/lib
+-TCL_LIBRARY = -ltcl7.6
++TCL_INCLUDE = /usr/include
++TCL_LIB     = /usr/lib
++TCL_LIBRARY = -ltcl
+ 
+ ###########################################################################
+ ## Efence library for malloc debugging
+ 
+-EFENCE_LIB = /usr/local/lib
++EFENCE_LIB = /usr/lib
+ 
+ ###########################################################################
+ ## Commands.
+diff -aur speech_tools.old//config/systems/Linux.mak speech_tools/config/systems/Linux.mak
+--- speech_tools.old//config/systems/Linux.mak	2001-04-04 19:55:32.000000000 +0800
++++ speech_tools/config/systems/Linux.mak	2010-12-08 12:14:56.076668109 +0800
+@@ -40,13 +40,13 @@
+ 
+ include $(EST)/config/systems/default.mak
+ 
+-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
+ 
+ TCL_LIBRARY = -ltcl
+-OS_LIBS = -ldl 
++OS_LIBS = -ldl -lncurses 
+ 
+ ## the native audio module for this type of system
+ NATIVE_AUDIO_MODULE = LINUX16


More information about the arch-commits mailing list