pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/festival First pass at a new festival package, b...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8f5e3f3a527
branches:  trunk
changeset: 486045:e8f5e3f3a527
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Dec 21 18:12:25 2004 +0000

description:
First pass at a new festival package, based on later sources, which will
compile with gcc3. Committed now for others to improve.

diffstat:

 audio/festival/Makefile                 |   43 +++++------
 audio/festival/PLIST                    |  113 +------------------------------
 audio/festival/distinfo                 |   28 +------
 audio/festival/files/ix86_NetBSD.mak    |   29 ++++++++
 audio/festival/files/ix86_NetBSD2.0.mak |   17 ++++
 audio/festival/patches/patch-aa         |   20 -----
 audio/festival/patches/patch-ab         |   25 -------
 audio/festival/patches/patch-ac         |   24 ------
 audio/festival/patches/patch-ad         |   54 ---------------
 audio/festival/patches/patch-ae         |   12 ---
 audio/festival/patches/patch-af         |   15 ----
 audio/festival/patches/patch-ag         |   12 ---
 audio/festival/patches/patch-ah         |   12 ---
 audio/festival/patches/patch-ai         |   17 ----
 audio/festival/patches/patch-aj         |   16 ----
 audio/festival/patches/patch-ak         |   17 ----
 audio/festival/patches/patch-al         |   16 ----
 audio/festival/patches/patch-am         |   13 ---
 18 files changed, 77 insertions(+), 406 deletions(-)

diffs (truncated from 621 to 300 lines):

diff -r 38809b05f5f4 -r e8f5e3f3a527 audio/festival/Makefile
--- a/audio/festival/Makefile   Tue Dec 21 18:00:24 2004 +0000
+++ b/audio/festival/Makefile   Tue Dec 21 18:12:25 2004 +0000
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.34 2004/08/18 21:44:08 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2004/12/21 18:12:25 agc Exp $
 
-DISTNAME=      festival-1.4.1
-PKGREVISION=   1
+DISTNAME=      festival-1.95-beta
+PKGNAME=       festival-1.95beta
 CATEGORIES=    audio
-MASTER_SITES=  ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
-               http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/ \
+MASTER_SITES=  http://www.cstr.ed.ac.uk/download/festival/1.95/ \
+               http://festvox.org/packed/festival/1.95/ \
                ftp://cslu.cse.ogi.edu/pub/tts/
 DISTFILES=     ${DISTNAME}.tar.gz \
-               speech_tools-1.2.1.tar.gz \
-               OGIresLPC-2.0.9.tar.gz \
-               OGIfestpatch-1.4.1.2.tar.gz
-# note that OGIfestpatch above file must be extracted last. it is, however
-# this behavior not defined in pkgsrc at the time of writing
+               speech_tools-1.2.95-beta.tar.gz
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.cstr.ed.ac.uk/projects/festival/
-COMMENT=       Festival is an advanced multi-lingual speech synthesis system
+COMMENT=       Advanced multi-lingual speech synthesis system
 
 WRKSRC=                ${WRKDIR}
 USE_BUILDLINK3=        yes
-USE_GNU_TOOLS+=                make
+USE_GNU_TOOLS+=        make
 USE_X11=       yes
 
 SPEECHTOOLS=   ${WRKSRC}/speech_tools
@@ -27,6 +23,9 @@
 
 FHOME=         ${PREFIX}/share/festival
 
+CONFIG_GUESS_OVERRIDE= ${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess
+CONFIG_SUB_OVERRIDE=   ${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub
+
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
@@ -37,7 +36,7 @@
                        gcc-2.7.*)      ${ECHO} gcc27;;                 \
                        gcc-2.8.*)      ${ECHO} gcc28;;                 \
                        gcc-2.95.*)     ${ECHO} gcc295;;                \
-                       gcc-3.3.*)      ${ECHO} gcc295;;                \
+                       gcc-3.3.*)      ${ECHO} gcc32;;                 \
                        egcs*)          ${ECHO} egcs;;                  \
                        *)              ${ECHO} ;;                      \
                esac
@@ -67,15 +66,15 @@
                CC="${CC}"                                              \
                CXX="${CXX}"
 
-pre-patch:
-       @ ${CP} ${SPEECHTOOLS}/config/config-dist ${SPEECHTOOLS}/config/config && \
-         ${CHMOD} u+w ${SPEECHTOOLS}/config/config
-       @ ${CP} ${FESTIVAL}/config/config-dist ${FESTIVAL}/config/config && \
-         ${CHMOD} u+w ${FESTIVAL}/config/config
+post-patch:
+       @${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
+       @${CP} ${FILESDIR}/ix86_NetBSD.mak ${SPEECHTOOLS}/config/systems/
+       @${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${SPEECHTOOLS}/config/systems/
+       @${CP} ${FILESDIR}/ix86_NetBSD.mak ${FESTIVAL}/config/systems/
+       @${CP} ${FILESDIR}/ix86_NetBSD2.0.mak ${FESTIVAL}/config/systems/
 
-post-patch:
-       @ ${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
-       @ ${CP} ${FILESDIR}/NetBSD.mak ${SPEECHTOOLS}/config/systems/NetBSD.mak
+do-configure:
+       cd ${SPEECHTOOLS} && ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 
 do-install:
        ${INSTALL_DATA_DIR} ${FHOME}
@@ -83,7 +82,7 @@
        ${FIND} ${FESTIVAL}/lib -type d -print | ${XARGS} ${CHMOD} 755
        cd ${FESTIVAL} && ${PAX} -rw lib examples ${FHOME}
        ${RM} -f ${FHOME}/lib/etc/NetBSD/audsp
-       ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/NetBSD/audsp ${PREFIX}/libexec
+       ${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/ix86_NetBSD/audsp ${PREFIX}/libexec
        ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
        ${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked
        for n in festival.sh festival_client.sh sitevars.scm; \
diff -r 38809b05f5f4 -r e8f5e3f3a527 audio/festival/PLIST
--- a/audio/festival/PLIST      Tue Dec 21 18:00:24 2004 +0000
+++ b/audio/festival/PLIST      Tue Dec 21 18:12:25 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/10 05:21:51 gson Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/12/21 18:12:25 agc Exp $
 bin/festival
 bin/festival_client
 libexec/audsp
@@ -6,126 +6,23 @@
 libexec/festival_client.naked
 man/man1/festival.1
 man/man1/festival_client.1
-share/festival/examples/Makefile
-share/festival/examples/Makefile.orig
-share/festival/examples/addr-mode.scm
-share/festival/examples/benchmark
-share/festival/examples/benchmark.orig
-share/festival/examples/benchmark.text
 share/festival/examples/dumpfeats
-share/festival/examples/dumpfeats.sh
 share/festival/examples/durmeanstd
-share/festival/examples/durmeanstd.sh
-share/festival/examples/ex1.email
-share/festival/examples/ex1.ogi
-share/festival/examples/example.sable
-share/festival/examples/example.th
-share/festival/examples/example2.sable
-share/festival/examples/festival_client.c
-share/festival/examples/festival_client.h
-share/festival/examples/festival_client.pl
-share/festival/examples/intro.text
 share/festival/examples/latest
-share/festival/examples/latest.sh
 share/festival/examples/make_utts
-share/festival/examples/make_utts.sh
+share/festival/examples/powmeanstd
 share/festival/examples/saytime
-share/festival/examples/saytime.sh
 share/festival/examples/scfg_parse_text
-share/festival/examples/scfg_parse_text.sh
-share/festival/examples/speech_pm_1.0.tar
-share/festival/examples/spintro.text
 share/festival/examples/text2pos
-share/festival/examples/text2pos.sh
 share/festival/examples/text2wave
-share/festival/examples/text2wave.sh
-share/festival/examples/th-mode.scm
-share/festival/examples/tobi.stml
-share/festival/examples/toksearch.scm
-share/festival/examples/webdemo.scm
-share/festival/lib/Makefile
-share/festival/lib/Sable.v0_2.dtd
-share/festival/lib/VCLocalRules
-share/festival/lib/cart_aux.scm
-share/festival/lib/cslush.scm
 share/festival/lib/cstr.scm
-share/festival/lib/darpa_phones.scm
-share/festival/lib/display.scm
-share/festival/lib/duration.scm
-share/festival/lib/email-mode.scm
-share/festival/lib/engmorph.scm
-share/festival/lib/engmorphsyn.scm
-share/festival/lib/etc/Makefile
-share/festival/lib/etc/NetBSD/.made
-share/festival/lib/etc/email_filter
-share/festival/lib/f2bdurtreeZ.scm
-share/festival/lib/f2bf0lr.scm
-share/festival/lib/festdoc.scm
-share/festival/lib/festival.el
-share/festival/lib/festival.scm
-share/festival/lib/festtest.scm
+share/festival/lib/etc/ix86_${OPSYS}/.made
+share/festival/lib/etc/ix86_${OPSYS}/audsp
 share/festival/lib/fringe.scm
-share/festival/lib/gswdurtreeZ.scm
-share/festival/lib/holmes_phones.scm
-share/festival/lib/init.scm
-share/festival/lib/intonation.scm
-share/festival/lib/java.scm
-share/festival/lib/klatt_durs.scm
-share/festival/lib/languages.scm
-share/festival/lib/lexicons.scm
-share/festival/lib/lts.scm
-share/festival/lib/lts_build.scm
-share/festival/lib/mbrola.scm
-share/festival/lib/mettree.scm
-share/festival/lib/module_description.scm
-share/festival/lib/mrpa_allophones.scm
-share/festival/lib/mrpa_durs.scm
-share/festival/lib/mrpa_phones.scm
-share/festival/lib/ogi_effect.scm
-share/festival/lib/ogi_enhance.scm
-share/festival/lib/ogi_gswdurtreeZ_wb.scm
-share/festival/lib/ogi_hack.scm
-share/festival/lib/ogi_kddurtreeZ_wb.scm
-share/festival/lib/ogi_klatt_durs_wb.scm
-share/festival/lib/ogi_languages.scm
-share/festival/lib/ogi_lexicons.scm
-share/festival/lib/ogi_lts_worldbet.scm
-share/festival/lib/ogi_phrase.scm
-share/festival/lib/ogi_postlex.scm
-share/festival/lib/ogi_synthesis.scm
-share/festival/lib/ogi_token.scm
-share/festival/lib/ogi_unitsel.scm
-share/festival/lib/ogi_wordsynth.scm
-share/festival/lib/ogi_worldbet_phones.scm
-share/festival/lib/ogimarkup-mode.scm
-share/festival/lib/pauses.scm
-share/festival/lib/phoneset.scm
-share/festival/lib/phrase.scm
-share/festival/lib/pos.scm
-share/festival/lib/postlex.scm
-share/festival/lib/radio_phones.scm
-share/festival/lib/sable-latin.ent
-share/festival/lib/sable-mode.scm
-share/festival/lib/scfg.scm
-share/festival/lib/scfg_wsj_wp20.gram
-share/festival/lib/sec.B.hept.ngrambin
-share/festival/lib/sec.ts20.quad.ngrambin
 share/festival/lib/siod.scm
 share/festival/lib/sitevars.scm
-share/festival/lib/soleml-mode.scm
-share/festival/lib/speech.properties
-share/festival/lib/synthesis.scm
-share/festival/lib/tilt.scm
-share/festival/lib/tobi.scm
-share/festival/lib/tobi_rules.scm
-share/festival/lib/token.scm
-share/festival/lib/tokenpos.scm
-share/festival/lib/tts.scm
-share/festival/lib/voices.scm
 share/festival/lib/web.scm
-@unexec ${RM} -r %D/share/festival/lib/voices
-@unexec ${RM} -r %D/share/festival/lib/dicts
-@dirrm share/festival/lib/etc/NetBSD
+@dirrm share/festival/lib/etc/ix86_${OPSYS}
 @dirrm share/festival/lib/etc
 @dirrm share/festival/lib
 @dirrm share/festival/examples
diff -r 38809b05f5f4 -r e8f5e3f3a527 audio/festival/distinfo
--- a/audio/festival/distinfo   Tue Dec 21 18:00:24 2004 +0000
+++ b/audio/festival/distinfo   Tue Dec 21 18:12:25 2004 +0000
@@ -1,24 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/10/15 16:50:17 kristerw Exp $
+$NetBSD: distinfo,v 1.9 2004/12/21 18:12:25 agc Exp $
 
-SHA1 (festival-1.4.1.tar.gz) = d3be7d58b986c37c39444a2dcc044cdc3ee1e774
-Size (festival-1.4.1.tar.gz) = 543335 bytes
-SHA1 (speech_tools-1.2.1.tar.gz) = 6facbaeaacb5022a20e59d669eaaeee8d9899e42
-Size (speech_tools-1.2.1.tar.gz) = 1206616 bytes
-SHA1 (OGIresLPC-2.0.9.tar.gz) = e54b7d3f7ed1696a6eeca0fe1695a099d2ed3712
-Size (OGIresLPC-2.0.9.tar.gz) = 140306 bytes
-SHA1 (OGIfestpatch-1.4.1.2.tar.gz) = 12b1b0198facf10fc781ac5d0a1521d45da30c9d
-Size (OGIfestpatch-1.4.1.2.tar.gz) = 32904 bytes
-SHA1 (patch-aa) = be60f30a65bd7d7d49a438c274a8c1b1f0fb64fc
-SHA1 (patch-ab) = 5d49c932446fb625c9e6bd114af67c9d959bb2ba
-SHA1 (patch-ac) = 64597fabe79d93f402bcf5bf100ac2e9d0613e0c
-SHA1 (patch-ad) = 42d20ef5aca5752093224e50c177e55465a1155f
-SHA1 (patch-ae) = d045128bacdedf05cd18b0dd750ea6a6a34a0ce4
-SHA1 (patch-af) = 3bcd5f48bcc6f2ecc68e179d8a0c70cdd6cfa5fd
-SHA1 (patch-ag) = 17f19d5b738f44f98bb2572f0a8231429adb6065
-SHA1 (patch-ah) = 4bda46a40668209140e937206f6e6ae76e5a740f
-SHA1 (patch-ai) = 690a0649e8231296dae291b7210b6e7c84bae961
-SHA1 (patch-aj) = a50a9e762096faf7dc1272325a925e54d2c882a0
-SHA1 (patch-ak) = 705016ef010989c1b9ffe2d23b78ee9615a4c6f7
-SHA1 (patch-al) = d8a22c5f509a6d75aa3295037654b594e8db4a4a
-SHA1 (patch-am) = cd6e07df1729fecca5cd9869229701b63ba71d14
-SHA1 (patch-an) = bdd701017c72db315de8fcfb4ac6ce3bf97d4d47
+SHA1 (festival-1.95-beta.tar.gz) = 7bbf841b07a09cfe1ab17db23c2ebc12ea3d854b
+Size (festival-1.95-beta.tar.gz) = 707573 bytes
+SHA1 (speech_tools-1.2.95-beta.tar.gz) = 5f0533a1b06c56f06e382d752b920ee62a5e8312
+Size (speech_tools-1.2.95-beta.tar.gz) = 1281274 bytes
diff -r 38809b05f5f4 -r e8f5e3f3a527 audio/festival/files/ix86_NetBSD.mak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/festival/files/ix86_NetBSD.mak      Tue Dec 21 18:12:25 2004 +0000
@@ -0,0 +1,29 @@
+ ###########################################################################
+ ##                                                                       ##
+ ##                 Author: Alistair Crooks (agc%netbsd.org@localhost)              ##
+ ##                   Date: Wed Oct 27 2004                               ##
+ ## --------------------------------------------------------------------  ##
+ ## Settings for NetBSD.                                                  ##
+ ##                                                                       ##
+ ###########################################################################
+
+include $(EST)/config/systems/default.mak
+
+## the native audio module for this type of system
+NATIVE_AUDIO_MODULE = NETBSD
+
+## echo -n doesn't work (well only sometimes ?)
+ECHO_N = /usr/bin/printf "%s"
+
+NAWK=awk
+
+# GCC_MAKE_SHARED_LIB = ld -Bshareable -x -o XXX
+
+DEFAULT_JAVA_HOME=${PREFIX}/java
+
+JAVA=$(JAVA_HOME)/bin/java
+JAVAC=$(JAVA_HOME)/bin/javac
+JAVAH=$(JAVA_HOME)/bin/javah -jni
+JAR=$(JAVA_HOME)/bin/jar cf0v 
+
+
diff -r 38809b05f5f4 -r e8f5e3f3a527 audio/festival/files/ix86_NetBSD2.0.mak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/festival/files/ix86_NetBSD2.0.mak   Tue Dec 21 18:12:25 2004 +0000
@@ -0,0 +1,17 @@
+ ###########################################################################



Home | Main Index | Thread Index | Old Index