rpms/espeak/FC-6 espeak-1.18-makefile_lpthread.patch, NONE, 1.1 espeak-1.18-makefile_smp.patch, NONE, 1.1 espeak-1.18-ptr_64bit.patch, NONE, 1.1 espeak.spec, 1.3, 1.4 makefile_lpthread.patch, 1.2, NONE

Francois Aucamp (faucamp) fedora-extras-commits at redhat.com
Tue Jan 16 16:23:11 UTC 2007 

Author: faucamp

Update of /cvs/extras/rpms/espeak/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16674

Modified Files:
	espeak.spec 
Added Files:
	espeak-1.18-makefile_lpthread.patch 
	espeak-1.18-makefile_smp.patch espeak-1.18-ptr_64bit.patch 
Removed Files:
	makefile_lpthread.patch 
Log Message:
- Created "espeak-1.18-ptr_64bit" patch to allow compilation on x86_64 (fixes 64-bit pointer issues)
- Created "espeak-1.18-makefile_smp" patch to allow parallel make ("_smp_mflags")
- Renamed "makefile_lpthread" patch to "espeak-1.18-makefile_lpthread"


espeak-1.18-makefile_lpthread.patch:

--- NEW FILE espeak-1.18-makefile_lpthread.patch ---
diff -uNr espeak-1.18-source/src/Makefile espeak-1.18-source-mod/src/Makefile
--- espeak-1.18-source/src/Makefile	2007-01-15 03:08:03.000000000 +0200
+++ espeak-1.18-source-mod/src/Makefile	2007-01-15 15:53:40.000000000 +0200
@@ -28,11 +28,11 @@
 
 SRCS1=$(speak_SOURCES)
 OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
-LIBS1=-lstdc++ -lportaudio
+LIBS1=-lstdc++ -lportaudio -lpthread
 
 SRCS2=$(libespeak_SOURCES)
 OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
-LIBS2=-lstdc++ -lportaudio
+LIBS2=-lstdc++ -lportaudio -lpthread
 
 SRCS3 = espeak.cpp
 OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))

espeak-1.18-makefile_smp.patch:

--- NEW FILE espeak-1.18-makefile_smp.patch ---
diff -uNr espeak-1.18-source/src/Makefile espeak-1.18-source-mod/src/Makefile
--- espeak-1.18-source/src/Makefile	2007-01-16 17:37:37.000000000 +0200
+++ espeak-1.18-source-mod/src/Makefile	2007-01-16 17:31:55.000000000 +0200
@@ -50,7 +50,7 @@
 $(BIN_NAME): $(OBJS1)
 	$(CXX) -o $@ $(OBJS1) $(LIBS1)
 
-$(BIN2_NAME): $(OBJS3)
+$(BIN2_NAME): $(OBJS3) $(LIB_NAME)
 	$(CXX) -o $@ $(OBJS3) $(LIBS3)
 
 

espeak-1.18-ptr_64bit.patch:

--- NEW FILE espeak-1.18-ptr_64bit.patch ---
diff -uNr espeak-1.18-source/src/dictionary.cpp espeak-1.18-source-mod/src/dictionary.cpp
--- espeak-1.18-source/src/dictionary.cpp	2007-01-13 17:56:33.000000000 +0200
+++ espeak-1.18-source-mod/src/dictionary.cpp	2007-01-16 16:12:59.000000000 +0200
@@ -20,6 +20,7 @@
 #include "StdAfx.h"
 
 #define LOG_TRANSLATE
+#define __STDC_FORMAT_MACROS
  
 #include <stdio.h>
 #include <ctype.h>
@@ -28,6 +29,7 @@
 
 #include <wctype.h>
 #include <wchar.h>
+#include <inttypes.h>
 
 #include "speak_lib.h"
 #include "speech.h"
@@ -219,7 +221,7 @@
 	{
 		if(*p != RULE_GROUP_START)
 		{
-			fprintf(stderr,"Bad rules data in '%s_dict' at 0x%x\n",dictionary_name,p-data_dictrules);
+			fprintf(stderr,"Bad rules data in '%s_dict' at 0x%" PRIxPTR "\n",dictionary_name,p-data_dictrules);
 			break;
 		}
 		p++;
@@ -592,7 +594,7 @@
 int Translator::IsLetter(int letter, int group)
 {//============================================
 	if(letter_type_list[group] != NULL)
-		return((int)wcschr(letter_type_list[group],letter));
+		return((int)((intptr_t)wcschr(letter_type_list[group],letter)));
 
 	if(letter_bits_offset > 0)
 	{
Binary files espeak-1.18-source/src/speak and espeak-1.18-source-mod/src/speak differ
diff -uNr espeak-1.18-source/src/speak_lib.cpp espeak-1.18-source-mod/src/speak_lib.cpp
--- espeak-1.18-source/src/speak_lib.cpp	2007-01-13 17:56:33.000000000 +0200
+++ espeak-1.18-source-mod/src/speak_lib.cpp	2007-01-16 16:16:53.000000000 +0200
@@ -73,7 +73,7 @@
 
 	int a_wave_can_be_played = fifo_is_command_enabled();
 
-	SHOW("*** dispatch_audio > uid=%d, [write=%x (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", 
+	SHOW("*** dispatch_audio > uid=%d, [write=%" PRIxPTR " (%d bytes)], sample=%d, a_wave_can_be_played = %d\n", 
        (event) ? event->unique_identifier : 0, wave_test_get_write_buffer(), 2*length, 
        (event) ? event->sample : 0,
        a_wave_can_be_played);
diff -uNr espeak-1.18-source/src/wave.cpp espeak-1.18-source-mod/src/wave.cpp
--- espeak-1.18-source/src/wave.cpp	2007-01-13 17:56:34.000000000 +0200
+++ espeak-1.18-source-mod/src/wave.cpp	2007-01-16 16:04:16.000000000 +0200
@@ -877,9 +877,9 @@
 //>
 //<wave_test_get_write_buffer
 
-uint32_t wave_test_get_write_buffer()
+uintptr_t wave_test_get_write_buffer()
 {
-  return (uint32_t)myWrite;
+  return (uintptr_t)myWrite;
 }
 
 
@@ -897,7 +897,7 @@
 uint32_t wave_get_remaining_time(uint32_t sample) {return 0;}
 typedef int (t_wave_callback)(void);
 void wave_set_callback_is_output_enabled(t_wave_callback* cb) {}
-extern uint32_t wave_test_get_write_buffer() {return 0;}
+extern uintptr_t wave_test_get_write_buffer() {return 0;}
 
 #endif  // of USE_PORTAUDIO
 
diff -uNr espeak-1.18-source/src/wave.h espeak-1.18-source-mod/src/wave.h
--- espeak-1.18-source/src/wave.h	2007-01-13 17:56:34.000000000 +0200
+++ espeak-1.18-source-mod/src/wave.h	2007-01-16 16:04:16.000000000 +0200
@@ -1,7 +1,7 @@
 #ifndef WAVE_H
 #define WAVE_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 extern void wave_init();
 // TBD: the arg could be "alsa", "oss",...
@@ -33,6 +33,6 @@
 extern void add_time_in_ms(struct timespec *ts, int time_in_ms);
 
 // for tests
-extern uint32_t wave_test_get_write_buffer();
+extern uintptr_t wave_test_get_write_buffer();
 
 #endif


Index: espeak.spec
===================================================================
RCS file: /cvs/extras/rpms/espeak/FC-6/espeak.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- espeak.spec	15 Jan 2007 14:17:18 -0000	1.3
+++ espeak.spec	16 Jan 2007 16:22:41 -0000	1.4
@@ -1,13 +1,15 @@
 Name:           espeak
 Version:        1.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://espeak.sourceforge.net
 Source0:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
-Patch0:         makefile_lpthread.patch
+Patch0:         espeak-1.18-makefile_lpthread.patch
+Patch1:         espeak-1.18-ptr_64bit.patch
+Patch2:         espeak-1.18-makefile_smp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -39,7 +41,9 @@
 %prep
 %setup -q -n espeak-%{version}-source
 chmod 0644 src/* 
-%patch0 -p1 -b .pthread
+%patch0 -p1 -b .lpthread
+%patch1 -p1 -b .ptr_64bit
+%patch2 -p1 -b .makefile_smp
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
@@ -82,6 +86,11 @@
 
 
 %changelog
+* Tue Jan 16 2007 Francois Aucamp <faucamp at csir.co.za> - 1.18-2
+- Created "espeak-1.18-ptr_64bit" patch to allow compilation on x86_64 (fixes 64-bit pointer issues)
+- Created "espeak-1.18-makefile_smp" patch to allow parallel make ("_smp_mflags")
+- Renamed "makefile_lpthread" patch to "espeak-1.18-makefile_lpthread"
+
 * Mon Jan 15 2007 Francois Aucamp <faucamp at csir.co.za> - 1.18-1
 - Update to version 1.18
 - Dropped statically-linked "speak" executable (replaced by dynamically-linked "espeak" executable)


--- makefile_lpthread.patch DELETED ---

More information about the scm-commits mailing list