[arch-commits] Commit in flite/repos (6 files)

Antonio Rojas arojas at archlinux.org
Fri Dec 16 21:48:00 UTC 2016


    Date: Friday, December 16, 2016 @ 21:47:59
  Author: arojas
Revision: 199897

archrelease: copy trunk to community-i686, community-x86_64

Added:
  flite/repos/community-i686/PKGBUILD
    (from rev 199896, flite/trunk/PKGBUILD)
  flite/repos/community-i686/flite-ldflags.patch
    (from rev 199896, flite/trunk/flite-ldflags.patch)
  flite/repos/community-x86_64/PKGBUILD
    (from rev 199896, flite/trunk/PKGBUILD)
  flite/repos/community-x86_64/flite-ldflags.patch
    (from rev 199896, flite/trunk/flite-ldflags.patch)
Deleted:
  flite/repos/community-i686/PKGBUILD
  flite/repos/community-x86_64/PKGBUILD

--------------------------------------+
 /PKGBUILD                            |   84 +++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD              |   42 ----------------
 community-i686/flite-ldflags.patch   |   35 +++++++++++++
 community-x86_64/PKGBUILD            |   42 ----------------
 community-x86_64/flite-ldflags.patch |   35 +++++++++++++
 5 files changed, 154 insertions(+), 84 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-12-16 21:47:15 UTC (rev 199896)
+++ community-i686/PKGBUILD	2016-12-16 21:47:59 UTC (rev 199897)
@@ -1,42 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Steven Honeyman <stevenhoneyman at gmail com>
-
-pkgname=flite
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="A lighweight speech synthesis engine"
-arch=(i686 x86_64)
-url="http://cmuflite.org"
-license=(custom)
-depends=(alsa-lib)
-makedepends=(chrpath)
-source=(http://festvox.org/flite/packed/flite-${pkgver%.*}/flite-$pkgver-release.tar.bz2 flite-ldflags.patch)
-md5sums=('645db96ffc296cbb6d37f231cc1cc6b2'
-         '3fa25aa18b0b256c7324ada0f7f6f730')
-
-prepare() {
-  cd $pkgname-$pkgver-release
-  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
-  ./configure --prefix=/usr --enable-shared \
-			    --with-audio=alsa \
-			    --with-vox=cmu_us_kal16 \
-			    --with-langvox=archlinux
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver-release
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-# Fix rpath
-  chrpath -d "$pkgdir"/usr/bin/*
-}

Copied: flite/repos/community-i686/PKGBUILD (from rev 199896, flite/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-12-16 21:47:59 UTC (rev 199897)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Steven Honeyman <stevenhoneyman at gmail com>
+
+pkgname=flite
+pkgver=2.0.0
+pkgrel=3
+pkgdesc="A lighweight speech synthesis engine"
+arch=(i686 x86_64)
+url="http://cmuflite.org"
+license=(custom)
+depends=(alsa-lib)
+makedepends=(chrpath)
+source=(http://festvox.org/flite/packed/flite-${pkgver%.*}/flite-$pkgver-release.tar.bz2 flite-ldflags.patch)
+md5sums=('645db96ffc296cbb6d37f231cc1cc6b2'
+         '3fa25aa18b0b256c7324ada0f7f6f730')
+
+prepare() {
+  cd $pkgname-$pkgver-release
+  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
+  ./configure --prefix=/usr --enable-shared \
+			    --with-audio=alsa \
+			    --with-vox=cmu_us_kal16 \
+			    --with-langvox=archlinux
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver-release
+  make DESTDIR="$pkgdir" install
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+# Fix rpath
+  chrpath -d "$pkgdir"/usr/bin/*
+}

Copied: flite/repos/community-i686/flite-ldflags.patch (from rev 199896, flite/trunk/flite-ldflags.patch)
===================================================================
--- community-i686/flite-ldflags.patch	                        (rev 0)
+++ community-i686/flite-ldflags.patch	2016-12-16 21:47:59 UTC (rev 199897)
@@ -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
+ 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-12-16 21:47:15 UTC (rev 199896)
+++ community-x86_64/PKGBUILD	2016-12-16 21:47:59 UTC (rev 199897)
@@ -1,42 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Steven Honeyman <stevenhoneyman at gmail com>
-
-pkgname=flite
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="A lighweight speech synthesis engine"
-arch=(i686 x86_64)
-url="http://cmuflite.org"
-license=(custom)
-depends=(alsa-lib)
-makedepends=(chrpath)
-source=(http://festvox.org/flite/packed/flite-${pkgver%.*}/flite-$pkgver-release.tar.bz2 flite-ldflags.patch)
-md5sums=('645db96ffc296cbb6d37f231cc1cc6b2'
-         '3fa25aa18b0b256c7324ada0f7f6f730')
-
-prepare() {
-  cd $pkgname-$pkgver-release
-  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
-  ./configure --prefix=/usr --enable-shared \
-			    --with-audio=alsa \
-			    --with-vox=cmu_us_kal16 \
-			    --with-langvox=archlinux
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver-release
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-# Fix rpath
-  chrpath -d "$pkgdir"/usr/bin/*
-}

Copied: flite/repos/community-x86_64/PKGBUILD (from rev 199896, flite/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-12-16 21:47:59 UTC (rev 199897)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Steven Honeyman <stevenhoneyman at gmail com>
+
+pkgname=flite
+pkgver=2.0.0
+pkgrel=3
+pkgdesc="A lighweight speech synthesis engine"
+arch=(i686 x86_64)
+url="http://cmuflite.org"
+license=(custom)
+depends=(alsa-lib)
+makedepends=(chrpath)
+source=(http://festvox.org/flite/packed/flite-${pkgver%.*}/flite-$pkgver-release.tar.bz2 flite-ldflags.patch)
+md5sums=('645db96ffc296cbb6d37f231cc1cc6b2'
+         '3fa25aa18b0b256c7324ada0f7f6f730')
+
+prepare() {
+  cd $pkgname-$pkgver-release
+  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
+  ./configure --prefix=/usr --enable-shared \
+			    --with-audio=alsa \
+			    --with-vox=cmu_us_kal16 \
+			    --with-langvox=archlinux
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver-release
+  make DESTDIR="$pkgdir" install
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+# Fix rpath
+  chrpath -d "$pkgdir"/usr/bin/*
+}

Copied: flite/repos/community-x86_64/flite-ldflags.patch (from rev 199896, flite/trunk/flite-ldflags.patch)
===================================================================
--- community-x86_64/flite-ldflags.patch	                        (rev 0)
+++ community-x86_64/flite-ldflags.patch	2016-12-16 21:47:59 UTC (rev 199897)
@@ -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
+ 



More information about the arch-commits mailing list