--- audio/festival/Makefile (revision 471274) +++ audio/festival/Makefile (working copy) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= festival -PORTVERSION= 2.4 +DISTVERSION= 2.5.0 CATEGORIES= audio accessibility -MASTER_SITES= FESTIVAL +MASTER_SITES= FESTIVAL/2.5 DISTFILES= ${DISTNAME}-release.tar.gz \ - speech_tools-${PORTVERSION}-release.tar.gz + speech_tools-${DISTVERSION}-release.tar.gz DIST_SUBDIR= festival PATCHFILES= src_modules_diphone_diphone.h.diff?id=b58a836:debian \ @@ -20,11 +20,13 @@ languagespatch.diff?id=b58a836:debian \ ${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/} PATCH_SITES= ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd \ - http://anonscm.debian.org/cgit/tts/festival.git/plain/debian/patches/:debian + http://salsa.debian.org/tts-team/festival.git/plain/debian/patches/:debian MAINTAINER= mi@aldan.algebra.com COMMENT= Multi-lingual speech synthesis system +LICENSE_FILE= COPYING + OPTIONS_DEFINE= NAS ESD OPTIONS_DEFAULT=NAS ESD ESD_DESC= ${ESOUND_DESC} --- audio/festival/distinfo (revision 471274) +++ audio/festival/distinfo (working copy) @@ -1,7 +1,8 @@ -SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84 -SIZE (festival/festival-2.4-release.tar.gz) = 788656 -SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010 -SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613 +TIMESTAMP = 1527179004 +SHA256 (festival/festival-2.5.0-release.tar.gz) = 4c9007426b125290599d931df410e2def51e68a8aeebd89b4a61c7c96c09a4b4 +SIZE (festival/festival-2.5.0-release.tar.gz) = 789013 +SHA256 (festival/speech_tools-2.5.0-release.tar.gz) = e4fd97ed78f14464358d09f36dfe91bc1721b7c0fa6503e04364fb5847805dcc +SIZE (festival/speech_tools-2.5.0-release.tar.gz) = 1328624 SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104 SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870 SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048 @@ -20,29 +21,7 @@ SIZE (festival/hts21compat.diff?id=b58a836) = 125719 SHA256 (festival/languagespatch.diff?id=b58a836) = 3108f08656d31623ee5393eb542d0085819a056641c1853c2ffc2b07e2e9e15a SIZE (festival/languagespatch.diff?id=b58a836) = 36538 -SHA256 (festival/patch-speech__tools_base__class_EST__TVector.cc) = d791a9feb1e2be33fb8d367a8add65678b3f0e45cee145e8381d0f18eb2d9b0f -SIZE (festival/patch-speech__tools_base__class_EST__TVector.cc) = 454 -SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 19b6c8f14c3b8944dc2404b92c74c5e0b2403f35b96a152f18b9492d9b24e4ee -SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 1086 -SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 713c9938950e2190c503e9619e0142db49bdf6378b60de3611c4390ba7cdb5cb -SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 1086 -SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = aa16df118317354d368a5389c18a157723df10f09af319e278eb63d4ab73ee31 -SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1085 -SHA256 (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = ac6e1db2a4e7c99929d4713d70b86014ecbe71d1c5f4f67e91503887a225f718 -SIZE (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = 803 -SHA256 (festival/patch-speech__tools_include_EST__Ngrammar.h) = 156d42e187693d6e76d28c280155bc6dfd6de6d8a5225d4aa87a2e767d0cee96 -SIZE (festival/patch-speech__tools_include_EST__Ngrammar.h) = 2519 -SHA256 (festival/patch-speech__tools_include_EST__SCFG.h) = e6ec64c01faad49f0efb2e40d7b332e0b7a8e92830337eb1f3843780e6c9c3e6 -SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519 -SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74 -SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068 -SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5 -SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210 SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157 SIZE (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 514 SHA256 (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = ad217f952ddd714c2b6b9e5924bfaf9e3b0429ba46d1db117ca1c4918aed9741 SIZE (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = 534 -SHA256 (festival/patch-speech__tools_stats_dynamic__program.cc) = 0c3fbe07a256be395e28d08e367e80b53d56885825ff29a232793c8e03915141 -SIZE (festival/patch-speech__tools_stats_dynamic__program.cc) = 1106 -SHA256 (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 5edb267faa21adf31b5503cf5db4e55d4ad2c3eaecf1550d7df1ef8cb94c448c -SIZE (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 649 --- audio/festival/files/patch-festival_config_modules_nas_audio.mak (revision 471274) +++ audio/festival/files/patch-festival_config_modules_nas_audio.mak (nonexistent) @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/05/05 20:54:57 hubertf Exp $ - ---- festival/config/modules/nas_audio.mak.orig Fri May 5 21:07:15 2000 -+++ festival/config/modules/nas_audio.mak Fri May 5 21:07:29 2000 -@@ -44,6 +44,6 @@ - - AUDIO_DEFINES += -DSUPPORT_NAS - AUDIO_INCLUDES += -I$(NAS_INCLUDE) --MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -lX11 -lXt -+MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -Wl,-R$(X11_LIB) -lX11 -lXt - - --- audio/festival/files/patch-festival_src_modules_MultiSyn_TargetCostRescoring.cc (nonexistent) +++ audio/festival/files/patch-festival_src_modules_MultiSyn_TargetCostRescoring.cc (working copy) @@ -0,0 +1,23 @@ +Part of Debian's patch at: + http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff + +--- festival/src/modules/MultiSyn/TargetCostRescoring.cc.orig 2017-09-04 15:54:08 UTC ++++ festival/src/modules/MultiSyn/TargetCostRescoring.cc +@@ -82,7 +82,7 @@ void rescoreCandidates( EST_VTCandidate + //cerr << scores << endl; + + // calculate simple mean duration of some or all of candidates +- float meandur = 0.0; ++ long meandur = 0.0; + int n = 0; + + if( beam_width < 0 ){ // just average all of them +@@ -107,7 +107,7 @@ void rescoreCandidates( EST_VTCandidate + + // then tweak the scores based on that + for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){ +- float cand_dur = scores(li)._dur; ++ long cand_dur = scores(li)._dur; + // cerr << scores(li)._cand->score << " "; + scores(li)._cand->score += (mult * abs( cand_dur - meandur ) ); + // cerr << scores(li)._cand->score << endl; --- audio/festival/files/patch-festival_src_modules_hts__engine_HTS__misc.c (nonexistent) +++ audio/festival/files/patch-festival_src_modules_hts__engine_HTS__misc.c (working copy) @@ -0,0 +1,14 @@ +--- festival/src/modules/hts_engine/HTS_misc.c.orig 2017-09-04 15:54:08 UTC ++++ festival/src/modules/hts_engine/HTS_misc.c +@@ -245,11 +245,7 @@ size_t HTS_ftell(HTS_File * fp) + } else if (fp->type == HTS_FILE) { + fpos_t pos; + fgetpos((FILE *) fp->pointer, &pos); +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) + return (size_t) pos; +-#else +- return (size_t) pos.__pos; +-#endif /* _WIN32 || __APPLE__ */ + } + HTS_error(0, "HTS_ftell: Unknown file type.\n"); + return 0; --- audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c (revision 471274) +++ audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c (nonexistent) @@ -1,14 +0,0 @@ ---- festival/src/modules/hts_engine/HTS_misc.c.orig 2013-07-03 19:43:35.000000000 +0600 -+++ festival/src/modules/hts_engine/HTS_misc.c 2015-11-22 20:43:30.055818000 +0500 -@@ -245,11 +245,7 @@ - } else if (fp->type == HTS_FILE) { - fpos_t pos; - fgetpos((FILE *) fp->pointer, &pos); --#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) - return (size_t) pos; --#else -- return (size_t) pos.__pos; --#endif /* _WIN32 || __APPLE__ */ - } - HTS_error(0, "HTS_ftell: Unknown file type.\n"); - return 0; --- audio/festival/files/patch-long-over-float (revision 471274) +++ audio/festival/files/patch-long-over-float (nonexistent) @@ -1,23 +0,0 @@ -Part of Debian's patch at: - http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff - ---- festival/src/modules/MultiSyn/TargetCostRescoring.cc 2011-02-16 10:35:34.000000000 -0600 -+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc 2011-02-16 10:43:23.000000000 -0600 -@@ -82,7 +82,7 @@ - //cerr << scores << endl; - - // calculate simple mean duration of some or all of candidates -- float meandur = 0.0; -+ long meandur = 0.0; - int n = 0; - - if( beam_width < 0 ){ // just average all of them -@@ -107,7 +107,7 @@ - - // then tweak the scores based on that - for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){ -- float cand_dur = scores(li)._dur; -+ long cand_dur = scores(li)._dur; - // cerr << scores(li)._cand->score << " "; - scores(li)._cand->score += (mult * abs( cand_dur - meandur ) ); - // cerr << scores(li)._cand->score << endl; --- audio/festival/files/patch-speech__tools_audio_nas.cc (nonexistent) +++ audio/festival/files/patch-speech__tools_audio_nas.cc (working copy) @@ -0,0 +1,10 @@ +--- speech_tools/audio/nas.cc.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/audio/nas.cc +@@ -57,6 +57,7 @@ static int nas_playing = 0; + + int nas_supported = TRUE; + ++extern int endian_int; + int endian_int = 1; + #define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0) + --- audio/festival/files/patch-speech__tools_config_modules_nas__audio.mak (nonexistent) +++ audio/festival/files/patch-speech__tools_config_modules_nas__audio.mak (working copy) @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $ + +--- speech_tools/config/modules/nas_audio.mak.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/config/modules/nas_audio.mak +@@ -45,6 +45,6 @@ MOD_DESC_NAS_AUDIO=Use Network Audio + AUDIO_DEFINES += -DSUPPORT_NAS + AUDIO_INCLUDES += -I$(NAS_INCLUDE) + MODULE_LIBS += -L$(NAS_LIB) -laudio +-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt ++MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt + + --- audio/festival/files/patch-speech__tools_config_rules_install.mak (nonexistent) +++ audio/festival/files/patch-speech__tools_config_rules_install.mak (working copy) @@ -0,0 +1,13 @@ +author: Tod McQuillin + +--- speech_tools/config/rules/install.mak.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/config/rules/install.mak +@@ -39,7 +39,7 @@ + + + +-PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd) ++PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME) + + PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd)) + --- audio/festival/files/patch-speech__tools_include_EST__unix.h (nonexistent) +++ audio/festival/files/patch-speech__tools_include_EST__unix.h (working copy) @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $ + +--- speech_tools/include/EST_unix.h.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/include/EST_unix.h +@@ -53,6 +53,7 @@ + # include + # include + # include ++# define unix 1 + #elif defined(SYSTEM_IS_WIN32) + # include + # include "win32/EST_unix_win32.h" --- audio/festival/files/patch-speech__tools_main_sig2fv__main.cc (revision 471274) +++ audio/festival/files/patch-speech__tools_main_sig2fv__main.cc (working copy) @@ -2,14 +2,14 @@ " default: "DEFAULT_WINDOW"\n\n" ^ ---- speech_tools/main/sig2fv_main.cc.orig 2010-11-05 14:12:43 UTC +--- speech_tools/main/sig2fv_main.cc.orig 2017-09-04 15:54:03 UTC +++ speech_tools/main/sig2fv_main.cc @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) "-window_type Type of window used on waveform. \n" " Permissable types are: \n" + EST_Window::options_supported() + -- " default: "DEFAULT_WINDOW"\n\n" -+ " default: " DEFAULT_WINDOW "\n\n" +- " default: \"DEFAULT_WINDOW\"\n\n" ++ " default: \" DEFAULT_WINDOW\"\n\n" "-lpc_order Order of lpc analysis. \n\n" "-ref_order Order of lpc reflection coefficient analysis. \n\n" "-cep_order Order of lpc cepstral analysis.\n\n" --- audio/festival/files/patch-speech_tools_audio_nas.cc (revision 471274) +++ audio/festival/files/patch-speech_tools_audio_nas.cc (nonexistent) @@ -1,12 +0,0 @@ ---- speech_tools/audio/nas.cc.orig Thu Oct 14 16:26:29 1999 -+++ speech_tools/audio/nas.cc Fri Jun 16 17:24:25 2000 -@@ -57,7 +57,8 @@ - - int nas_supported = TRUE; - --int endian_int = 1; -+extern int endian_int; -+int endian_int = 1; - #define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0) - - static void na_sync_play_cb(AuServer *aud, AuEventHandlerRec *handler, --- audio/festival/files/patch-speech_tools_config_modules_nas_audio.mak (revision 471274) +++ audio/festival/files/patch-speech_tools_config_modules_nas_audio.mak (nonexistent) @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $ - ---- speech_tools/config/modules/nas_audio.mak.orig Fri May 5 20:55:15 2000 -+++ speech_tools/config/modules/nas_audio.mak Fri May 5 20:58:07 2000 -@@ -45,6 +45,6 @@ - AUDIO_DEFINES += -DSUPPORT_NAS - AUDIO_INCLUDES += -I$(NAS_INCLUDE) - MODULE_LIBS += -L$(NAS_LIB) -laudio --MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt -+MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt - - --- audio/festival/files/patch-speech_tools_include_EST_unix.h (revision 471274) +++ audio/festival/files/patch-speech_tools_include_EST_unix.h (nonexistent) @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $ - ---- speech_tools/include/EST_unix.h Sun May 30 20:53:04 1999 -+++ speech_tools/include/EST_unix.h Mon Oct 11 05:40:15 1999 -@@ -53,6 +53,7 @@ - # include - # include - # include -+# define unix 1 - #elif defined(SYSTEM_IS_WIN32) - # include - # include "win32/EST_unix_win32.h" --- audio/festival/files/patch-speech_tools_install.mak (revision 471274) +++ audio/festival/files/patch-speech_tools_install.mak (nonexistent) @@ -1,13 +0,0 @@ -author: Tod McQuillin - ---- speech_tools/config/rules/install.mak~ Sun May 30 22:51:10 1999 -+++ speech_tools/config/rules/install.mak Wed Mar 9 03:11:35 2005 -@@ -39,7 +39,7 @@ - - - --PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd) -+PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME) - - PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd)) - --- audio/festival/files/patch-voxware (revision 471274) +++ audio/festival/files/patch-voxware (working copy) @@ -1,15 +1,7 @@ ---- speech_tools/config/modules/freebsd16_audio.mak 2001-04-04 09:11:27.000000000 -0400 -+++ speech_tools/config/modules/freebsd16_audio.mak 2013-05-27 13:29:03.000000000 -0400 -@@ -43,5 +43,5 @@ - MOD_DESC_FREEBSD16_AUDIO=Native audio module for FreeBSD systems - --AUDIO_DEFINES += -DSUPPORT_FREEBSD16 -+AUDIO_DEFINES += -DSUPPORT_FREEBSD16 -DSUPPORT_VOXWARE - - #ifdef INCLUDE_JAVA_CPP ---- speech_tools/audio/linux_sound.cc 2009-04-29 13:06:36.000000000 -0400 -+++ speech_tools/audio/linux_sound.cc 2013-05-27 13:31:00.000000000 -0400 -@@ -66,7 +66,13 @@ +--- speech_tools/audio/linux_sound.cc.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/audio/linux_sound.cc +@@ -65,9 +65,15 @@ + #include int freebsd16_supported = TRUE; int linux16_supported = FALSE; -static char *aud_sys_name = "FreeBSD"; @@ -24,7 +16,9 @@ + #ifdef SUPPORT_VOXWARE -@@ -76,7 +82,5 @@ + #include +@@ -75,9 +81,7 @@ static char *aud_sys_name = "FreeBSD"; + #include #include #include -int linux16_supported = TRUE; @@ -33,7 +27,9 @@ + static int stereo_only = 0; -@@ -764,5 +768,5 @@ + // Code to block signals while sound is playing. +@@ -771,7 +775,7 @@ int record_linux_wave(EST_Wave &inwave, + int num_samples; int audio=-1,actual_fmt; int i,r,n; - char *audiodevice; @@ -40,3 +36,15 @@ + const char *audiodevice; if (al.present("-audiodevice")) + audiodevice = al.val("-audiodevice"); +--- speech_tools/config/modules/freebsd16_audio.mak.orig 2017-09-04 15:54:03 UTC ++++ speech_tools/config/modules/freebsd16_audio.mak +@@ -42,7 +42,7 @@ INCLUDE_FREEBSD16_AUDIO=1 + + MOD_DESC_FREEBSD16_AUDIO=Native audio module for FreeBSD systems + +-AUDIO_DEFINES += -DSUPPORT_FREEBSD16 ++AUDIO_DEFINES += -DSUPPORT_FREEBSD16 -DSUPPORT_VOXWARE + + #ifdef INCLUDE_JAVA_CPP + # AUDIO_DEFINES += -DTHREAD_SAFETY