Index: audio/libttspico/Makefile =================================================================== --- audio/libttspico/Makefile (nonexistent) +++ audio/libttspico/Makefile (working copy) @@ -0,0 +1,63 @@ +# $FreeBSD$ + +PORTNAME= libttspico +PORTVERSION= ${_DEBVERSION:S/+git/./:S/-/p/} +CATEGORIES= audio +MASTER_SITES= DEBIAN/pool/non-free/s/svox +DISTNAME= svox-${_DEBVERSION:C/-.*//} +DISTFILES= svox_${_DEBVERSION:C/-.*//}.orig.tar.gz\ + svox_${_DEBVERSION}.debian.tar.xz + +MAINTAINER= henrik@gulbra.net +COMMENT= Compact text-to-speech engine + +LICENSE= APACHE20 + +BUILD_DEPENDS= help2man:misc/help2man +LIB_DEPENDS= libpopt.so:devel/popt + +USES= autoreconf libtool +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip + +CFLAGS+= -Wall -Werror\ + -Wno-infinite-recursion\ + -Wno-parentheses-equality\ + -Wno-self-assign\ + -Wno-unneeded-internal-declaration\ + -Wno-unused-variable\ + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PATCH_WRKSRC= ${_SVOXDIR} +WRKSRC_SUBDIR= pico + +PORTDOCS= ${_SVOXDIR}/pico_resources/docs/*.pdf + +OPTIONS_DEFINE= DOCS + +_DEBVERSION= 1.0+git20130326-11 +_PICODIR= ${WRKSRC} +_SVOXDIR= ${WRKDIR}/${DISTNAME} + +pre-patch: + for p in $$(${GREP} -v '#' "${WRKDIR}/debian/patches/series"); do\ + ${PATCH} -p1 -Vnone -d "${_SVOXDIR}"\ + -i ${WRKDIR}/debian/patches/$$p;\ + done + +post-build: + help2man --name 'Small Footprint TTS' --version-string ' ' --no-info\ + ${_PICODIR}/pico2wave > ${_PICODIR}/pico2wave.1 + +post-install: + ${INSTALL_MAN} ${_PICODIR}/pico2wave.1\ + ${STAGEDIR}${MAN1PREFIX}/man/man1/ + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +.include Property changes on: audio/libttspico/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/distinfo =================================================================== --- audio/libttspico/distinfo (nonexistent) +++ audio/libttspico/distinfo (working copy) @@ -0,0 +1,5 @@ +TIMESTAMP = 1612955974 +SHA256 (svox_1.0+git20130326.orig.tar.gz) = 337b25e6ccb3764f0df1e176470b883c90e40e98840d4133340fcc89eb3cea0c +SIZE (svox_1.0+git20130326.orig.tar.gz) = 26355286 +SHA256 (svox_1.0+git20130326-11.debian.tar.xz) = ebaa9ec2e430778240ef659e6b1fe7df2a3a893b951649d45670826c893cb53e +SIZE (svox_1.0+git20130326-11.debian.tar.xz) = 20744 Property changes on: audio/libttspico/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_bin_pico2wave.c =================================================================== --- audio/libttspico/files/patch-pico_bin_pico2wave.c (nonexistent) +++ audio/libttspico/files/patch-pico_bin_pico2wave.c (working copy) @@ -0,0 +1,27 @@ +--- pico/bin/pico2wave.c.orig 2021-02-21 10:03:41 UTC ++++ pico/bin/pico2wave.c +@@ -100,6 +100,7 @@ int main(int argc, const char *argv[]) { + char * lang = "en-US"; + int langIndex = -1, langIndexTmp = -1; + char * text = NULL; ++ int allocated = 0; + int8_t * buffer; + size_t bufferSize = 256; + +@@ -163,6 +164,7 @@ int main(int argc, const char *argv[]) { + } else { + // read from stdin + size_t len = myread(stdin, &text); ++ allocated = 1; + // debug buffered read: make this command a pass-though cat-like command and compare input with output + // printf("read %ld characters\n", len); + // fwrite(text, 1, len, stdout); +@@ -371,7 +373,7 @@ terminate: + pico_terminate(&picoSystem); + picoSystem = NULL; + } +- if (text) ++ if (allocated) + free(text); + exit(ret); + } Property changes on: audio/libttspico/files/patch-pico_bin_pico2wave.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoapid.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoapid.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoapid.h (working copy) @@ -0,0 +1,11 @@ +--- pico/lib/picoapid.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoapid.h +@@ -57,7 +57,7 @@ typedef struct pico_system { + + /* declared in picoapi.c */ + extern int is_valid_system_handle(pico_System system); +-extern picoos_Common pico_sysGetCommon(pico_System this); ++extern picoos_Common pico_sysGetCommon(pico_System self); + + + #if 0 Property changes on: audio/libttspico/files/patch-pico_lib_picoapid.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoctrl.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoctrl.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoctrl.h (working copy) @@ -0,0 +1,38 @@ +--- pico/lib/picoctrl.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoctrl.h +@@ -48,7 +48,7 @@ extern "C" { + + typedef struct picoctrl_engine * picoctrl_Engine; + +-picoos_int16 picoctrl_isValidEngineHandle(picoctrl_Engine this); ++picoos_int16 picoctrl_isValidEngineHandle(picoctrl_Engine self); + + picoctrl_Engine picoctrl_newEngine ( + picoos_MemoryManager mm, +@@ -59,7 +59,7 @@ picoctrl_Engine picoctrl_newEngine ( + void picoctrl_disposeEngine( + picoos_MemoryManager mm, + picorsrc_ResourceManager rm, +- picoctrl_Engine * this ++ picoctrl_Engine * self + ); + + pico_status_t picoctrl_engFeedText( +@@ -72,7 +72,7 @@ pico_status_t picoctrl_engReset( + picoctrl_Engine engine, + picoos_int32 resetMode); + +-picoos_Common picoctrl_engGetCommon(picoctrl_Engine this); ++picoos_Common picoctrl_engGetCommon(picoctrl_Engine self); + + picodata_step_result_t picoctrl_engFetchOutputItemBytes( + picoctrl_Engine engine, +@@ -82,7 +82,7 @@ picodata_step_result_t picoctrl_engFetchOutputItemByte + ); + + void picoctrl_engResetExceptionManager( +- picoctrl_Engine this ++ picoctrl_Engine self + ); + + Property changes on: audio/libttspico/files/patch-pico_lib_picoctrl.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picodata.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picodata.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picodata.h (working copy) @@ -0,0 +1,84 @@ +--- pico/lib/picodata.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picodata.h +@@ -80,16 +80,16 @@ picodata_CharBuffer picodata_newCharBuffer(picoos_Memo + picoos_Common common, picoos_objsize_t size); + + void picodata_disposeCharBuffer(picoos_MemoryManager mm, +- picodata_CharBuffer * this); ++ picodata_CharBuffer * self); + + /* should not be used for PUs but only for feeding the initial cb */ +-pico_status_t picodata_cbPutCh(register picodata_CharBuffer this, picoos_char ch); ++pico_status_t picodata_cbPutCh(picodata_CharBuffer self, picoos_char ch); + + /* should not be used for PUs other than first PU in the chain (picotok) */ +-picoos_int16 picodata_cbGetCh(register picodata_CharBuffer this); ++picoos_int16 picodata_cbGetCh(picodata_CharBuffer self); + + /* reset cb (as if after newCharBuffer) */ +-pico_status_t picodata_cbReset (register picodata_CharBuffer this); ++pico_status_t picodata_cbReset (picodata_CharBuffer self); + + /* ** CharBuffer item functions, cf. below in items section ****/ + +@@ -298,7 +298,7 @@ typedef struct picodata_itemhead + PICO_EXC_BUF_UNDERFLOW <- cb not empty, but no valid item + PICO_EXC_BUF_OVERFLOW <- buf not large enough + */ +-pico_status_t picodata_cbGetItem(register picodata_CharBuffer this, ++pico_status_t picodata_cbGetItem(picodata_CharBuffer self, + picoos_uint8 *buf, const picoos_uint16 blenmax, + picoos_uint16 *blen); + +@@ -310,7 +310,7 @@ pico_status_t picodata_cbGetItem(register picodata_Cha + PICO_EXC_BUF_UNDERFLOW <- cb not empty, but no valid item + PICO_EXC_BUF_OVERFLOW <- buf not large enough + */ +-pico_status_t picodata_cbGetSpeechData(register picodata_CharBuffer this, ++pico_status_t picodata_cbGetSpeechData(picodata_CharBuffer self, + picoos_uint8 *buf, const picoos_uint16 blenmax, + picoos_uint16 *blen); + +@@ -321,12 +321,12 @@ pico_status_t picodata_cbGetSpeechData(register picoda + PICO_EXC_BUF_UNDERFLOW <- no valid item in buf + PICO_EXC_BUF_OVERFLOW <- cb not large enough + */ +-pico_status_t picodata_cbPutItem(register picodata_CharBuffer this, ++pico_status_t picodata_cbPutItem(picodata_CharBuffer self, + const picoos_uint8 *buf, const picoos_uint16 blenmax, + picoos_uint16 *blen); + + /* unsafe, just for measuring purposes */ +-picoos_uint8 picodata_cbGetFrontItemType(register picodata_CharBuffer this); ++picoos_uint8 picodata_cbGetFrontItemType(picodata_CharBuffer self); + + /* *************************************************************** + * items: support function * +@@ -490,18 +490,18 @@ picodata_ProcessingUnit picodata_newProcessingUnit( + + void picodata_disposeProcessingUnit( + picoos_MemoryManager mm, +- picodata_ProcessingUnit * this); ++ picodata_ProcessingUnit * self); + +-picodata_CharBuffer picodata_getCbIn(picodata_ProcessingUnit this); +-picodata_CharBuffer picodata_getCbOut(picodata_ProcessingUnit this); +-pico_status_t picodata_setCbIn(picodata_ProcessingUnit this, picodata_CharBuffer cbIn); +-pico_status_t picodata_setCbOut(picodata_ProcessingUnit this, picodata_CharBuffer cbOut); ++picodata_CharBuffer picodata_getCbIn(picodata_ProcessingUnit self); ++picodata_CharBuffer picodata_getCbOut(picodata_ProcessingUnit self); ++pico_status_t picodata_setCbIn(picodata_ProcessingUnit self, picodata_CharBuffer cbIn); ++pico_status_t picodata_setCbOut(picodata_ProcessingUnit self, picodata_CharBuffer cbOut); + + /* protected */ +-typedef pico_status_t (* picodata_puInitializeMethod) (register picodata_ProcessingUnit this, picoos_int32 mode); +-typedef pico_status_t (* picodata_puTerminateMethod) (register picodata_ProcessingUnit this); +-typedef picodata_step_result_t (* picodata_puStepMethod) (register picodata_ProcessingUnit this, picoos_int16 mode, picoos_uint16 * numBytesOutput); +-typedef pico_status_t (* picodata_puSubDeallocateMethod) (register picodata_ProcessingUnit this, picoos_MemoryManager mm); ++typedef pico_status_t (* picodata_puInitializeMethod) (picodata_ProcessingUnit self, picoos_int32 mode); ++typedef pico_status_t (* picodata_puTerminateMethod) (picodata_ProcessingUnit self); ++typedef picodata_step_result_t (* picodata_puStepMethod) (picodata_ProcessingUnit self, picoos_int16 mode, picoos_uint16 * numBytesOutput); ++typedef pico_status_t (* picodata_puSubDeallocateMethod) (picodata_ProcessingUnit self, picoos_MemoryManager mm); + + typedef struct picodata_processing_unit + { Property changes on: audio/libttspico/files/patch-pico_lib_picodata.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picofftsg.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picofftsg.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picofftsg.h (working copy) @@ -0,0 +1,11 @@ +--- pico/lib/picofftsg.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picofftsg.h +@@ -26,7 +26,7 @@ + * + */ + #ifndef PICOFFTSG_H_ +-#define PCOFFTSG_H_ ++#define PICOFFTSG_H_ + + #include "picoos.h" + #include "picodsp.h" Property changes on: audio/libttspico/files/patch-pico_lib_picofftsg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picokdbg.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picokdbg.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picokdbg.h (working copy) @@ -0,0 +1,20 @@ +--- pico/lib/picokdbg.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picokdbg.h +@@ -49,7 +49,7 @@ extern "C" { + /** + * to be used by picorsrc only + */ +-pico_status_t picokdbg_specializeDbgKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picokdbg_specializeDbgKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + typedef struct picokdbg_dbg *picokdbg_Dbg; +@@ -57,7 +57,7 @@ typedef struct picokdbg_dbg *picokdbg_Dbg; + /** + * return kb Phones for usage in PU + */ +-picokdbg_Dbg picokdbg_getDbg(picoknow_KnowledgeBase this); ++picokdbg_Dbg picokdbg_getDbg(picoknow_KnowledgeBase self); + + + /* phone ID - phone symbol conversion functions */ Property changes on: audio/libttspico/files/patch-pico_lib_picokdbg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picokdt.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picokdt.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picokdt.h (working copy) @@ -0,0 +1,224 @@ +--- pico/lib/picokdt.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picokdt.h +@@ -73,7 +73,7 @@ typedef enum { + PICOKDT_KDTTYPE_PAM + } picokdt_kdttype_t; + +-pico_status_t picokdt_specializeDtKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picokdt_specializeDtKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common, + const picokdt_kdttype_t type); + +@@ -91,12 +91,12 @@ typedef struct picokdt_dtacc * picokdt_DtACC; + typedef struct picokdt_dtpam * picokdt_DtPAM; + + /* return kb decision tree for usage in PU */ +-picokdt_DtPosP picokdt_getDtPosP(picoknow_KnowledgeBase this); +-picokdt_DtPosD picokdt_getDtPosD(picoknow_KnowledgeBase this); +-picokdt_DtG2P picokdt_getDtG2P (picoknow_KnowledgeBase this); +-picokdt_DtPHR picokdt_getDtPHR (picoknow_KnowledgeBase this); +-picokdt_DtACC picokdt_getDtACC (picoknow_KnowledgeBase this); +-picokdt_DtPAM picokdt_getDtPAM (picoknow_KnowledgeBase this); ++picokdt_DtPosP picokdt_getDtPosP(picoknow_KnowledgeBase self); ++picokdt_DtPosD picokdt_getDtPosD(picoknow_KnowledgeBase self); ++picokdt_DtG2P picokdt_getDtG2P (picoknow_KnowledgeBase self); ++picokdt_DtPHR picokdt_getDtPHR (picoknow_KnowledgeBase self); ++picokdt_DtACC picokdt_getDtACC (picoknow_KnowledgeBase self); ++picokdt_DtPAM picokdt_getDtPAM (picoknow_KnowledgeBase self); + + + /* number of attributes (= input vector size) for each tree type */ +@@ -137,15 +137,15 @@ typedef struct { + for every tree type there is a constructInVec function to construct + the size-optimized input vector for the tree using the input map + tables that are part of the decistion tree knowledge base. The +- constructed input vector is stored in the tree object (this->invec +- and this->inveclen) and will be used in the following call to the ++ constructed input vector is stored in the tree object (self->invec ++ and self->inveclen) and will be used in the following call to the + classify function. + + classify: + for every tree type there is a classify function to apply the + decision tree to the previously constructed input vector. The + size-optimized, encoded output is stored in the tree object +- (this->outval) and will be used in the following call to the ++ (self->outval) and will be used in the following call to the + decompose function. Where needed (hitory attribute) the direct tree + output is returned by the classify function in a variable. + +@@ -208,22 +208,22 @@ typedef struct { + returns: TRUE if okay, FALSE otherwise + note: use PICOKDT_OUTSIDEGRAPH* for att values outside context + */ +-picoos_uint8 picokdt_dtPosPconstructInVec(const picokdt_DtPosP this, ++picoos_uint8 picokdt_dtPosPconstructInVec(const picokdt_DtPosP self, + const picoos_uint8 *graph, + const picoos_uint16 graphlen, + const picoos_uint8 specgraphflag); + + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPosPclassify(const picokdt_DtPosP this); ++picoos_uint8 picokdt_dtPosPclassify(const picokdt_DtPosP self); + + /* decompose the tree output and return the class in dtres + dtres: POS or POSgroup ID classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPosPdecomposeOutClass(const picokdt_DtPosP this, ++picoos_uint8 picokdt_dtPosPdecomposeOutClass(const picokdt_DtPosP self, + picokdt_classify_result_t *dtres); + + +@@ -248,26 +248,26 @@ picoos_uint8 picokdt_dtPosPdecomposeOutClass(const pic + if POS in fol* unique use this POS instead of real + history, use reverse output mapping in these cases + */ +-picoos_uint8 picokdt_dtPosDconstructInVec(const picokdt_DtPosD this, ++picoos_uint8 picokdt_dtPosDconstructInVec(const picokdt_DtPosD self, + const picoos_uint16 * input); + + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + treeout: direct tree output value + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPosDclassify(const picokdt_DtPosD this, ++picoos_uint8 picokdt_dtPosDclassify(const picokdt_DtPosD self, + picoos_uint16 *treeout); + + /* decompose the tree output and return the class in dtres + dtres: POS classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPosDdecomposeOutClass(const picokdt_DtPosD this, ++picoos_uint8 picokdt_dtPosDdecomposeOutClass(const picokdt_DtPosD self, + picokdt_classify_result_t *dtres); + + /* convert (unique) POS index into corresponding tree output index */ +-picoos_uint8 picokdt_dtPosDreverseMapOutFixed(const picokdt_DtPosD this, ++picoos_uint8 picokdt_dtPosDreverseMapOutFixed(const picokdt_DtPosD self, + const picoos_uint16 inval, + picoos_uint16 *outval, + picoos_uint16 *outfallbackval); +@@ -294,7 +294,7 @@ picoos_uint8 picokdt_dtPosDreverseMapOutFixed(const pi + phonech1-3: the three following phon chunks predicted (right-to-left) + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtG2PconstructInVec(const picokdt_DtG2P this, ++picoos_uint8 picokdt_dtG2PconstructInVec(const picokdt_DtG2P self, + const picoos_uint8 *graph, + const picoos_uint16 graphlen, + const picoos_uint8 count, +@@ -306,18 +306,18 @@ picoos_uint8 picokdt_dtG2PconstructInVec(const picokdt + const picoos_uint16 phonech2, + const picoos_uint16 phonech3); + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + treeout: direct tree output value + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtG2Pclassify(const picokdt_DtG2P this, ++picoos_uint8 picokdt_dtG2Pclassify(const picokdt_DtG2P self, + picoos_uint16 *treeout); + + /* decompose the tree output and return the class vector in dtvres + dtvres: phones vector classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtG2PdecomposeOutClass(const picokdt_DtG2P this, ++picoos_uint8 picokdt_dtG2PdecomposeOutClass(const picokdt_DtG2P self, + picokdt_classify_vecresult_t *dtvres); + + +@@ -345,7 +345,7 @@ picoos_uint8 picokdt_dtG2PdecomposeOutClass(const pico + returns: TRUE if okay, FALSE otherwise + note: use PICOKDT_EPSILON for att values outside context + */ +-picoos_uint8 picokdt_dtPHRconstructInVec(const picokdt_DtPHR this, ++picoos_uint8 picokdt_dtPHRconstructInVec(const picokdt_DtPHR self, + const picoos_uint8 pre2, + const picoos_uint8 pre1, + const picoos_uint8 src, +@@ -355,16 +355,16 @@ picoos_uint8 picokdt_dtPHRconstructInVec(const picokdt + const picoos_uint16 nrwordsfol, + const picoos_uint16 nrsyllsfol); + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPHRclassify(const picokdt_DtPHR this); ++picoos_uint8 picokdt_dtPHRclassify(const picokdt_DtPHR self); + + /* decompose the tree output and return the class vector in dtres + dtres: phrasing classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPHRdecomposeOutClass(const picokdt_DtPHR this, ++picoos_uint8 picokdt_dtPHRdecomposeOutClass(const picokdt_DtPHR self, + picokdt_classify_result_t *dtres); + + +@@ -400,7 +400,7 @@ picoos_uint8 picokdt_dtPHRdecomposeOutClass(const pico + returns: TRUE if okay, FALSE otherwise + note: use PICOKDT_EPSILON for att 0-4 values outside context + */ +-picoos_uint8 picokdt_dtACCconstructInVec(const picokdt_DtACC this, ++picoos_uint8 picokdt_dtACCconstructInVec(const picokdt_DtACC self, + const picoos_uint8 pre2, + const picoos_uint8 pre1, + const picoos_uint8 src, +@@ -415,18 +415,18 @@ picoos_uint8 picokdt_dtACCconstructInVec(const picokdt + const picoos_uint16 footwordsfol, + const picoos_uint16 footsyllsfol); + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + treeout: direct tree output value + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtACCclassify(const picokdt_DtACC this, ++picoos_uint8 picokdt_dtACCclassify(const picokdt_DtACC self, + picoos_uint16 *treeout); + + /* decompose the tree output and return the class vector in dtres + dtres: phrasing classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtACCdecomposeOutClass(const picokdt_DtACC this, ++picoos_uint8 picokdt_dtACCdecomposeOutClass(const picokdt_DtACC self, + picokdt_classify_result_t *dtres); + + +@@ -440,20 +440,20 @@ picoos_uint8 picokdt_dtACCdecomposeOutClass(const pico + veclen: length of vec in number of bytes + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPAMconstructInVec(const picokdt_DtPAM this, ++picoos_uint8 picokdt_dtPAMconstructInVec(const picokdt_DtPAM self, + const picoos_uint8 *vec, + const picoos_uint8 veclen); + +-/* classify a previously constructed input vector using tree 'this' ++/* classify a previously constructed input vector using tree 'self' + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPAMclassify(const picokdt_DtPAM this); ++picoos_uint8 picokdt_dtPAMclassify(const picokdt_DtPAM self); + + /* decompose the tree output and return the class in dtres + dtres: phones vector classification result + returns: TRUE if okay, FALSE otherwise + */ +-picoos_uint8 picokdt_dtPAMdecomposeOutClass(const picokdt_DtPAM this, ++picoos_uint8 picokdt_dtPAMdecomposeOutClass(const picokdt_DtPAM self, + picokdt_classify_result_t *dtres); + + #ifdef __cplusplus Property changes on: audio/libttspico/files/patch-pico_lib_picokdt.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picokfst.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picokfst.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picokfst.h (working copy) @@ -0,0 +1,84 @@ +--- pico/lib/picokfst.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picokfst.h +@@ -87,7 +87,7 @@ enum picofst_transduction_mode { + /* calculates a small number of data (e.g. addresses) from kb for fast access. + * This data is encapsulated in a picokfst_FST that can later be retrieved + * with picokfst_getFST. */ +-pico_status_t picokfst_specializeFSTKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picokfst_specializeFSTKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + +@@ -99,7 +99,7 @@ pico_status_t picokfst_specializeFSTKnowledgeBase(pico + typedef struct picokfst_fst * picokfst_FST; + + /* return kb FST for usage in PU */ +-picokfst_FST picokfst_getFST(picoknow_KnowledgeBase this); ++picokfst_FST picokfst_getFST(picoknow_KnowledgeBase self); + + + /* ************************************************************/ +@@ -108,31 +108,31 @@ picokfst_FST picokfst_getFST(picoknow_KnowledgeBase th + + /* returns transduction mode specified with rule sources; + result to be interpreted as set of picofst_transduction_mode */ +-picoos_uint8 picokfst_kfstGetTransductionMode(picokfst_FST this); ++picoos_uint8 picokfst_kfstGetTransductionMode(picokfst_FST self); + + /* returns number of states and number of pair classes in FST; + legal states are 1..nrStates, legal classes are 1..nrClasses */ +-void picokfst_kfstGetFSTSizes (picokfst_FST this, picoos_int32 *nrStates, picoos_int32 *nrClasses); ++void picokfst_kfstGetFSTSizes (picokfst_FST self, picoos_int32 *nrStates, picoos_int32 *nrClasses); + + /* starts search for all pairs with input symbol 'inSym'; '*inSymFound' returns whether + such pairs exist at all; '*searchState' returns a search state to be used in + subsequent calls to function 'picokfst_kfstGetNextPair', which must be used + to get the symbol pairs */ +-void picokfst_kfstStartPairSearch (picokfst_FST this, picokfst_symid_t inSym, ++void picokfst_kfstStartPairSearch (picokfst_FST self, picokfst_symid_t inSym, + picoos_bool * inSymFound, picoos_int32 * searchState); + + /* gets next pair for input symbol specified with preceding call to 'picokfst_kfstStartPairSearch'; + '*searchState' maintains the search state, 'pairFound' returns whether any more pair was found, + '*outSym' returns the output symbol of the found pair, and '*pairClass' returns the + transition class of the found symbol pair */ +-void picokfst_kfstGetNextPair (picokfst_FST this, picoos_int32 * searchState, ++void picokfst_kfstGetNextPair (picokfst_FST self, picoos_int32 * searchState, + picoos_bool * pairFound, + picokfst_symid_t * outSym, picokfst_class_t * pairClass); + + /* attempts to do FST transition from state 'startState' with pair class 'transClass'; + if such a transition exists, 'endState' returns the end state of the transition (> 0), + otherwise 'endState' returns <= 0 */ +-void picokfst_kfstGetTrans (picokfst_FST this, picokfst_state_t startState, picokfst_class_t transClass, ++void picokfst_kfstGetTrans (picokfst_FST self, picokfst_state_t startState, picokfst_class_t transClass, + picokfst_state_t * endState); + + /* starts search for all pairs with input epsilon symbol and all correponding +@@ -141,7 +141,7 @@ void picokfst_kfstGetTrans (picokfst_FST this, picokfs + '*inEpsTransFound' returns whether any such transition was found at all; + if so, '*searchState' returns a search state to be used in subsequent calls + to 'picokfst_kfstGetNextInEpsTrans' */ +-void picokfst_kfstStartInEpsTransSearch (picokfst_FST this, picokfst_state_t startState, ++void picokfst_kfstStartInEpsTransSearch (picokfst_FST self, picokfst_state_t startState, + picoos_bool * inEpsTransFound, picoos_int32 * searchState); + + /* gets next FST transition with a pair with empty input symbol starting from a state +@@ -150,7 +150,7 @@ void picokfst_kfstStartInEpsTransSearch (picokfst_FST + whether a new transition with input epsilon was found, '*outSym 'returns + the output symbol of the found pair, and '*endState' returns the end state + of the found transition with that pair */ +-void picokfst_kfstGetNextInEpsTrans (picokfst_FST this, picoos_int32 * searchState, ++void picokfst_kfstGetNextInEpsTrans (picokfst_FST self, picoos_int32 * searchState, + picoos_bool * inEpsTransFound, + picokfst_symid_t * outSym, picokfst_state_t * endState); + +@@ -159,7 +159,7 @@ void picokfst_kfstGetNextInEpsTrans (picokfst_FST this + always do a last transition with a termination symbol pair, this function + defines a state as an accepting state if there is transition to state 1 + with the terminator symbol pair */ +-picoos_bool picokfst_kfstIsAcceptingState (picokfst_FST this, picokfst_state_t state); ++picoos_bool picokfst_kfstIsAcceptingState (picokfst_FST self, picokfst_state_t state); + + #ifdef __cplusplus + } Property changes on: audio/libttspico/files/patch-pico_lib_picokfst.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoklex.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoklex.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoklex.h (working copy) @@ -0,0 +1,38 @@ +--- pico/lib/picoklex.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoklex.h +@@ -45,7 +45,7 @@ extern "C" { + /* to be used by picorsrc only */ + /* ************************************************************/ + +-pico_status_t picoklex_specializeLexKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picoklex_specializeLexKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + +@@ -57,7 +57,7 @@ pico_status_t picoklex_specializeLexKnowledgeBase(pico + typedef struct picoklex_lex * picoklex_Lex; + + /* return kb lex for usage in PU */ +-picoklex_Lex picoklex_getLex(picoknow_KnowledgeBase this); ++picoklex_Lex picoklex_getLex(picoknow_KnowledgeBase self); + + + /* ************************************************************/ +@@ -106,7 +106,7 @@ typedef struct { + PICOKLEX_IND_SIZE bytes are used for the index, these ind bytes are + saved in the WORDINDEX items. If at least one entry is found TRUE + is returned, FALSE otherwise */ +-picoos_uint8 picoklex_lexLookup(const picoklex_Lex this, ++picoos_uint8 picoklex_lexLookup(const picoklex_Lex self, + const picoos_uint8 *graph, + const picoos_uint16 graphlen, + picoklex_lexl_result_t *lexres); +@@ -114,7 +114,7 @@ picoos_uint8 picoklex_lexLookup(const picoklex_Lex thi + /** lookup lex entry by index ind; ind is a sequence of bytes with + length indlen (must be equal PICOKLEX_IND_SIZE) that is the content + of a WORDINDEX item. Returns TRUE if okay, FALSE otherwise */ +-picoos_uint8 picoklex_lexIndLookup(const picoklex_Lex this, ++picoos_uint8 picoklex_lexIndLookup(const picoklex_Lex self, + const picoos_uint8 *ind, + const picoos_uint8 indlen, + picoos_uint8 *pos, Property changes on: audio/libttspico/files/patch-pico_lib_picoklex.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoknow.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoknow.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoknow.h (working copy) @@ -0,0 +1,20 @@ +--- pico/lib/picoknow.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoknow.h +@@ -164,7 +164,7 @@ typedef enum picoknow_kb_id { + */ + typedef struct picoknow_knowledge_base * picoknow_KnowledgeBase; + +-typedef pico_status_t (* picoknow_kbSubDeallocate) (register picoknow_KnowledgeBase this, picoos_MemoryManager mm); ++typedef pico_status_t (* picoknow_kbSubDeallocate) (picoknow_KnowledgeBase self, picoos_MemoryManager mm); + + typedef struct picoknow_knowledge_base { + /* public */ +@@ -180,7 +180,7 @@ typedef struct picoknow_knowledge_base { + + extern picoknow_KnowledgeBase picoknow_newKnowledgeBase(picoos_MemoryManager mm); + +-extern void picoknow_disposeKnowledgeBase(picoos_MemoryManager mm, picoknow_KnowledgeBase * this); ++extern void picoknow_disposeKnowledgeBase(picoos_MemoryManager mm, picoknow_KnowledgeBase * self); + + #ifdef __cplusplus + } Property changes on: audio/libttspico/files/patch-pico_lib_picoknow.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picokpdf.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picokpdf.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picokpdf.h (working copy) @@ -0,0 +1,33 @@ +--- pico/lib/picokpdf.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picokpdf.h +@@ -77,7 +77,7 @@ typedef enum { + PICOKPDF_KPDFTYPE_PHS + } picokpdf_kpdftype_t; + +-pico_status_t picokpdf_specializePdfKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picokpdf_specializePdfKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common, + const picokpdf_kpdftype_t type); + +@@ -132,9 +132,9 @@ typedef struct picokpdf_pdfphs { + } picokpdf_pdfphs_t; + + /* return kb pdf for usage in PU */ +-picokpdf_PdfDUR picokpdf_getPdfDUR(picoknow_KnowledgeBase this); +-picokpdf_PdfMUL picokpdf_getPdfMUL(picoknow_KnowledgeBase this); +-picokpdf_PdfPHS picokpdf_getPdfPHS(picoknow_KnowledgeBase this); ++picokpdf_PdfDUR picokpdf_getPdfDUR(picoknow_KnowledgeBase self); ++picokpdf_PdfMUL picokpdf_getPdfMUL(picoknow_KnowledgeBase self); ++picokpdf_PdfPHS picokpdf_getPdfPHS(picoknow_KnowledgeBase self); + + + /* ************************************************************/ +@@ -142,7 +142,7 @@ picokpdf_PdfPHS picokpdf_getPdfPHS(picoknow_KnowledgeB + /* ************************************************************/ + + /* e.g. */ +-/*picoos_uint8 picokpdf_pdfDURgetEle(const picokpdf_PdfDUR this, ++/*picoos_uint8 picokpdf_pdfDURgetEle(const picokpdf_PdfDUR self, + const picoos_uint16 row, + const picoos_uint16 col, + picoos_uint16 *val); Property changes on: audio/libttspico/files/patch-pico_lib_picokpdf.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picokpr.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picokpr.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picokpr.h (working copy) @@ -0,0 +1,20 @@ +--- pico/lib/picokpr.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picokpr.h +@@ -51,7 +51,7 @@ extern "C" { + /* to be used by picorsrc only */ + /* ************************************************************/ + +-pico_status_t picokpr_specializePreprocKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picokpr_specializePreprocKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + +@@ -87,7 +87,7 @@ typedef picoos_uint32 picokpr_TokSetWP; + typedef struct picokpr_preproc * picokpr_Preproc; + + /* return kb preproc for usage in PU */ +-picokpr_Preproc picokpr_getPreproc(picoknow_KnowledgeBase this); ++picokpr_Preproc picokpr_getPreproc(picoknow_KnowledgeBase self); + + + /* *****************************************************************************/ Property changes on: audio/libttspico/files/patch-pico_lib_picokpr.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoktab.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoktab.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoktab.h (working copy) @@ -0,0 +1,191 @@ +--- pico/lib/picoktab.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoktab.h +@@ -61,10 +61,10 @@ typedef struct picoktab_fixed_ids { + } picoktab_fixed_ids_t; + + /* to be used by picorsrc only */ +-pico_status_t picoktab_specializeIdsKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picoktab_specializeIdsKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + +-picoktab_FixedIds picoktab_getFixedIds(picoknow_KnowledgeBase this); ++picoktab_FixedIds picoktab_getFixedIds(picoknow_KnowledgeBase self); + + + /* ************************************************************/ +@@ -74,52 +74,52 @@ picoktab_FixedIds picoktab_getFixedIds(picoknow_Knowle + typedef struct picoktab_graphs *picoktab_Graphs; + + /* to be used by picorsrc only */ +-pico_status_t picoktab_specializeGraphsKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picoktab_specializeGraphsKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + /* return kb graphs for usage in PU */ +-picoktab_Graphs picoktab_getGraphs(picoknow_KnowledgeBase this); ++picoktab_Graphs picoktab_getGraphs(picoknow_KnowledgeBase self); + + /* graph access routine: if the desired graph 'utf8graph' exists in + the graph table a graph offset > 0 is returned, which then can be + used to access the properties */ +-picoos_uint32 picoktab_graphOffset(const picoktab_Graphs this, ++picoos_uint32 picoktab_graphOffset(const picoktab_Graphs self, + picoos_uchar * utf8graph); + + + /* check if UTF8 char 'graph' has property vowellike, return non-zero + if 'ch' has the property, 0 otherwise */ +-picoos_uint8 picoktab_hasVowellikeProp(const picoktab_Graphs this, ++picoos_uint8 picoktab_hasVowellikeProp(const picoktab_Graphs self, + const picoos_uint8 *graph, + const picoos_uint8 graphlenmax); + + /* graph properties access routines: if graph with offset 'graphsOffset' has the + desired property, returns TRUE if 'ch' has the property, FALSE otherwise */ +-picoos_bool picoktab_getIntPropTokenType(const picoktab_Graphs this, ++picoos_bool picoktab_getIntPropTokenType(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uint8 *stokenType); +-picoos_bool picoktab_getIntPropTokenSubType(const picoktab_Graphs this, ++picoos_bool picoktab_getIntPropTokenSubType(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_int8 *stokenSubType); +-picoos_bool picoktab_getIntPropValue(const picoktab_Graphs this, ++picoos_bool picoktab_getIntPropValue(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uint32 *value); +-picoos_bool picoktab_getStrPropLowercase(const picoktab_Graphs this, ++picoos_bool picoktab_getStrPropLowercase(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uchar *lowercase); +-picoos_bool picoktab_getStrPropGraphsubs1(const picoktab_Graphs this, ++picoos_bool picoktab_getStrPropGraphsubs1(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uchar *graphsubs1); +-picoos_bool picoktab_getStrPropGraphsubs2(const picoktab_Graphs this, ++picoos_bool picoktab_getStrPropGraphsubs2(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uchar *graphsubs2); +-picoos_bool picoktab_getIntPropPunct(const picoktab_Graphs this, ++picoos_bool picoktab_getIntPropPunct(const picoktab_Graphs self, + picoos_uint32 graphsOffset, + picoos_uint8 *info1, + picoos_uint8 *info2); + +-picoos_uint16 picoktab_graphsGetNumEntries(const picoktab_Graphs this); +-void picoktab_graphsGetGraphInfo(const picoktab_Graphs this, ++picoos_uint16 picoktab_graphsGetNumEntries(const picoktab_Graphs self); ++void picoktab_graphsGetGraphInfo(const picoktab_Graphs self, + picoos_uint16 graphIndex, picoos_uchar * from, picoos_uchar * to, + picoos_uint8 * propset, + picoos_uint8 * stokenType, picoos_uint8 * stokenSubType, +@@ -133,60 +133,60 @@ void picoktab_graphsGetGraphInfo(const picoktab_Graphs + /* ************************************************************/ + + /* to be used by picorsrc only */ +-pico_status_t picoktab_specializePhonesKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picoktab_specializePhonesKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + typedef struct picoktab_phones *picoktab_Phones; + + /* return kb Phones for usage in PU */ +-picoktab_Phones picoktab_getPhones(picoknow_KnowledgeBase this); ++picoktab_Phones picoktab_getPhones(picoknow_KnowledgeBase self); + + /* check if 'ch' has a property, return non-zero if 'ch' has the + property, 0 otherwise */ +-picoos_uint8 picoktab_hasVowelProp(const picoktab_Phones this, ++picoos_uint8 picoktab_hasVowelProp(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_uint8 picoktab_hasDiphthProp(const picoktab_Phones this, ++picoos_uint8 picoktab_hasDiphthProp(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_uint8 picoktab_hasGlottProp(const picoktab_Phones this, ++picoos_uint8 picoktab_hasGlottProp(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_uint8 picoktab_hasNonsyllvowelProp(const picoktab_Phones this, ++picoos_uint8 picoktab_hasNonsyllvowelProp(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_uint8 picoktab_hasSyllconsProp(const picoktab_Phones this, ++picoos_uint8 picoktab_hasSyllconsProp(const picoktab_Phones self, + const picoos_uint8 ch); + + /* to speed up processing for often used combinations of properties + the following functions are provided, which check if the property + combination is true for 'ch' */ +-picoos_bool picoktab_isSyllCarrier(const picoktab_Phones this, ++picoos_bool picoktab_isSyllCarrier(const picoktab_Phones self, + const picoos_uint8 ch); + + /* some properties can be assigned to a single sym only, check if 'ch' + is a special sym, return TRUE if it is the special sym, FALSE + otherwise */ +-picoos_bool picoktab_isPrimstress(const picoktab_Phones this, ++picoos_bool picoktab_isPrimstress(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_bool picoktab_isSecstress(const picoktab_Phones this, ++picoos_bool picoktab_isSecstress(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_bool picoktab_isSyllbound(const picoktab_Phones this, ++picoos_bool picoktab_isSyllbound(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_bool picoktab_isWordbound(const picoktab_Phones this, ++picoos_bool picoktab_isWordbound(const picoktab_Phones self, + const picoos_uint8 ch); +-picoos_bool picoktab_isPause(const picoktab_Phones this, ++picoos_bool picoktab_isPause(const picoktab_Phones self, + const picoos_uint8 ch); + + /* get specific sym values */ +-picoos_uint8 picoktab_getPrimstressID(const picoktab_Phones this); +-picoos_uint8 picoktab_getSecstressID(const picoktab_Phones this); +-picoos_uint8 picoktab_getSyllboundID(const picoktab_Phones this); +-picoos_uint8 picoktab_getWordboundID(const picoktab_Phones this); +-picoos_uint8 picoktab_getPauseID(const picoktab_Phones this); ++picoos_uint8 picoktab_getPrimstressID(const picoktab_Phones self); ++picoos_uint8 picoktab_getSecstressID(const picoktab_Phones self); ++picoos_uint8 picoktab_getSyllboundID(const picoktab_Phones self); ++picoos_uint8 picoktab_getWordboundID(const picoktab_Phones self); ++picoos_uint8 picoktab_getPauseID(const picoktab_Phones self); + + /* ************************************************************/ + /* Pos type and functions */ + /* ************************************************************/ + + /* to be used by picorsrc only */ +-pico_status_t picoktab_specializePosKnowledgeBase(picoknow_KnowledgeBase this, ++pico_status_t picoktab_specializePosKnowledgeBase(picoknow_KnowledgeBase self, + picoos_Common common); + + typedef struct picoktab_pos *picoktab_Pos; +@@ -194,25 +194,25 @@ typedef struct picoktab_pos *picoktab_Pos; + #define PICOKTAB_MAXNRPOS_IN_COMB 8 + + /* return kb Pos for usage in PU */ +-picoktab_Pos picoktab_getPos(picoknow_KnowledgeBase this); ++picoktab_Pos picoktab_getPos(picoknow_KnowledgeBase self); + + /* returns TRUE if 'pos' is the ID of a unique (ie. non-combined) POS, + returns FALSE otherwise */ +-picoos_bool picoktab_isUniquePos(const picoktab_Pos this, ++picoos_bool picoktab_isUniquePos(const picoktab_Pos self, + const picoos_uint8 pos); + + /* returns TRUE if the non-combined 'pos' is one of the POSes in the + combined POS group 'posgroup, returns FALSE otherwise. Note: if + 'posgroup' is itself non-combined, this function returns TRUE if it + matches with 'pos', and FALSE otherwise */ +-picoos_bool picoktab_isPartOfPosGroup(const picoktab_Pos this, ++picoos_bool picoktab_isPartOfPosGroup(const picoktab_Pos self, + const picoos_uint8 pos, + const picoos_uint8 posgroup); + + /* return the combined POS group ID that is a representative ID for + all the 'poslistlen' POSes (which can be combined themselves) in + poslist. Returns '0' in case of error. */ +-picoos_uint8 picoktab_getPosGroup(const picoktab_Pos this, ++picoos_uint8 picoktab_getPosGroup(const picoktab_Pos self, + const picoos_uint8 *poslist, + const picoos_uint8 poslistlen); + Property changes on: audio/libttspico/files/patch-pico_lib_picoktab.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picoos.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picoos.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picoos.h (working copy) @@ -0,0 +1,80 @@ +--- pico/lib/picoos.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picoos.h +@@ -129,7 +129,7 @@ typedef struct picoos_common { + + picoos_Common picoos_newCommon(picoos_MemoryManager mm); + +-void picoos_disposeCommon(picoos_MemoryManager mm, picoos_Common * this); ++void picoos_disposeCommon(picoos_MemoryManager mm, picoos_Common * self); + + + /* *****************************************************************/ +@@ -161,8 +161,8 @@ picoos_MemoryManager picoos_newMemoryManager( + void picoos_disposeMemoryManager(picoos_MemoryManager * mm); + + +-void * picoos_allocate(picoos_MemoryManager this, picoos_objsize_t byteSize); +-void picoos_deallocate(picoos_MemoryManager this, void * * adr); ++void * picoos_allocate(picoos_MemoryManager self, picoos_objsize_t byteSize); ++void picoos_deallocate(picoos_MemoryManager self, void * * adr); + + /* the following memory manager routines are for testing and + debugging purposes */ +@@ -190,14 +190,14 @@ void picoos_protectMem( + picoos_bool enable); + + void picoos_getMemUsage( +- picoos_MemoryManager this, ++ picoos_MemoryManager self, + picoos_bool resetIncremental, + picoos_int32 *usedBytes, + picoos_int32 *incrUsedBytes, + picoos_int32 *maxUsedBytes); + + void picoos_showMemUsage( +- picoos_MemoryManager this, ++ picoos_MemoryManager self, + picoos_bool incremental, + picoos_bool resetIncremental); + +@@ -221,30 +221,30 @@ void picoos_setErrorMsg(picoos_char * dst, picoos_objs + picoos_ExceptionManager picoos_newExceptionManager(picoos_MemoryManager mm); + + void picoos_disposeExceptionManager(picoos_MemoryManager mm, +- picoos_ExceptionManager * this); ++ picoos_ExceptionManager * self); + + +-void picoos_emReset(picoos_ExceptionManager this); ++void picoos_emReset(picoos_ExceptionManager self); + +-/* For convenience, this function returns the resulting exception code of 'this' ++/* For convenience, this function returns the resulting exception code of 'self' + * (as would be returned by emGetExceptionCode). + * The return value therefore is NOT the status of raising + * the error! */ +-pico_status_t picoos_emRaiseException(picoos_ExceptionManager this, ++pico_status_t picoos_emRaiseException(picoos_ExceptionManager self, + pico_status_t exceptionCode, picoos_char * baseMessage, picoos_char * fmt, ...); + +-pico_status_t picoos_emGetExceptionCode(picoos_ExceptionManager this); ++pico_status_t picoos_emGetExceptionCode(picoos_ExceptionManager self); + +-void picoos_emGetExceptionMessage(picoos_ExceptionManager this, picoos_char * msg, picoos_uint16 maxsize); ++void picoos_emGetExceptionMessage(picoos_ExceptionManager self, picoos_char * msg, picoos_uint16 maxsize); + +-void picoos_emRaiseWarning(picoos_ExceptionManager this, ++void picoos_emRaiseWarning(picoos_ExceptionManager self, + pico_status_t warningCode, picoos_char * baseMessage, picoos_char * fmt, ...); + +-picoos_uint8 picoos_emGetNumOfWarnings(picoos_ExceptionManager this); ++picoos_uint8 picoos_emGetNumOfWarnings(picoos_ExceptionManager self); + +-pico_status_t picoos_emGetWarningCode(picoos_ExceptionManager this, picoos_uint8 warnNum); ++pico_status_t picoos_emGetWarningCode(picoos_ExceptionManager self, picoos_uint8 warnNum); + +-void picoos_emGetWarningMessage(picoos_ExceptionManager this, picoos_uint8 warnNum, picoos_char * msg, picoos_uint16 maxsize); ++void picoos_emGetWarningMessage(picoos_ExceptionManager self, picoos_uint8 warnNum, picoos_char * msg, picoos_uint16 maxsize); + + + Property changes on: audio/libttspico/files/patch-pico_lib_picoos.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picopltf.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picopltf.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picopltf.h (working copy) @@ -0,0 +1,50 @@ +--- pico/lib/picopltf.h.orig 2021-02-10 14:15:54 UTC ++++ pico/lib/picopltf.h +@@ -38,6 +38,7 @@ + #define PICO_Windows 1 /* Windows */ + #define PICO_MacOSX 5 /* Macintosh OS X */ + #define PICO_Linux 7 /* Linux */ ++#define PICO_FreeBSD 9 /* FreeBSD */ + + #define PICO_GENERIC 99 /* Generic */ + +@@ -49,6 +50,8 @@ + #define PICO_PLATFORM PICO_MacOSX + #elif defined(linux) || defined(__linux__) || defined(__linux) + #define PICO_PLATFORM PICO_Linux ++#elif defined(__FreeBSD__) ++#define PICO_PLATFORM PICO_FreeBSD + #else + #define PICO_PLATFORM PICO_GENERIC + #endif +@@ -62,15 +65,30 @@ + #define PICO_PLATFORM_STRING "MacOSX" + #elif (PICO_PLATFORM == PICO_Linux) + #define PICO_PLATFORM_STRING "Linux" ++#elif (PICO_PLATFORM == PICO_FreeBSD) ++#define PICO_PLATFORM_STRING "FreeBSD" + #elif (PICO_PLATFORM == PICO_GENERIC) + #define PICO_PLATFORM_STRING "UnknownPlatform" + #endif + ++#if (PICO_PLATFORM == PICO_FreeBSD) ++ ++#include ++#if _BYTE_ORDER == _BIG_ENDIAN ++#define PICO_ENDIANNESS ENDIANNESS_BIG ++#else ++#define PICO_ENDIANNESS ENDIANNESS_LITTLE ++#endif ++ ++#else ++ + #include + #if __BYTE_ORDER == __BIG_ENDIAN + #define PICO_ENDIANNESS ENDIANNESS_BIG + #else + #define PICO_ENDIANNESS ENDIANNESS_LITTLE ++#endif ++ + #endif + + #endif /* !defined(__PICOPLTF_H__) */ Property changes on: audio/libttspico/files/patch-pico_lib_picopltf.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picorsrc.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picorsrc.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picorsrc.h (working copy) @@ -0,0 +1,60 @@ +--- pico/lib/picorsrc.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picorsrc.h +@@ -97,7 +97,7 @@ typedef struct picorsrc_resource * picorsrc_Re + + picorsrc_ResourceManager picorsrc_newResourceManager(picoos_MemoryManager mm, picoos_Common common /* , picoos_char * configFile */); + +-void picorsrc_disposeResourceManager(picoos_MemoryManager mm, picorsrc_ResourceManager * this); ++void picorsrc_disposeResourceManager(picoos_MemoryManager mm, picorsrc_ResourceManager * self); + + + /* ************************************************************************** +@@ -113,14 +113,14 @@ picoos_int16 picoctrl_isValidResourceHandle(picorsrc_R + + /* load resource file. the type of resource file, magic numbers, checksum etc. are in the header, then follows the directory + * (with fixed structure per resource type), then the knowledge bases themselves (as byte streams) */ +-pico_status_t picorsrc_loadResource(picorsrc_ResourceManager this, ++pico_status_t picorsrc_loadResource(picorsrc_ResourceManager self, + picoos_char * fileName, picorsrc_Resource * resource); + + /* unload resource file. (warn if resource file is busy) */ +-pico_status_t picorsrc_unloadResource(picorsrc_ResourceManager this, picorsrc_Resource * rsrc); ++pico_status_t picorsrc_unloadResource(picorsrc_ResourceManager self, picorsrc_Resource * rsrc); + + +-pico_status_t picorsrc_createDefaultResource(picorsrc_ResourceManager this /*, ++pico_status_t picorsrc_createDefaultResource(picorsrc_ResourceManager self /*, + picorsrc_Resource * resource */); + + +@@ -134,14 +134,14 @@ pico_status_t picorsrc_rsrcGetName(picorsrc_Resource r + ****************************************************************************/ + + +-pico_status_t picorsrc_createVoiceDefinition(picorsrc_ResourceManager this, ++pico_status_t picorsrc_createVoiceDefinition(picorsrc_ResourceManager self, + picoos_char * voiceName); + + +-pico_status_t picorsrc_releaseVoiceDefinition(picorsrc_ResourceManager this, ++pico_status_t picorsrc_releaseVoiceDefinition(picorsrc_ResourceManager self, + picoos_char * voiceName); + +-pico_status_t picorsrc_addResourceToVoiceDefinition(picorsrc_ResourceManager this, ++pico_status_t picorsrc_addResourceToVoiceDefinition(picorsrc_ResourceManager self, + picoos_char * voiceName, picoos_char * resourceName); + + /* ************************************************************************** +@@ -171,10 +171,10 @@ typedef struct picorsrc_voice { + + + /* create voice, given a voice name. the corresponding lock counts are incremented */ +-pico_status_t picorsrc_createVoice(picorsrc_ResourceManager this, const picoos_char * voiceName, picorsrc_Voice * voice); ++pico_status_t picorsrc_createVoice(picorsrc_ResourceManager self, const picoos_char * voiceName, picorsrc_Voice * voice); + + /* dispose voice. the corresponding lock counts are decremented. */ +-pico_status_t picorsrc_releaseVoice(picorsrc_ResourceManager this, picorsrc_Voice * voice); ++pico_status_t picorsrc_releaseVoice(picorsrc_ResourceManager self, picorsrc_Voice * voice); + + #ifdef __cplusplus + } Property changes on: audio/libttspico/files/patch-pico_lib_picorsrc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/files/patch-pico_lib_picotrns.h =================================================================== --- audio/libttspico/files/patch-pico_lib_picotrns.h (nonexistent) +++ audio/libttspico/files/patch-pico_lib_picotrns.h (working copy) @@ -0,0 +1,24 @@ +--- pico/lib/picotrns.h.orig 2013-03-26 11:18:28 UTC ++++ pico/lib/picotrns.h +@@ -166,17 +166,17 @@ picotrns_SimpleTransducer picotrns_newSimpleTransducer + picoos_Common common, + picoos_uint16 maxAltDescLen); + +-pico_status_t picotrns_disposeSimpleTransducer(picotrns_SimpleTransducer * this, ++pico_status_t picotrns_disposeSimpleTransducer(picotrns_SimpleTransducer * self, + picoos_MemoryManager mm); + + pico_status_t picotrns_stInitialize(picotrns_SimpleTransducer transducer); + +-pico_status_t picotrns_stAddWithPlane(picotrns_SimpleTransducer this, picoos_char * inStr, picoos_uint8 plane); ++pico_status_t picotrns_stAddWithPlane(picotrns_SimpleTransducer self, picoos_char * inStr, picoos_uint8 plane); + +-pico_status_t picotrns_stTransduce(picotrns_SimpleTransducer this, picokfst_FST fst); ++pico_status_t picotrns_stTransduce(picotrns_SimpleTransducer self, picokfst_FST fst); + + pico_status_t picotrns_stGetSymSequence( +- picotrns_SimpleTransducer this, ++ picotrns_SimpleTransducer self, + picoos_uint8 * outputSymIds, + picoos_uint32 maxOutputSymIds); + Property changes on: audio/libttspico/files/patch-pico_lib_picotrns.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/pkg-descr =================================================================== --- audio/libttspico/pkg-descr (nonexistent) +++ audio/libttspico/pkg-descr (working copy) @@ -0,0 +1,13 @@ +SVOX Pico is a very compact multilingual Text-To-Speech (TTS) library. +It was designed for integration in mobile devices and includes female +voices for English (US and GB), French, German, Italian, and Spanish, +each of which takes about 1 MiB of disk space on a 64-bit x86 system. + +Pico TTS was originally open-sourced for Android. This version is the +one maintained by Debian. They consider it to be non-free because the +binary language files don't come with the corresponding source code. +However, formats for both source and binary versions of the lingware +knowledge bases seem to be well documented, and it's all Apache 2.0. +Also, lingware source IS included, but not that for the build tools. + +WWW: https://web.archive.org/web/20100310022501/http://svox.com/ Property changes on: audio/libttspico/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: audio/libttspico/pkg-plist =================================================================== --- audio/libttspico/pkg-plist (nonexistent) +++ audio/libttspico/pkg-plist (working copy) @@ -0,0 +1,54 @@ +bin/pico2wave +include/picoacph.h +include/picoapi.h +include/picoapid.h +include/picobase.h +include/picocep.h +include/picoctrl.h +include/picodata.h +include/picodbg.h +include/picodefs.h +include/picodsp.h +include/picoextapi.h +include/picofftsg.h +include/picokdbg.h +include/picokdt.h +include/picokfst.h +include/picoklex.h +include/picoknow.h +include/picokpdf.h +include/picokpr.h +include/picoktab.h +include/picoos.h +include/picopal.h +include/picopam.h +include/picopltf.h +include/picopr.h +include/picorsrc.h +include/picosa.h +include/picosig.h +include/picosig2.h +include/picospho.h +include/picotok.h +include/picotrns.h +include/picowa.h +lib/libttspico.a +lib/libttspico.so +lib/libttspico.so.0 +lib/libttspico.so.0.0.0 +man/man1/pico2wave.1.gz +%%PORTDOCS%%%%DOCSDIR%%/SVOX_Pico_Lingware.pdf +%%PORTDOCS%%%%DOCSDIR%%/SVOX_Pico_Manual.pdf +%%PORTDOCS%%%%DOCSDIR%%/SVOX_Pico_architecture_and_design.pdf +share/pico/lang/de-DE_gl0_sg.bin +share/pico/lang/de-DE_ta.bin +share/pico/lang/en-GB_kh0_sg.bin +share/pico/lang/en-GB_ta.bin +share/pico/lang/en-US_lh0_sg.bin +share/pico/lang/en-US_ta.bin +share/pico/lang/es-ES_ta.bin +share/pico/lang/es-ES_zl0_sg.bin +share/pico/lang/fr-FR_nk0_sg.bin +share/pico/lang/fr-FR_ta.bin +share/pico/lang/it-IT_cm0_sg.bin +share/pico/lang/it-IT_ta.bin Property changes on: audio/libttspico/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property