Date: Wednesday, February 10, 2021 @ 22:11:12 Author: arojas Revision: 854208
Update to 2.2 Modified: flite/trunk/PKGBUILD Deleted: flite/trunk/flite-ldflags.patch ---------------------+ PKGBUILD | 18 +++++++----------- flite-ldflags.patch | 35 ----------------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-10 22:05:30 UTC (rev 854207) +++ PKGBUILD 2021-02-10 22:11:12 UTC (rev 854208) @@ -2,8 +2,8 @@ # Contributor: Steven Honeyman <stevenhoneyman at gmail com> pkgname=flite -pkgver=2.1 -pkgrel=2 +pkgver=2.2 +pkgrel=1 pkgdesc="A lightweight speech synthesis engine" arch=(x86_64) url="http://www.festvox.org/flite/"; @@ -10,21 +10,17 @@ license=(custom) depends=(alsa-lib) makedepends=(chrpath) -source=(http://festvox.org/flite/packed/flite-$pkgver/flite-$pkgver-release.tar.bz2 flite-ldflags.patch) -sha256sums=('c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b85' - 'ff43e11241c9aea26483865c672c20421d12c688ae8b59b39471bafb52c1463e') +source=(https://github.com/festvox/flite/archive/v$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('ab1555fe5adc3f99f1d4a1a0eb1596d329fd6d74f1464a0097c81f53c0cf9e5c') prepare() { - cd $pkgname-$pkgver-release + cd $pkgname-$pkgver sed '/^#VOXES.*$/d; s/+//g; s/cmu_indic_lex/&\nVOXES = cmu_us_kal16 cmu_us_slt/' config/android.lv >config/archlinux.lv sed -i '/$(INSTALL) -m 755 $(BINDIR)\/flite_time $(DESTDIR)$(INSTALLBINDIR)/d' main/Makefile - -# Fix linking (Gentoo) - patch -p1 -i ../flite-ldflags.patch } build() { - cd $pkgname-$pkgver-release + cd $pkgname-$pkgver ./configure --prefix=/usr --enable-shared \ --with-audio=alsa \ --with-vox=cmu_us_kal16 \ @@ -33,7 +29,7 @@ } package() { - cd $pkgname-$pkgver-release + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE Deleted: flite-ldflags.patch =================================================================== --- flite-ldflags.patch 2021-02-10 22:05:30 UTC (rev 854207) +++ flite-ldflags.patch 2021-02-10 22:11:12 UTC (rev 854208) @@ -1,35 +0,0 @@ -diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules ---- flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.000000000 +0000 -+++ flite-1.4-release.new/config/common_make_rules 2011-03-26 20:22:59.000000000 +0000 -@@ -68,7 +68,7 @@ - - FLITELIBS = $(BUILDDIR)/lib/libflite.a - FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite --LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) -+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS) - - FULLOBJS = $(OBJS:%=$(OBJDIR)/%) - ifdef SHFLAGS -@@ -123,7 +123,7 @@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) -- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS)) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) - @ rm -rf shared_os ---- flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.000000000 +0100 -+++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220 +0000 -@@ -62,9 +62,9 @@ - LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort - - $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) -- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS) -+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS) - $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS) -- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS) -+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS) - makescripts: - @ cp -p $(SCRIPTS) $(TOP)/bin -
