* [gentoo-commits] gentoo-x86 commit in app-accessibility/festival/files: festival-2.1-gentoo-system.patch festival-2.1-ldflags.patch festival-2.1-init-scm.patch
@ 2011-03-16 22:43 Jesus Rivero (neurogeek)
0 siblings, 0 replies; only message in thread
From: Jesus Rivero (neurogeek) @ 2011-03-16 22:43 UTC (permalink / raw
To: gentoo-commits
neurogeek 11/03/16 22:43:05
Added: festival-2.1-gentoo-system.patch
festival-2.1-ldflags.patch
festival-2.1-init-scm.patch
Log:
Version bump. Closes bug #340317 and #357381.
(Portage version: 2.2.0_alpha9/cvs/Linux i686)
Revision Changes Path
1.1 app-accessibility/festival/files/festival-2.1-gentoo-system.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-gentoo-system.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-gentoo-system.patch?rev=1.1&content-type=text/plain
Index: festival-2.1-gentoo-system.patch
===================================================================
diff -uNr festival.orig/config/systems/GentooLinux.mak festival/config/systems/GentooLinux.mak
--- festival.orig/config/systems/GentooLinux.mak 1969-12-31 19:00:00.000000000 -0500
+++ festival/config/systems/GentooLinux.mak 2011-02-09 10:43:28.000000000 -0500
@@ -0,0 +1,42 @@
+ ###########################################################################
+ ## ##
+ ## Centre for Speech Technology Research ##
+ ## University of Edinburgh, UK ##
+ ## Copyright (c) 1996 ##
+ ## All Rights Reserved. ##
+ ## ##
+ ## Permission is hereby granted, free of charge, to use and distribute ##
+ ## this software and its documentation without restriction, including ##
+ ## without limitation the rights to use, copy, modify, merge, publish, ##
+ ## distribute, sublicense, and/or sell copies of this work, and to ##
+ ## permit persons to whom this work is furnished to do so, subject to ##
+ ## the following conditions: ##
+ ## 1. The code must retain the above copyright notice, this list of ##
+ ## conditions and the following disclaimer. ##
+ ## 2. Any modifications must be clearly marked as such. ##
+ ## 3. Original authors' names are not deleted. ##
+ ## 4. The authors' names are not used to endorse or promote products ##
+ ## derived from this software without specific prior written ##
+ ## permission. ##
+ ## ##
+ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ##
+ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ##
+ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+ ## THIS SOFTWARE. ##
+ ## ##
+ ###########################################################################
+ ## ##
+ ## Author: William Hubbs <williamh@gentoo.org> ##
+ ## -------------------------------------------------------------------- ##
+ ## Settings for Gentoo Linux distributions. ##
+ ## ##
+ ###########################################################################
+
+MANDIR=$(INSTALL_PREFIX)/share/man
+# Gentoo does not use termcap
+OS_LIBS = $(LDFLAGS) -ldl -lncurses
diff -uNr festival.orig/config/systems/Makefile festival/config/systems/Makefile
--- festival.orig/config/systems/Makefile 2011-02-09 10:41:01.000000000 -0500
+++ festival/config/systems/Makefile 2011-02-09 10:44:22.000000000 -0500
@@ -41,6 +41,7 @@
Linux.mak \
RedHatLinux.mak \
DebianGNULinux.mak \
+ GentooLinux.mak \
alpha_Linux.mak \
alpha_OSF1V4.0.mak \
alpha_RedHatLinux.mak \
@@ -94,6 +95,7 @@
sparc_SunOS5.8.mak \
sparc_SunOS5.mak \
unknown_DebianGNULinux.mak \
+ unknown_GentooLinux.mak \
unknown_Linux.mak \
unknown_RedHatLinux.mak \
power_macintosh_Darwin.mak \
diff -uNr festival.orig/config/systems/unknown_GentooLinux.mak festival/config/systems/unknown_GentooLinux.mak
--- festival.orig/config/systems/unknown_GentooLinux.mak 1969-12-31 19:00:00.000000000 -0500
+++ festival/config/systems/unknown_GentooLinux.mak 2011-02-09 10:45:34.000000000 -0500
@@ -0,0 +1,41 @@
+###########################################################################
+## ##
+## Centre for Speech Technology Research ##
+## University of Edinburgh, UK ##
+## Copyright (c) 1996 ##
+## All Rights Reserved. ##
+## ##
+## Permission is hereby granted, free of charge, to use and distribute ##
+## this software and its documentation without restriction, including ##
+## without limitation the rights to use, copy, modify, merge, publish, ##
+## distribute, sublicense, and/or sell copies of this work, and to ##
+## permit persons to whom this work is furnished to do so, subject to ##
+## the following conditions: ##
+## 1. The code must retain the above copyright notice, this list of ##
+## conditions and the following disclaimer. ##
+## 2. Any modifications must be clearly marked as such. ##
+## 3. Original authors' names are not deleted. ##
+## 4. The authors' names are not used to endorse or promote products ##
+## derived from this software without specific prior written ##
+## permission. ##
+## ##
+## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ##
+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ##
+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+## THIS SOFTWARE. ##
+## ##
+###########################################################################
+## ##
+## Author: William Hubbs <williamh@gentoo.org> ##
+## -------------------------------------------------------------------- ##
+## Settings for Gentoo Linux distributions. ##
+## ##
+###########################################################################
+
+include $(EST)/config/systems/Linux.mak
+include $(EST)/config/systems/GentooLinux.mak
diff -uNr festival.orig/config/system.sh festival/config/system.sh
--- festival.orig/config/system.sh 2011-02-09 10:41:01.000000000 -0500
+++ festival/config/system.sh 2011-02-09 10:42:10.000000000 -0500
@@ -70,6 +70,10 @@
then
OSTYPE=DebianGNULinux
OSREV=`cat /etc/debian_version`
+ elif [ -f "/etc/gentoo-release" ]
+ then
+ OSTYPE=GentooLinux
+ OSREV=""
else
# Generic unknown GNU/Linux system.
OSTYPE=Linux
1.1 app-accessibility/festival/files/festival-2.1-ldflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-ldflags.patch?rev=1.1&content-type=text/plain
Index: festival-2.1-ldflags.patch
===================================================================
diff -uNr festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak
--- festival.orig/config/systems/Linux.mak 2011-02-09 10:08:20.000000000 -0500
+++ festival/config/systems/Linux.mak 2011-02-09 10:09:04.000000000 -0500
@@ -46,7 +46,7 @@
JAVAH=/usr/bin/javah
TCL_LIBRARY = -ltcl
-OS_LIBS = -ldl
+OS_LIBS = $(OPTIMISE_LDFLAGS) -ldl
## the native audio module for this type of system
NATIVE_AUDIO_MODULE = LINUX16
1.1 app-accessibility/festival/files/festival-2.1-init-scm.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-init-scm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/festival/files/festival-2.1-init-scm.patch?rev=1.1&content-type=text/plain
Index: festival-2.1-init-scm.patch
===================================================================
--- festival/lib/init.scm 2006-09-15 01:34:32.000000000 -0500
+++ festival/lib/init.scm 2006-09-15 01:50:30.000000000 -0500
@@ -52,8 +52,8 @@
;;; A chance to set various variables to a local setting e.g.
;;; lexdir, voices_dir audio etc etc.
-(if (probe_file (path-append libdir "sitevars.scm"))
- (load (path-append libdir "sitevars.scm")))
+(if (probe_file "/etc/festival/sitevars.scm")
+ (load "/etc/festival/sitevars.scm"))
;;; CSTR siod extensions
(require 'cstr)
@@ -133,8 +133,8 @@
;;;
;;; Local site initialization, if the file exists load it
;;;
-(if (probe_file (path-append libdir "siteinit.scm"))
- (load (path-append libdir "siteinit.scm")))
+(if (probe_file "/etc/festival/siteinit.scm")
+ (load "/etc/festival/siteinit.scm"))
;;; User initialization, if a user has a personal customization
;;; file loaded it
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-16 22:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-16 22:43 [gentoo-commits] gentoo-x86 commit in app-accessibility/festival/files: festival-2.1-gentoo-system.patch festival-2.1-ldflags.patch festival-2.1-init-scm.patch Jesus Rivero (neurogeek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox