pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/espeak
Module Name: pkgsrc
Committed By: nia
Date: Sun Jul 21 22:47:56 UTC 2019
Modified Files:
pkgsrc/audio/espeak: Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/audio/espeak/patches: patch-src_Makefile
Removed Files:
pkgsrc/audio/espeak/patches: patch-aa patch-ab patch-ac
Log Message:
espeak: Update to 1.48.04.
Use portaudio v19 instead of v18. I think this was the last consumer of
portaudio v18 in pkgsrc.
Changelog does not go this far back~
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/espeak/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/espeak/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/espeak/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/espeak/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/espeak/patches/patch-aa \
pkgsrc/audio/espeak/patches/patch-ab
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/espeak/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/espeak/patches/patch-src_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/espeak/Makefile
diff -u pkgsrc/audio/espeak/Makefile:1.11 pkgsrc/audio/espeak/Makefile:1.12
--- pkgsrc/audio/espeak/Makefile:1.11 Wed Feb 28 21:49:55 2018
+++ pkgsrc/audio/espeak/Makefile Sun Jul 21 22:47:56 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2018/02/28 21:49:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/07/21 22:47:56 nia Exp $
-DISTNAME= espeak-1.31-source
+MINOR_VER= 48
+DISTNAME= espeak-1.${MINOR_VER}.04-source
PKGNAME= ${DISTNAME:S/-source//}
-PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=espeak/}
EXTRACT_SUFX= .zip
@@ -12,24 +12,38 @@ HOMEPAGE= http://espeak.sourceforge.net/
COMMENT= Speech synthesizer
LICENSE= gnu-gpl-v3
-USE_LANGUAGES= c++
-USE_TOOLS+= gmake
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
+BUILD_DIRS= src
+USE_LANGUAGES= c c++03
+USE_TOOLS+= gmake pax
+
+MAKE_FLAGS+= DATADIR=${PREFIX}/share/espeak-data
+
+# use portaudio v19
+MAKE_FLAGS+= WAVE=wave.cpp
+MAKE_FLAGS+= LIB_AUDIO=-lportaudio
+MAKE_FLAGS+= USE_AUDIO=-DUSE_PORTAUDIO
+
+PLIST_SUBST+= MINOR_VER=${MINOR_VER}
+
+CXXFLAGS+= -funsigned-char
INSTALLATION_DIRS= bin include lib share
+pre-configure:
+ ${CP} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/espeak ${DESTDIR}${PREFIX}/bin
- ${INSTALL_LIB} ${WRKSRC}/libespeak.so.1.1.31 ${DESTDIR}${PREFIX}/lib
- ${LN} -sf libespeak.so.1.1.31 \
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/espeak ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_LIB} ${WRKSRC}/src/libespeak.so.1.1.${MINOR_VER} ${DESTDIR}${PREFIX}/lib
+ ${LN} -sf libespeak.so.1.1.${MINOR_VER} \
${DESTDIR}${PREFIX}/lib/libespeak.so.1
- ${LN} -sf libespeak.so.1.1.31 \
+ ${LN} -sf libespeak.so.1.1.${MINOR_VER} \
${DESTDIR}${PREFIX}/lib/libespeak.so
- ${INSTALL_LIB} ${WRKSRC}/libespeak.a ${DESTDIR}${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/speak_lib.h ${DESTDIR}${PREFIX}/include
- ${CP} -r ${WRKDIR}/espeak-1.31-source/espeak-data \
- ${DESTDIR}${PREFIX}/share
+ ${INSTALL_LIB} ${WRKSRC}/src/libespeak.a ${DESTDIR}${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKSRC}/src/speak_lib.h ${DESTDIR}${PREFIX}/include
+ cd ${WRKSRC}/espeak-data && \
+ ${PAX} -rw -pp . ${DESTDIR}${PREFIX}/share/espeak-data
-.include "../../audio/portaudio/buildlink3.mk"
+.include "../../audio/portaudio-devel/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/espeak/PLIST
diff -u pkgsrc/audio/espeak/PLIST:1.4 pkgsrc/audio/espeak/PLIST:1.5
--- pkgsrc/audio/espeak/PLIST:1.4 Sun Jun 14 18:10:28 2009
+++ pkgsrc/audio/espeak/PLIST Sun Jul 21 22:47:56 2019
@@ -1,107 +1,204 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:10:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/07/21 22:47:56 nia Exp $
bin/espeak
include/speak_lib.h
lib/libespeak.a
lib/libespeak.so
lib/libespeak.so.1
-lib/libespeak.so.1.${PKGVERSION}
+lib/libespeak.so.1.1.${MINOR_VER}
share/espeak-data/af_dict
-share/espeak-data/config
+share/espeak-data/am_dict
+share/espeak-data/an_dict
+share/espeak-data/as_dict
+share/espeak-data/az_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/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/eu_dict
+share/espeak-data/fa_dict
share/espeak-data/fi_dict
share/espeak-data/fr_dict
+share/espeak-data/ga_dict
+share/espeak-data/gd_dict
share/espeak-data/grc_dict
+share/espeak-data/gu_dict
share/espeak-data/hbs_dict
share/espeak-data/hi_dict
share/espeak-data/hu_dict
+share/espeak-data/hy_dict
+share/espeak-data/id_dict
+share/espeak-data/intonations
share/espeak-data/is_dict
share/espeak-data/it_dict
share/espeak-data/jbo_dict
+share/espeak-data/ka_dict
+share/espeak-data/kl_dict
+share/espeak-data/kn_dict
+share/espeak-data/ko_dict
+share/espeak-data/ku_dict
share/espeak-data/la_dict
+share/espeak-data/lfn_dict
+share/espeak-data/lt_dict
+share/espeak-data/lv_dict
share/espeak-data/mbrola_ph/af1_phtrans
share/espeak-data/mbrola_ph/ca1_phtrans
share/espeak-data/mbrola_ph/cr1_phtrans
share/espeak-data/mbrola_ph/cs_phtrans
+share/espeak-data/mbrola_ph/de2_phtrans
share/espeak-data/mbrola_ph/de4_phtrans
share/espeak-data/mbrola_ph/de6_phtrans
+share/espeak-data/mbrola_ph/ee1_phtrans
share/espeak-data/mbrola_ph/en1_phtrans
+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
share/espeak-data/mbrola_ph/pl1_phtrans
+share/espeak-data/mbrola_ph/pt1_phtrans
+share/espeak-data/mbrola_ph/pt_phtrans
+share/espeak-data/mbrola_ph/ptbr4_phtrans
+share/espeak-data/mbrola_ph/ptbr_phtrans
share/espeak-data/mbrola_ph/ro1_phtrans
share/espeak-data/mbrola_ph/sv2_phtrans
share/espeak-data/mbrola_ph/sv_phtrans
+share/espeak-data/mbrola_ph/tr1_phtrans
share/espeak-data/mbrola_ph/us3_phtrans
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/ms_dict
+share/espeak-data/nci_dict
+share/espeak-data/ne_dict
share/espeak-data/nl_dict
share/espeak-data/no_dict
+share/espeak-data/or_dict
+share/espeak-data/pa_dict
+share/espeak-data/pap_dict
share/espeak-data/phondata
+share/espeak-data/phondata-manifest
share/espeak-data/phonindex
share/espeak-data/phontab
share/espeak-data/pl_dict
share/espeak-data/pt_dict
share/espeak-data/ro_dict
share/espeak-data/ru_dict
+share/espeak-data/si_dict
share/espeak-data/sk_dict
+share/espeak-data/sl_dict
+share/espeak-data/sq_dict
share/espeak-data/sv_dict
share/espeak-data/sw_dict
+share/espeak-data/ta_dict
+share/espeak-data/te_dict
+share/espeak-data/tr_dict
+share/espeak-data/ur_dict
share/espeak-data/vi_dict
share/espeak-data/voices/!v/croak
share/espeak-data/voices/!v/f1
share/espeak-data/voices/!v/f2
share/espeak-data/voices/!v/f3
share/espeak-data/voices/!v/f4
+share/espeak-data/voices/!v/f5
+share/espeak-data/voices/!v/klatt
+share/espeak-data/voices/!v/klatt2
+share/espeak-data/voices/!v/klatt3
+share/espeak-data/voices/!v/klatt4
share/espeak-data/voices/!v/m1
share/espeak-data/voices/!v/m2
share/espeak-data/voices/!v/m3
share/espeak-data/voices/!v/m4
share/espeak-data/voices/!v/m5
share/espeak-data/voices/!v/m6
-share/espeak-data/voices/!v/test
+share/espeak-data/voices/!v/m7
share/espeak-data/voices/!v/whisper
-share/espeak-data/voices/!v/wisper
-share/espeak-data/voices/af
-share/espeak-data/voices/bs
-share/espeak-data/voices/cs
-share/espeak-data/voices/cy
+share/espeak-data/voices/!v/whisperf
+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/ms
+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/vi-sgn
+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/en
-share/espeak-data/voices/en/en-n
-share/espeak-data/voices/en/en-r
-share/espeak-data/voices/en/en-rp
-share/espeak-data/voices/en/en-sc
-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/fi
+share/espeak-data/voices/en
+share/espeak-data/voices/en-us
+share/espeak-data/voices/es-la
+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/grc
-share/espeak-data/voices/hi
-share/espeak-data/voices/hr
-share/espeak-data/voices/hu
-share/espeak-data/voices/is
-share/espeak-data/voices/it
-share/espeak-data/voices/jbo
-share/espeak-data/voices/la
share/espeak-data/voices/mb/mb-af1
share/espeak-data/voices/mb/mb-af1-en
+share/espeak-data/voices/mb/mb-br1
+share/espeak-data/voices/mb/mb-br3
+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
@@ -109,7 +206,10 @@ share/espeak-data/voices/mb/mb-de5-en
share/espeak-data/voices/mb/mb-de6
share/espeak-data/voices/mb/mb-de6-grc
share/espeak-data/voices/mb/mb-de7
+share/espeak-data/voices/mb/mb-ee1
share/espeak-data/voices/mb/mb-en1
+share/espeak-data/voices/mb/mb-es1
+share/espeak-data/voices/mb/mb-es2
share/espeak-data/voices/mb/mb-fr1
share/espeak-data/voices/mb/mb-fr1-en
share/espeak-data/voices/mb/mb-fr4
@@ -118,38 +218,60 @@ share/espeak-data/voices/mb/mb-gr2
share/espeak-data/voices/mb/mb-gr2-en
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-ir2
share/espeak-data/voices/mb/mb-it3
share/espeak-data/voices/mb/mb-it4
share/espeak-data/voices/mb/mb-la1
+share/espeak-data/voices/mb/mb-mx1
+share/espeak-data/voices/mb/mb-mx2
share/espeak-data/voices/mb/mb-nl2
share/espeak-data/voices/mb/mb-nl2-en
share/espeak-data/voices/mb/mb-pl1
share/espeak-data/voices/mb/mb-pl1-en
+share/espeak-data/voices/mb/mb-pt1
share/espeak-data/voices/mb/mb-ro1
share/espeak-data/voices/mb/mb-ro1-en
share/espeak-data/voices/mb/mb-sw1
share/espeak-data/voices/mb/mb-sw1-en
share/espeak-data/voices/mb/mb-sw2
share/espeak-data/voices/mb/mb-sw2-en
+share/espeak-data/voices/mb/mb-tr1
+share/espeak-data/voices/mb/mb-tr2
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/mk
-share/espeak-data/voices/nl
-share/espeak-data/voices/no
-share/espeak-data/voices/pl
+share/espeak-data/voices/mb/mb-vz1
+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/lfn
+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/sr
-share/espeak-data/voices/sv
-share/espeak-data/voices/sw
-share/espeak-data/voices/vi
-share/espeak-data/voices/zh
-share/espeak-data/voices/zhy
+share/espeak-data/voices/test/am
+share/espeak-data/voices/test/as
+share/espeak-data/voices/test/az
+share/espeak-data/voices/test/bn
+share/espeak-data/voices/test/eu
+share/espeak-data/voices/test/gd
+share/espeak-data/voices/test/gu
+share/espeak-data/voices/test/kl
+share/espeak-data/voices/test/ko
+share/espeak-data/voices/test/nci
+share/espeak-data/voices/test/or
+share/espeak-data/voices/test/pap
+share/espeak-data/voices/test/si
+share/espeak-data/voices/test/sl
+share/espeak-data/voices/test/te
+share/espeak-data/voices/test/ur
share/espeak-data/zh_dict
share/espeak-data/zhy_dict
-@pkgdir share/espeak-data/soundicons
-@pkgdir share/espeak-data/mbrola
Index: pkgsrc/audio/espeak/buildlink3.mk
diff -u pkgsrc/audio/espeak/buildlink3.mk:1.2 pkgsrc/audio/espeak/buildlink3.mk:1.3
--- pkgsrc/audio/espeak/buildlink3.mk:1.2 Fri Mar 20 19:23:53 2009
+++ pkgsrc/audio/espeak/buildlink3.mk Sun Jul 21 22:47:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/07/21 22:47:56 nia Exp $
BUILDLINK_TREE+= espeak
@@ -8,7 +8,7 @@ ESPEAK_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.espeak+= espeak>=1.26
BUILDLINK_PKGSRCDIR.espeak?= ../../audio/espeak
-.include "../../audio/portaudio/buildlink3.mk"
+.include "../../audio/portaudio-devel/buildlink3.mk"
.endif # ESPEAK_BUILDLINK3_MK
BUILDLINK_TREE+= -espeak
Index: pkgsrc/audio/espeak/distinfo
diff -u pkgsrc/audio/espeak/distinfo:1.5 pkgsrc/audio/espeak/distinfo:1.6
--- pkgsrc/audio/espeak/distinfo:1.5 Wed Feb 28 21:49:55 2018
+++ pkgsrc/audio/espeak/distinfo Sun Jul 21 22:47:56 2019
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/02/28 21:49:55 wiz Exp $
+$NetBSD: distinfo,v 1.6 2019/07/21 22:47:56 nia Exp $
-SHA1 (espeak-1.31-source.zip) = e33291b29153d0fc179da11ac4a61cc85fba679a
-RMD160 (espeak-1.31-source.zip) = a26596f25d8897848238d81fe5e5d179d47f01a6
-SHA512 (espeak-1.31-source.zip) = ec2e6a49be743952d1440bd5e80c270ed3a31fd522079c93d13d495fda9803e0fc9676a514a9ef168c469d668bf3551cbbc5dc269030f81f1ba8e785940063c9
-Size (espeak-1.31-source.zip) = 1204202 bytes
-SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0
-SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879
-SHA1 (patch-ac) = 33043b93dde7beea7879d1e9b7c751aef0728d44
+SHA1 (espeak-1.48.04-source.zip) = b22c0361885d05e61d98ecedca0a4926ea2fb2ad
+RMD160 (espeak-1.48.04-source.zip) = 95f45d86c86756c3bd3b359aaba3c844f4a1c23c
+SHA512 (espeak-1.48.04-source.zip) = f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
+Size (espeak-1.48.04-source.zip) = 3019245 bytes
+SHA1 (patch-src_Makefile) = ad90e699c15c266c6e6b2db73340fdf5506389d8
Added files:
Index: pkgsrc/audio/espeak/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/audio/espeak/patches/patch-src_Makefile:1.1
--- /dev/null Sun Jul 21 22:47:56 2019
+++ pkgsrc/audio/espeak/patches/patch-src_Makefile Sun Jul 21 22:47:56 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile,v 1.1 2019/07/21 22:47:56 nia Exp $
+
+Do not ignore CXXFLAGS.
+
+--- src/Makefile.orig 2014-02-02 10:58:11.000000000 +0000
++++ src/Makefile
+@@ -93,9 +93,6 @@ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+ LIBS3=-lstdc++ -L . -lespeak
+
+-CXXFLAGS=-O2
+-
+-
+ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
+
+ .cpp.o:
Home |
Main Index |
Thread Index |
Old Index