Update to espeak-1.47.03.

This commit is contained in:
ajacoutot 2013-03-27 15:33:32 +00:00
parent ed7c673faa
commit a8d70af174
6 changed files with 109 additions and 102 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.11 2013/03/10 22:55:02 espie Exp $
# $OpenBSD: Makefile,v 1.12 2013/03/27 15:33:32 ajacoutot Exp $
COMMENT= compact speech synthesizer
DISTNAME= espeak-1.46.02-source
DISTNAME= espeak-1.47.03-source
EXTRACT_SUFX= .zip
PKGNAME= ${DISTNAME:S/-source//}
REVISION= 0
SHARED_LIBS= espeak 1.0
CATEGORIES= audio devel
@ -14,26 +15,20 @@ HOMEPAGE= http://espeak.sourceforge.net/
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=espeak/}
EXTRACT_SUFX= .zip
WANTLIB += c m portaudio pthread stdc++
WANTLIB= c m pthread stdc++ portaudio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=espeak/}
LIB_DEPENDS= audio/portaudio-svn
USE_GMAKE= Yes
NO_TEST= Yes
WRKSRC= ${WRKDIST}/src
MAKE_FLAGS+= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
MAKE_FLAGS += CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" EXTRA_FLAGS="-fPIC"
.if ${MACHINE_ARCH} == "amd64"
MAKE_FLAGS += EXTRA_FLAGS="-fPIC"
.endif
SUBST_VARS= PREFIX LIBespeak_VERSION
SUBST_VARS= LIBespeak_VERSION
pre-configure:
@cp ${LOCALBASE}/include/portaudio.h ${WRKSRC}/portaudio.h

View File

@ -1,5 +1,2 @@
MD5 (espeak-1.46.02-source.zip) = hOjkRWLwWjr8VCchivyK8Q==
RMD160 (espeak-1.46.02-source.zip) = 1fR3BiO/XT3tY+yMPyq41BMbQks=
SHA1 (espeak-1.46.02-source.zip) = Ih4E+uqrBJc8T6GWgGM/c4UZhFk=
SHA256 (espeak-1.46.02-source.zip) = 74vrolvSYXGFgtXLsfECkwB+tSW3Bf95yfs/UF3ZVLo=
SIZE (espeak-1.46.02-source.zip) = 2387543
SHA256 (espeak-1.47.03-source.zip) = MDg6dB3zRFihW0bw84zL4wJImpDpMbEU5wMRWvn8ZKA=
SIZE (espeak-1.47.03-source.zip) = 2705582

View File

@ -1,19 +1,18 @@
$OpenBSD: patch-src_Makefile,v 1.9 2012/09/26 19:20:59 brad Exp $
--- src/Makefile.orig Tue Nov 22 16:46:08 2011
+++ src/Makefile Wed Aug 22 17:43:42 2012
@@ -1,20 +1,20 @@
$OpenBSD: patch-src_Makefile,v 1.10 2013/03/27 15:33:32 ajacoutot Exp $
--- src/Makefile.orig Mon Mar 18 01:51:31 2013
+++ src/Makefile Wed Mar 27 16:10:39 2013
@@ -1,8 +1,8 @@
# remove -fno-exceptions if it causes problems with stdio library on some platforms (ARM)
-DATADIR=/usr/share/espeak-data
-
+DATADIR=$(PREFIX)/share/espeak-data
-PREFIX=/usr
+PREFIX ?=/usr
BINDIR=$(PREFIX)/bin
INCDIR=$(PREFIX)/include/espeak
LIBDIR=$(PREFIX)/lib
+DATADIR=$(PREFIX)/share/espeak-data
RELEASE = 1.46
BIN_NAME = speak
@@ -12,9 +12,11 @@ BIN_NAME = speak
BIN2_NAME = espeak
LIB_NAME = libespeak.so
STATIC_LIB_NAME = libespeak.a
@ -27,7 +26,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/09/26 19:20:59 brad Exp $
# Use SONAME_OPT=-Wl,h, on Solaris
SONAME_OPT=-Wl,-soname,
@@ -45,7 +45,7 @@ USE_AUDIO=-DUSE_PULSEAUDIO
@@ -45,7 +47,7 @@ USE_AUDIO=-DUSE_PULSEAUDIO
else
ifeq ($(AUDIO),portaudio)
WAVE=wave.cpp
@ -36,18 +35,18 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/09/26 19:20:59 brad Exp $
USE_AUDIO=-DUSE_PORTAUDIO
else
ifeq ($(AUDIO),portaudio0)
@@ -91,9 +91,8 @@ LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
@@ -91,9 +93,8 @@ LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
SRCS3 = espeak.cpp
OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
-LIBS3=-lstdc++ -L . -lespeak
+LIBS3=-lstdc++ -L . -lespeak -lpthread -L${LOCALBASE}/lib
+LIBS3=-lstdc++ -L . -lespeak -L${LOCALBASE}/lib
-CXXFLAGS=-O2
all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
@@ -102,7 +101,7 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2
@@ -102,7 +103,7 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2
$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $<
$(BIN_NAME): $(OBJS1)
@ -56,7 +55,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/09/26 19:20:59 brad Exp $
$(BIN2_NAME): $(OBJS3) $(LIB_NAME)
$(CXX) $(LDFLAGS) -o $@ $(OBJS3) $(LIBS3)
@@ -110,15 +109,13 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
@@ -110,15 +111,13 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
x_%.o: %.cpp
@ -75,7 +74,7 @@ $OpenBSD: patch-src_Makefile,v 1.9 2012/09/26 19:20:59 brad Exp $
$(STATIC_LIB_NAME): $(OBJS2)
$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)
@@ -144,10 +141,8 @@ install: all
@@ -144,10 +143,8 @@ install: all
$(INSTALL) -m 755 $(LIB_NAME).$(LIBTAG) $(DESTDIR)$(LIBDIR)
# Install static library
$(INSTALL) -m 755 $(STATIC_LIB_NAME) $(DESTDIR)$(LIBDIR)

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_speech_h,v 1.4 2012/06/23 12:23:31 ajacoutot Exp $
$OpenBSD: patch-src_speech_h,v 1.5 2013/03/27 15:33:32 ajacoutot Exp $
- Don't define USE_ASYNC, this required sem_timedwait() to be present.
Don't define USE_ASYNC, this required sem_timedwait() to be present.
--- src/speech.h.orig Fri Jan 6 18:03:00 2012
+++ src/speech.h Sat Jun 23 12:36:01 2012
@@ -57,7 +57,7 @@
--- src/speech.h.orig Thu Mar 21 13:38:16 2013
+++ src/speech.h Wed Mar 27 16:09:29 2013
@@ -58,7 +58,7 @@
// will look for espeak_data directory here, and also in user's home directory
#ifndef PATH_ESPEAK_DATA

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/10/26 19:42:11 jasper Exp $
@lib lib/libespeak.so.${LIBespeak_VERSION}

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2012/06/23 12:23:31 ajacoutot Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.4 2013/03/27 15:33:32 ajacoutot Exp $
@bin bin/espeak
include/speak_lib.h
lib/libespeak.a
@lib lib/libespeak.so.${LIBespeak_VERSION}
share/doc/espeak/
share/doc/espeak/add_language.html
share/doc/espeak/analyse.html
@ -21,20 +21,23 @@ share/doc/espeak/ssml.html
share/doc/espeak/voices.html
share/espeak-data/
share/espeak-data/af_dict
share/espeak-data/an_dict
share/espeak-data/bg_dict
share/espeak-data/bn_dict
share/espeak-data/ca_dict
share/espeak-data/cs_dict
share/espeak-data/cy_dict
share/espeak-data/da_dict
share/espeak-data/de_dict
share/espeak-data/dv_dict
share/espeak-data/el_dict
share/espeak-data/en_dict
share/espeak-data/eo_dict
share/espeak-data/es_dict
share/espeak-data/et_dict
share/espeak-data/fa_dict
share/espeak-data/fi_dict
share/espeak-data/fr_dict
share/espeak-data/ga_dict
share/espeak-data/grc_dict
share/espeak-data/hbs_dict
share/espeak-data/hi_dict
@ -49,6 +52,7 @@ share/espeak-data/ka_dict
share/espeak-data/kn_dict
share/espeak-data/ku_dict
share/espeak-data/la_dict
share/espeak-data/lt_dict
share/espeak-data/lv_dict
share/espeak-data/mbrola/
share/espeak-data/mbrola_ph/
@ -65,12 +69,16 @@ share/espeak-data/mbrola_ph/es_phtrans
share/espeak-data/mbrola_ph/fr1_phtrans
share/espeak-data/mbrola_ph/gr2_phtrans
share/espeak-data/mbrola_ph/grc-de6_phtrans
share/espeak-data/mbrola_ph/hn1_phtrans
share/espeak-data/mbrola_ph/hu1_phtrans
share/espeak-data/mbrola_ph/ic1_phtrans
share/espeak-data/mbrola_ph/id1_phtrans
share/espeak-data/mbrola_ph/in1_phtrans
share/espeak-data/mbrola_ph/ir1_phtrans
share/espeak-data/mbrola_ph/it3_phtrans
share/espeak-data/mbrola_ph/la1_phtrans
share/espeak-data/mbrola_ph/lt1_phtrans
share/espeak-data/mbrola_ph/lt2_phtrans
share/espeak-data/mbrola_ph/mx1_phtrans
share/espeak-data/mbrola_ph/mx2_phtrans
share/espeak-data/mbrola_ph/nl_phtrans
@ -88,11 +96,12 @@ share/espeak-data/mbrola_ph/us_phtrans
share/espeak-data/mbrola_ph/vz_phtrans
share/espeak-data/mk_dict
share/espeak-data/ml_dict
share/espeak-data/nci_dict
share/espeak-data/ne_dict
share/espeak-data/nl_dict
share/espeak-data/no_dict
share/espeak-data/pap_dict
share/espeak-data/pa_dict
share/espeak-data/phondata
share/espeak-data/phondata-manifest
share/espeak-data/phonindex
share/espeak-data/phontab
share/espeak-data/pl_dict
@ -127,44 +136,62 @@ share/espeak-data/voices/!v/m6
share/espeak-data/voices/!v/m7
share/espeak-data/voices/!v/whisper
share/espeak-data/voices/!v/whisperf
share/espeak-data/voices/af
share/espeak-data/voices/bg
share/espeak-data/voices/bs
share/espeak-data/voices/ca
share/espeak-data/voices/cs
share/espeak-data/voices/cy
share/espeak-data/voices/da
share/espeak-data/voices/asia/
share/espeak-data/voices/asia/fa
share/espeak-data/voices/asia/fa-pin
share/espeak-data/voices/asia/hi
share/espeak-data/voices/asia/hy
share/espeak-data/voices/asia/hy-west
share/espeak-data/voices/asia/id
share/espeak-data/voices/asia/ka
share/espeak-data/voices/asia/kn
share/espeak-data/voices/asia/ku
share/espeak-data/voices/asia/ml
share/espeak-data/voices/asia/ne
share/espeak-data/voices/asia/pa
share/espeak-data/voices/asia/ta
share/espeak-data/voices/asia/tr
share/espeak-data/voices/asia/vi
share/espeak-data/voices/asia/vi-hue
share/espeak-data/voices/asia/zh
share/espeak-data/voices/asia/zh-yue
share/espeak-data/voices/de
share/espeak-data/voices/default
share/espeak-data/voices/el
share/espeak-data/voices/en/
share/espeak-data/voices/en/en
share/espeak-data/voices/en/en-n
share/espeak-data/voices/en/en-rp
share/espeak-data/voices/en/en-sc
share/espeak-data/voices/en/en-us
share/espeak-data/voices/en/en-wi
share/espeak-data/voices/en/en-wm
share/espeak-data/voices/eo
share/espeak-data/voices/es
share/espeak-data/voices/en
share/espeak-data/voices/en-us
share/espeak-data/voices/es-la
share/espeak-data/voices/et
share/espeak-data/voices/fi
share/espeak-data/voices/europe/
share/espeak-data/voices/europe/an
share/espeak-data/voices/europe/bg
share/espeak-data/voices/europe/bs
share/espeak-data/voices/europe/ca
share/espeak-data/voices/europe/cs
share/espeak-data/voices/europe/cy
share/espeak-data/voices/europe/da
share/espeak-data/voices/europe/el
share/espeak-data/voices/europe/es
share/espeak-data/voices/europe/et
share/espeak-data/voices/europe/fi
share/espeak-data/voices/europe/fr-be
share/espeak-data/voices/europe/ga
share/espeak-data/voices/europe/hr
share/espeak-data/voices/europe/hu
share/espeak-data/voices/europe/is
share/espeak-data/voices/europe/it
share/espeak-data/voices/europe/lt
share/espeak-data/voices/europe/lv
share/espeak-data/voices/europe/mk
share/espeak-data/voices/europe/nl
share/espeak-data/voices/europe/no
share/espeak-data/voices/europe/pl
share/espeak-data/voices/europe/pt-pt
share/espeak-data/voices/europe/ro
share/espeak-data/voices/europe/ru
share/espeak-data/voices/europe/sk
share/espeak-data/voices/europe/sq
share/espeak-data/voices/europe/sr
share/espeak-data/voices/europe/sv
share/espeak-data/voices/fr
share/espeak-data/voices/fr-be
share/espeak-data/voices/hi
share/espeak-data/voices/hr
share/espeak-data/voices/hu
share/espeak-data/voices/hy
share/espeak-data/voices/hy-west
share/espeak-data/voices/id
share/espeak-data/voices/is
share/espeak-data/voices/it
share/espeak-data/voices/ka
share/espeak-data/voices/kn
share/espeak-data/voices/ku
share/espeak-data/voices/la
share/espeak-data/voices/lv
share/espeak-data/voices/mb/
share/espeak-data/voices/mb/mb-af1
share/espeak-data/voices/mb/mb-af1-en
@ -174,6 +201,7 @@ share/espeak-data/voices/mb/mb-br4
share/espeak-data/voices/mb/mb-cr1
share/espeak-data/voices/mb/mb-cz2
share/espeak-data/voices/mb/mb-de2
share/espeak-data/voices/mb/mb-de3
share/espeak-data/voices/mb/mb-de4
share/espeak-data/voices/mb/mb-de4-en
share/espeak-data/voices/mb/mb-de5
@ -195,6 +223,7 @@ share/espeak-data/voices/mb/mb-hu1
share/espeak-data/voices/mb/mb-hu1-en
share/espeak-data/voices/mb/mb-ic1
share/espeak-data/voices/mb/mb-id1
share/espeak-data/voices/mb/mb-ir1
share/espeak-data/voices/mb/mb-it3
share/espeak-data/voices/mb/mb-it4
share/espeak-data/voices/mb/mb-la1
@ -217,29 +246,18 @@ share/espeak-data/voices/mb/mb-us1
share/espeak-data/voices/mb/mb-us2
share/espeak-data/voices/mb/mb-us3
share/espeak-data/voices/mb/mb-vz1
share/espeak-data/voices/mk
share/espeak-data/voices/ml
share/espeak-data/voices/nl
share/espeak-data/voices/no
share/espeak-data/voices/pl
share/espeak-data/voices/other/
share/espeak-data/voices/other/af
share/espeak-data/voices/other/en-n
share/espeak-data/voices/other/en-rp
share/espeak-data/voices/other/en-sc
share/espeak-data/voices/other/en-wi
share/espeak-data/voices/other/en-wm
share/espeak-data/voices/other/eo
share/espeak-data/voices/other/grc
share/espeak-data/voices/other/jbo
share/espeak-data/voices/other/la
share/espeak-data/voices/other/sw
share/espeak-data/voices/pt
share/espeak-data/voices/pt-pt
share/espeak-data/voices/ro
share/espeak-data/voices/ru
share/espeak-data/voices/sk
share/espeak-data/voices/sq
share/espeak-data/voices/sr
share/espeak-data/voices/sv
share/espeak-data/voices/sw
share/espeak-data/voices/ta
share/espeak-data/voices/test/
share/espeak-data/voices/test/grc
share/espeak-data/voices/test/jbo
share/espeak-data/voices/test/nci
share/espeak-data/voices/test/pap
share/espeak-data/voices/tr
share/espeak-data/voices/vi
share/espeak-data/voices/zh
share/espeak-data/voices/zh-yue
share/espeak-data/zh_dict
share/espeak-data/zhy_dict