| 1 |
williamh 08/03/12 00:22:40 |
| 2 |
|
| 3 |
Modified: ChangeLog espeak-1.36.ebuild |
| 4 |
Log: |
| 5 |
Fixed the ebuild so that the correct options are passed to make if no audio output option is in the use flags. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.36 app-accessibility/espeak/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/ChangeLog?rev=1.36&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/ChangeLog?rev=1.36&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/ChangeLog?r1=1.35&r2=1.36 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v |
| 18 |
retrieving revision 1.35 |
| 19 |
retrieving revision 1.36 |
| 20 |
diff -u -r1.35 -r1.36 |
| 21 |
--- ChangeLog 10 Mar 2008 01:01:41 -0000 1.35 |
| 22 |
+++ ChangeLog 12 Mar 2008 00:22:39 -0000 1.36 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for app-accessibility/espeak |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.35 2008/03/10 01:01:41 williamh Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.36 2008/03/12 00:22:39 williamh Exp $ |
| 28 |
+ |
| 29 |
+ 12 Mar 2008; William Hubbs <williamh@g.o> espeak-1.36.ebuild: |
| 30 |
+ Updated the ebuild to pass the correct options to make if neither portaudio |
| 31 |
+ nor pulseaudio is in the use flags. |
| 32 |
|
| 33 |
*espeak-1.36 (10 Mar 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 app-accessibility/espeak/espeak-1.36.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: espeak-1.36.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- espeak-1.36.ebuild 10 Mar 2008 01:01:41 -0000 1.1 |
| 51 |
+++ espeak-1.36.ebuild 12 Mar 2008 00:22:39 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild,v 1.1 2008/03/10 01:01:41 williamh Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.36.ebuild,v 1.2 2008/03/12 00:22:39 williamh Exp $ |
| 57 |
|
| 58 |
inherit eutils |
| 59 |
|
| 60 |
@@ -18,15 +18,29 @@ |
| 61 |
|
| 62 |
S=${WORKDIR}/${MY_P} |
| 63 |
|
| 64 |
+get_audio() { |
| 65 |
+ local MY_AUDIO |
| 66 |
+ |
| 67 |
+ MY_AUDIO=none |
| 68 |
+ if use portaudio; then |
| 69 |
+ MY_AUDIO=portaudio |
| 70 |
+ elif use pulseaudio; then |
| 71 |
+ MY_AUDIO=pulseaudio |
| 72 |
+ fi |
| 73 |
+ echo ${MY_AUDIO} |
| 74 |
+} |
| 75 |
+ |
| 76 |
pkg_setup() { |
| 77 |
- if ! use portaudio -a ! ! use pulseaudio; then |
| 78 |
- ewarn |
| 79 |
- ewarn Since portaudio and pulseaudio are not in your use flags, espeak |
| 80 |
- ewarn will only bbe able to create wav files. |
| 81 |
- ewarn If this is not what you want, press ctrl-c and put either |
| 82 |
- ewarn portaudio or pulseaudio in your use flags. |
| 83 |
- ebeep |
| 84 |
- epause 10 |
| 85 |
+ if ! use portaudio; then |
| 86 |
+ if ! use pulseaudio; then |
| 87 |
+ ewarn |
| 88 |
+ ewarn Since portaudio and pulseaudio are not in your use flags, espeak |
| 89 |
+ ewarn will only bbe able to create wav files. |
| 90 |
+ ewarn If this is not what you want, press ctrl-c and put either |
| 91 |
+ ewarn portaudio or pulseaudio in your use flags. |
| 92 |
+ ebeep |
| 93 |
+ epause 10 |
| 94 |
+ fi |
| 95 |
fi |
| 96 |
} |
| 97 |
|
| 98 |
@@ -43,17 +57,8 @@ |
| 99 |
} |
| 100 |
|
| 101 |
src_compile() { |
| 102 |
- local MY_AUDIO |
| 103 |
- |
| 104 |
cd src |
| 105 |
- |
| 106 |
- if use portaudio; then |
| 107 |
- MY_AUDIO=portaudio |
| 108 |
- elif use pulseaudio; then |
| 109 |
- MY_AUDIO=pulseaudio |
| 110 |
- fi |
| 111 |
- |
| 112 |
- emake AUDIO="${MY_AUDIO}" CXXFLAGS="${CXXFLAGS}" || die "Compilation failed" |
| 113 |
+ emake AUDIO="$(get_audio)" CXXFLAGS="${CXXFLAGS}" all || die "Compilation failed" |
| 114 |
|
| 115 |
einfo "Fixing byte order of phoneme data files" |
| 116 |
cd "${S}/platforms/big_endian" |
| 117 |
@@ -64,7 +69,7 @@ |
| 118 |
|
| 119 |
src_install() { |
| 120 |
cd src |
| 121 |
- make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install || die "Installation failed" |
| 122 |
+ make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" AUDIO="$(get_audio)" install || die "Installation failed" |
| 123 |
|
| 124 |
cd .. |
| 125 |
dodoc ChangeLog ReadMe |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
-- |
| 130 |
gentoo-commits@l.g.o mailing list |
Archives