Fixed the makefile so espeak builds without portaudio or pulseaudio being selected.

Package-Manager: portage-2.1.4.4

3 files changed, 45 insertions, 10 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/Manifest b/app-accessibility/espeak/Manifest
index 2753c200bdf5..1376206f5123 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,7 @@
-AUX espeak-1.35-makefile.patch 911 RMD160 694533f26b7e0aacaa107a81dc79b81fd36961c2 SHA1 dcbb3dbe89ddf0f77d75a2eca2034374dc343942 SHA256 59fb22f87371be1c728ba6107410b47e8dc18af73b925fc2744f8815ba64c83b
+AUX espeak-1.35-makefile.patch 1635 RMD160 7fc66ccc809b33da2f27236969ae900d201a59df SHA1 fd61c047961951ee0900132bfd5fb26310835f29 SHA256 b2c4ab30886be647a4783307b895baaa7956f36428833a84aacfce6b7211248c
 DIST espeak-1.25-source.zip 912952 RMD160 68c06d6ca30b3bf3c5b865151b1c3d720c9a5626 SHA1 2287553f0a80d38487500d7ce42c5221627ef1ae SHA256 981ccad8255677aa6858d7b206cebed183c9d4586ed886da707259e5b379e302
 DIST espeak-1.35-source.zip 1253271 RMD160 daf5ab2f9cd694e04a980caef31f44e6c4314124 SHA1 147641bd99e25f4fa13a8fa8190c17b8179c6c30 SHA256 34b94f9542aed5710cb5303baeabafbb1d2a708dbf3cca0fcf84355ecdb832bb
 EBUILD espeak-1.25.ebuild 1438 RMD160 518d275393a41030ad1122e7e60ec6ed43071f40 SHA1 99c12a17a49679bbccff243e2cc682cb21f3c586 SHA256 4148b52d32ce6be315b2e5a9fda2f3d021b150fcf66b0b4c644dcf6e1cd76955
 EBUILD espeak-1.35.ebuild 1879 RMD160 aee8689dd9dff6be5c224e19a8c58df3ea5043b0 SHA1 e2cbb4c2b57cd07d8b5d8ae65aba8c8ad4a66e74 SHA256 fb415f3bc0133c3629cd4eb1626e5b3dab8269b63cf3b89ab305b3a80c26a699
-MISC ChangeLog 5433 RMD160 fa4e999c124eff179b2a040dc9f67d5555b34926 SHA1 201e0aa259a69451b3c42905fac30e006afb71da SHA256 69ea75bba6ffa77a5b239e1f27c01699c0473d1c98a208d4012aa45343d3b4c8
+MISC ChangeLog 5659 RMD160 a196704b2d62e5d5b5a1b431828af4ef42ecec61 SHA1 d88b1da5e9094564275fcd0dbef53a8b4b5dc8a8 SHA256 ea4cb2c1514fc21dbdbcdb7d7545b42ba58fe3620dfaf6aab81671a31203c3c8
 MISC metadata.xml 229 RMD160 7f8d6a0235529eccff705022803122c9534628d7 SHA1 2295356b566d60c8eb979db0e598de9d1d8ccf49 SHA256 b128d301356b3f98f1d6093b4401c36143ff55fc62636612567b0995739b9e66
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)