From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 28 15:20:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52FD1106568D for ; Mon, 28 Jul 2008 15:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 24E388FC16 for ; Mon, 28 Jul 2008 15:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6SFK4nI006412 for ; Mon, 28 Jul 2008 15:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6SFK4G5006411; Mon, 28 Jul 2008 15:20:04 GMT (envelope-from gnats) Resent-Date: Mon, 28 Jul 2008 15:20:04 GMT Resent-Message-Id: <200807281520.m6SFK4G5006411@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pedro F. Giffuni" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5450A1065680 for ; Mon, 28 Jul 2008 15:11:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 2D69B8FC22 for ; Mon, 28 Jul 2008 15:11:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m6SFBfgV046602 for ; Mon, 28 Jul 2008 15:11:41 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m6SFBerM046601; Mon, 28 Jul 2008 15:11:40 GMT (envelope-from nobody) Message-Id: <200807281511.m6SFBerM046601@www.freebsd.org> Date: Mon, 28 Jul 2008 15:11:40 GMT From: "Pedro F. Giffuni" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/126042: audio/festival: add OGI option X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2008 15:20:04 -0000 >Number: 126042 >Category: ports >Synopsis: audio/festival: add OGI option >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 28 15:20:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.3-Release >Organization: >Environment: %uname -a FreeBSD kakumen.cable.net.co 6.3-RELEASE FreeBSD 6.3-RELEASE #10: Sat Jan 19 01:13:55 COT 2008 root@kakumen.cable.net.co:/usr/src/sys/amd64/compile/SMP amd64 >Description: - Add an option for OGI to the festival port. - The new option is off by default due to license restriction issues (Not for commercial use). - Since OGI has to be built within the festival tree, I would expect the outdated audio/festival+OGI port to become a slave of this port. >How-To-Repeat: The current festival+OGI port is outdated and doesn't build on amd64 (it requires gcc-295), this new port builds fine on amd64. >Fix: diff -ruN festival.orig/Makefile festival/Makefile --- festival.orig/Makefile 2008-07-27 14:26:07.000000000 -0500 +++ festival/Makefile 2008-07-28 09:53:20.000000000 -0500 @@ -11,7 +11,8 @@ PORTVERSION= 1.96 PORTREVISION= 1 CATEGORIES= audio accessibility -MASTER_SITES= ${MASTER_SITE_FESTIVAL} +MASTER_SITES= ${MASTER_SITE_FESTIVAL} \ + http://www.cslu.ogi.edu/tts/download/data/:ogi MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES= ${DISTNAME}-beta.tar.gz \ speech_tools-1.2.${PORTVERSION:E}-beta.tar.gz @@ -20,7 +21,8 @@ COMMENT= Multi-lingual speech synthesis system OPTIONS= NAS "Enable Network Audio System (NAS) backend" on \ - ESD "Enable ESound backend" on + ESD "Enable ESound backend" on \ + OGI "Enable OGI plugin (non commercial)" off DIST_SUBDIR= festival @@ -38,6 +40,8 @@ MAN1= festival.1 festival_client.1 WRKSRC= ${WRKDIR} +.include + do-build: .for d in speech_tools festival ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/$d ${MAKE_FLAGS} Makefile \ @@ -46,15 +50,13 @@ # Can not make test in `festival', because the voices may not be installed # XXX: this should fail, if the verdict is not "Test OK"... -post-build test: +regression-test: ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKDIR}/speech_tools test post-patch:: ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/*/config/systems/default.mak -.include - .for m in nas esd . ifdef WITH_${m:U} LIB_DEPENDS+= ${m:nas=audio}:${PORTSDIR}/audio/${m:esd=esound} @@ -66,6 +68,17 @@ CONFIGURE_ARGS+=--disable-$m . endif .endfor +.ifdef WITH_OGI +PKGNAMESUFFIX= +OGI +DISTFILES+= OGIresLPC-2.2.tar.gz:ogi +PLIST_SUB+= OGI="" +post-patch:: + ${REINPLACE_CMD} -e 's,#OGI,,g' \ + ${WRKDIR}/festival/config/config.in \ + ${WRKDIR}/festival/src/modules/Makefile +.else +PLIST_SUB+= OGI="@comment" +.endif do-configure: .for d in speech_tools festival diff -ruN festival.orig/distinfo festival/distinfo --- festival.orig/distinfo 2008-07-27 14:26:07.000000000 -0500 +++ festival/distinfo 2008-07-27 14:52:32.000000000 -0500 @@ -4,3 +4,6 @@ MD5 (festival/speech_tools-1.2.96-beta.tar.gz) = 887e0c7586facb97cfc0114a105763b2 SHA256 (festival/speech_tools-1.2.96-beta.tar.gz) = fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428 SIZE (festival/speech_tools-1.2.96-beta.tar.gz) = 1275015 +MD5 (festival/OGIresLPC-2.2.tar.gz) = 937db6f60cf73f8437c8b4f8bfd4098f +SHA256 (festival/OGIresLPC-2.2.tar.gz) = b36fa0b504706693b4c34c8bac512f9fcf38a3ea2e99a30c0d4b18c3f8d39387 +SIZE (festival/OGIresLPC-2.2.tar.gz) = 168360 diff -ruN festival.orig/files/patch-festival+config+config.in festival/files/patch-festival+config+config.in --- festival.orig/files/patch-festival+config+config.in 1969-12-31 19:00:00.000000000 -0500 +++ festival/files/patch-festival+config+config.in 2008-07-28 09:51:55.000000000 -0500 @@ -0,0 +1,11 @@ +--- festival/config/config.in.orig 2008-07-27 15:02:05.000000000 -0500 ++++ festival/config/config.in 2008-07-27 15:03:09.000000000 -0500 +@@ -63,7 +63,7 @@ + + ## Other (non-Edinburgh) modules may also be specified here (e.g. OGI code), + +-ALSO_INCLUDE += ++#OGIALSO_INCLUDE += OGIcommon OGIeffect OGIinsert OGIdbase OGIresLPC + + ########################################################################### + ## diff -ruN festival.orig/files/patch-festival+src+modules+Makefile festival/files/patch-festival+src+modules+Makefile --- festival.orig/files/patch-festival+src+modules+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ festival/files/patch-festival+src+modules+Makefile 2008-07-27 15:37:06.000000000 -0500 @@ -0,0 +1,10 @@ +--- festival/src/modules/Makefile.orig 2004-06-21 15:52:42.000000000 -0500 ++++ festival/src/modules/Makefile 2008-07-27 15:36:26.000000000 -0500 +@@ -45,6 +45,7 @@ + LIB_BUILD_DIRS = $(BASE_DIRS) + BUILD_DIRS = $(LIB_BUILD_DIRS) + OPTIONAL = diphone clunits hts_engine java rxp UniSyn_phonology MultiSyn ++#OGIOPTIONAL+= OGIcommon OGIeffect OGIinsert OGIdbase OGIresLP + + ALL_DIRS = $(BASE_DIRS) $(OPTIONAL) + diff -ruN festival.orig/pkg-plist festival/pkg-plist --- festival.orig/pkg-plist 2008-07-27 14:26:07.000000000 -0500 +++ festival/pkg-plist 2008-07-27 15:57:19.000000000 -0500 @@ -134,6 +134,25 @@ %%DATADIR%%/lib/unilex_phones.scm %%DATADIR%%/lib/voices.scm %%DATADIR%%/lib/web.scm +%%OGI%%%%DATADIR%%/lib/ogi_configure_voice.scm +%%OGI%%%%DATADIR%%/lib/ogi_effect.scm +%%OGI%%%%DATADIR%%/lib/ogi_enhance.scm +%%OGI%%%%DATADIR%%/lib/ogi_gswdurtreeZ_wb.scm +%%OGI%%%%DATADIR%%/lib/ogi_kddurtreeZ_wb.scm +%%OGI%%%%DATADIR%%/lib/ogi_klatt_durs_wb.scm +%%OGI%%%%DATADIR%%/lib/ogi_languages.scm +%%OGI%%%%DATADIR%%/lib/ogi_lex_addenda.scm +%%OGI%%%%DATADIR%%/lib/ogi_lexicons.scm +%%OGI%%%%DATADIR%%/lib/ogi_lts_syllabify.scm +%%OGI%%%%DATADIR%%/lib/ogi_lts_worldbet.scm +%%OGI%%%%DATADIR%%/lib/ogi_phrase.scm +%%OGI%%%%DATADIR%%/lib/ogi_postlex.scm +%%OGI%%%%DATADIR%%/lib/ogi_syllabify.scm +%%OGI%%%%DATADIR%%/lib/ogi_synthesis.scm +%%OGI%%%%DATADIR%%/lib/ogi_token.scm +%%OGI%%%%DATADIR%%/lib/ogi_unitsel.scm +%%OGI%%%%DATADIR%%/lib/ogi_wordsynth.scm +%%OGI%%%%DATADIR%%/lib/ogi_worldbet_phones.scm @dirrmtry %%DATADIR%%/lib/voices/spanish @dirrmtry %%DATADIR%%/lib/voices/english @dirrmtry %%DATADIR%%/lib/voices >Release-Note: >Audit-Trail: >Unformatted: