diff options
| -rw-r--r-- | accessibility/flite/flite-1.3-install_libs.diff | 12 | ||||
| -rw-r--r-- | accessibility/flite/flite-1.4-fix-parallel-builds.patch | 25 | ||||
| -rw-r--r-- | accessibility/flite/flite.SlackBuild | 23 | ||||
| -rw-r--r-- | accessibility/flite/flite.info | 10 | ||||
| -rw-r--r-- | accessibility/flite/slack-desc | 10 |
5 files changed, 52 insertions, 28 deletions
diff --git a/accessibility/flite/flite-1.3-install_libs.diff b/accessibility/flite/flite-1.3-install_libs.diff deleted file mode 100644 index d29bae2c8d86..000000000000 --- a/accessibility/flite/flite-1.3-install_libs.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur flite-1.3-release.orig/Makefile flite-1.3-release/Makefile ---- flite-1.3-release.orig/Makefile 2005-11-01 07:40:45.000000000 -0600 -+++ flite-1.3-release/Makefile 2009-07-12 17:40:07.408702338 -0500 -@@ -109,7 +109,7 @@ - mkdir -p $(INSTALLLIBDIR) - mkdir -p $(INSTALLINCDIR) - $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) -- @ $(MAKE) -C lib --no-print-directory install -+ $(INSTALL) -m 644 $(LIBDIR)/*.a $(INSTALLLIBDIR) - $(INSTALL) -m 755 bin/flite $(INSTALLBINDIR) - $(INSTALL) -m 755 bin/flite_time $(INSTALLBINDIR) - diff --git a/accessibility/flite/flite-1.4-fix-parallel-builds.patch b/accessibility/flite/flite-1.4-fix-parallel-builds.patch new file mode 100644 index 000000000000..270395877c53 --- /dev/null +++ b/accessibility/flite/flite-1.4-fix-parallel-builds.patch @@ -0,0 +1,25 @@ +From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Fri, 1 Jan 2010 12:59:59 -0600 +Subject: [PATCH] fix parallel builds + +--- + main/Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/main/Makefile b/main/Makefile +index 0513e59..e4d04fe 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -81,6 +81,8 @@ else + shared_libs: nothing + endif + ++.NOTPARALLEL: $(ALL) ++ + $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps) + $(TOP)/tools/make_voice_list $(VOICES) + rm -f flite_voice_list.o +-- +1.6.4.4 + diff --git a/accessibility/flite/flite.SlackBuild b/accessibility/flite/flite.SlackBuild index 6c0d9ee38c44..8476c2e452df 100644 --- a/accessibility/flite/flite.SlackBuild +++ b/accessibility/flite/flite.SlackBuild @@ -2,18 +2,23 @@ # Slackware build script for flite # Written by Martin Lefebvre (dadexter@sekurity.com) +# Maintained by B. Watson (yalhcru@gmail.com), original author is MIA + +# 20130411 bkw: Updated for flite 1.4, added fix for parallel builds. +# Removed --with-vox=cmu_us_kal16 configure flag (it doesn't seem to +# do anything). +# The updated version is released under the WTFPL, see +# http://www.wtfpl.net/txt/copying/ for details. PRGNAM=flite -VERSION=1.3 +VERSION=1.4 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -43,12 +48,13 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION-release -tar xvf $CWD/$PRGNAM-$VERSION-release.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION-release.tar.bz2 cd $PRGNAM-$VERSION-release chown -R root:root . chmod -R u+w,go+r-w,a-s . -patch -p1 < $CWD/flite-1.3-install_libs.diff +# Minor fix to let parallel make succeed. Patch borrowed from gentoo. +patch -p1 < $CWD/flite-1.4-fix-parallel-builds.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -57,12 +63,17 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --with-vox=cmu_us_kal16 \ + --with-audio=alsa \ + --enable-shared \ + --disable-static \ --build=$ARCH-slackware-linux make make install prefix=$PKG/usr INSTALLLIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} +# --disable-static is accepted by configure but totally ignored, so: +rm -rf $PKG/usr/lib$LIBDIRSUFFIX/*.a + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/accessibility/flite/flite.info b/accessibility/flite/flite.info index bcaaf19fdfbc..e0d7eefd8851 100644 --- a/accessibility/flite/flite.info +++ b/accessibility/flite/flite.info @@ -1,10 +1,10 @@ PRGNAM="flite" -VERSION="1.3" +VERSION="1.4" HOMEPAGE="http://www.speech.cs.cmu.edu/flite/" -DOWNLOAD="http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/flite-1.3-release.tar.gz" -MD5SUM="ae0aca1cb7b4801f4372f3a75a9e52b5" +DOWNLOAD="http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2" +MD5SUM="b7c3523b3bbc6f29ce61e6650cd9a428" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Martin Lefebvre" -EMAIL="dadexter@sekurity.com.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/accessibility/flite/slack-desc b/accessibility/flite/slack-desc index 04e7e7538def..1c43fca3123e 100644 --- a/accessibility/flite/slack-desc +++ b/accessibility/flite/slack-desc @@ -1,9 +1,9 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| flite: flite (speech synthesis engine) |