diff options
| author |   William Hubbs <williamh@gentoo.org> | 2008-03-09 17:54:23 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2008-03-09 17:54:23 +0000 |
| commit | 725fe8d8dab3162a1d648b6829aa22343ff500e1 (patch) | |
| tree | e598a8fedef1eb407536c30a5d2c75c35d398f98 /app-accessibility/espeak | |
| parent | Version bump. (diff) | |
| download | gentoo-2-725fe8d8dab3162a1d648b6829aa22343ff500e1.tar.gz gentoo-2-725fe8d8dab3162a1d648b6829aa22343ff500e1.tar.bz2 gentoo-2-725fe8d8dab3162a1d648b6829aa22343ff500e1.zip | |
Fixed the makefile so espeak builds without portaudio or pulseaudio being selected.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-accessibility/espeak')
| -rw-r--r-- | app-accessibility/espeak/ChangeLog | 7 | ||||
| -rw-r--r-- | app-accessibility/espeak/files/espeak-1.35-makefile.patch | 44 |
2 files changed, 43 insertions, 8 deletions
diff --git a/app-accessibility/espeak/ChangeLog b/app-accessibility/espeak/ChangeLog index dc07365aef91..11da7a4fbdb3 100644 --- a/app-accessibility/espeak/ChangeLog +++ b/app-accessibility/espeak/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-accessibility/espeak # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.33 2008/03/08 21:03:28 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/ChangeLog,v 1.34 2008/03/09 17:54:22 williamh Exp $ + + 09 Mar 2008; William Hubbs <williamh@gentoo.org> + files/espeak-1.35-makefile.patch: + Updated the makefile patch so that espeak builds correctly if no audio option + is in the use flags. Also, I sent this patch upstream. 08 Mar 2008; William Hubbs <williamh@gentoo.org> -files/espeak-1.19-big-endian.patch, diff --git a/app-accessibility/espeak/files/espeak-1.35-makefile.patch b/app-accessibility/espeak/files/espeak-1.35-makefile.patch index 85c43cf3bb1e..85c78f1970f8 100644 --- a/app-accessibility/espeak/files/espeak-1.35-makefile.patch +++ b/app-accessibility/espeak/files/espeak-1.35-makefile.patch @@ -1,11 +1,41 @@ ---- espeak-1.35-source/src/Makefile.orig 2008-03-08 12:05:29.000000000 -0600 -+++ espeak-1.35-source/src/Makefile 2008-03-08 12:09:43.000000000 -0600 -@@ -61,14 +61,15 @@ +--- espeak-1.35-source/src/Makefile.orig 2008-03-09 12:23:30.000000000 -0500 ++++ espeak-1.35-source/src/Makefile 2008-03-09 12:42:37.000000000 -0500 +@@ -30,12 +30,14 @@ + + ifeq ($(AUDIO),pulseaudio) + WAVE=wave_pulse.cpp +-LIB_AUDIO=pulse +-USE_AUDIO=USE_PULSEAUDIO ++LIB_AUDIO=-lpulse ++USE_AUDIO=-DUSE_PULSEAUDIO ++else ifeq ($(AUDIO),portaudio) ++WAVE=wave.cpp ++LIB_AUDIO=-lportaudio ++USE_AUDIO=-DUSE_PORTAUDIO + else + WAVE=wave.cpp +-LIB_AUDIO=portaudio +-USE_AUDIO=USE_PORTAUDIO + endif + + speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \ +@@ -51,24 +53,24 @@ + + SRCS1=$(speak_SOURCES) + OBJS1=$(patsubst %.cpp,%.o,$(SRCS1)) +-LIBS1=-lstdc++ -l$(LIB_AUDIO) -lpthread $(EXTRA_LIBS) ++LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS) + + SRCS2=$(libespeak_SOURCES) + OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2)) +-LIBS2=-lstdc++ -l$(LIB_AUDIO) -lpthread ++LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread + + SRCS3 = espeak.cpp OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) LIBS3=-lstdc++ -L . -lespeak -CXXFLAGS=-O2 -D$(USE_AUDIO) -+AUDIOFLAGS=-D$(USE_AUDIO) +CXXFLAGS=-O2 @@ -14,16 +44,16 @@ .cpp.o: - $(CXX) $(CXXFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< -+ $(CXX) $(CXXFLAGS) $(AUDIOFLAGS) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< ++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< $(BIN_NAME): $(OBJS1) $(CXX) -o $@ $(OBJS1) $(LIBS1) -@@ -79,7 +80,7 @@ +@@ -79,7 +81,7 @@ x_%.o: %.cpp - $(CXX) $(CXXFLAGS) -Wall -fpic -pedantic \ -+ $(CXX) $(CXXFLAGS) $(AUDIOFLAGS) -Wall -fpic -pedantic \ ++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \ -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o $(LIB_NAME): $(OBJS2) |