From e65b41af9ddae52155ae5d437c3561d981988861 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Sun, 19 Jan 2020 11:35:32 +0300
Subject: [PATCH] flite ver bump and fix

---
 multimedia/sound/flite/actions.py             |  6 ++--
 .../sound/flite/files/flite-ldflags.patch     | 35 +++++++++++++++++++
 multimedia/sound/flite/pspec.xml              | 11 +++---
 3 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 multimedia/sound/flite/files/flite-ldflags.patch

diff --git a/multimedia/sound/flite/actions.py b/multimedia/sound/flite/actions.py
index b6737045f7..a2366fadb6 100644
--- a/multimedia/sound/flite/actions.py
+++ b/multimedia/sound/flite/actions.py
@@ -11,14 +11,14 @@ from pisi.actionsapi import get
 
 #WorkDir = "flite-%s-current" % get.srcVERSION()
 
-NoStrip = ["/usr/lib"]
    
 def setup():
 	#shelltools.system("sed '/^#VOXES.*$/d; s/+//g; s/cmu_indic_lex/&\nVOXES = cmu_us_kal16 cmu_us_slt/' config/android.lv >config/pisilinux.lv")
 	#shelltools.system("sed -i '/$(INSTALL) -m 755 $(BINDIR)\/flite_time $(DESTDIR)$(INSTALLBINDIR)/d' main/Makefile")
 	shelltools.export("LDFLAGS", "-lasound -lm")
 	autotools.configure("--prefix=/usr \
-						 --with-audio=alsa \
+		                 --enable-shared \
+                         --with-audio=alsa \
 	                     --with-vox=cmu_us_kal16")
 
 def build():
@@ -26,5 +26,7 @@ def build():
 
 def install():
     autotools.install()
+    
+    pisitools.remove("/usr/lib/*.a")
 
     pisitools.dodoc("COPYING", "README*")
diff --git a/multimedia/sound/flite/files/flite-ldflags.patch b/multimedia/sound/flite/files/flite-ldflags.patch
new file mode 100644
index 0000000000..f9295fb853
--- /dev/null
+++ b/multimedia/sound/flite/files/flite-ldflags.patch
@@ -0,0 +1,35 @@
+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
+ 
diff --git a/multimedia/sound/flite/pspec.xml b/multimedia/sound/flite/pspec.xml
index 5139300a9e..259ccd27d2 100644
--- a/multimedia/sound/flite/pspec.xml
+++ b/multimedia/sound/flite/pspec.xml
@@ -13,12 +13,13 @@
         <IsA>library</IsA>
         <Summary>Flite: a small run-time speech synthesis engine</Summary>
         <Description>Flite (festival-lite) is a small, fast run-time speech synthesis engine developed at CMU and primarily designed for small embedded machines and/or large servers. Flite is designed as an alternative synthesis engine to Festival for voices built using the FestVox suite of voice building tools.</Description>
-        <Archive sha1sum="aeb4d33de079004c0eb9f9e0fe5bba1e0def75f4" type="tarbz2">http://www.festvox.org/flite/packed/flite-2.0/flite-2.0.0-release.tar.bz2</Archive>
+        <Archive sha1sum="ed8f1ae3c44dafc2bcc70df4ebf618330f7edec9" type="tarbz2">http://festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>chrpath</Dependency>
         </BuildDependencies>        
         <Patches>
+            <Patch level="1">flite-ldflags.patch</Patch>
         </Patches>
     </Source>
 
@@ -47,10 +48,10 @@
 
     <History>
         <Update release="7">
-            <Date>2020-01-18</Date>
-            <Version>2.0.0</Version>
-            <Comment>Rebuild</Comment>
-            <Name>İdris Kalp</Name>
+            <Date>2020-01-19</Date>
+            <Version>2.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Idris Kalp</Name>
             <Email>idriskalp@gmail.com</Email>
         </Update>
         <Update release="6">