Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-accessibility/flite/files: flite-1.3-alsa-support.patch digest-flite-1.3 flite-1.3-shared-libs.patch
Date: Thu, 24 Jan 2008 05:37:35
Message-Id: E1JHumK-0000EJ-JL@stork.gentoo.org
1 williamh 08/01/24 05:37:32
2
3 Added: flite-1.3-alsa-support.patch digest-flite-1.3
4 flite-1.3-shared-libs.patch
5 Log:
6 Version bump.
7 (Portage version: 2.1.4)
8
9 Revision Changes Path
10 1.1 app-accessibility/flite/files/flite-1.3-alsa-support.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.3-alsa-support.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.3-alsa-support.patch?rev=1.1&content-type=text/plain
14
15 Index: flite-1.3-alsa-support.patch
16 ===================================================================
17 diff -uNr flite-1.3-release/configure.in flite-1.3-release-mod/configure.in
18 --- flite-1.3-release/configure.in 2005-08-13 13:43:21.000000000 +0200
19 +++ flite-1.3-release-mod/configure.in 2006-11-13 21:16:27.000000000 +0200
20 @@ -206,10 +206,10 @@
21 AC_CHECK_HEADER(sys/audioio.h,
22 [AUDIODRIVER="sun"
23 AUDIODEFS=-DCST_AUDIO_SUNOS])
24 -dnl AC_CHECK_HEADER(sys/asoundlib.h,
25 -dnl [AUDIODRIVER="alsa"
26 -dnl AUDIODEFS=-DCST_AUDIO_ALSA
27 -dnl AUDIOLIBS=-lasound])
28 +AC_CHECK_HEADER(alsa/asoundlib.h,
29 + [AUDIODRIVER="alsa"
30 + AUDIODEFS=-DCST_AUDIO_ALSA
31 + AUDIOLIBS=-lasound])
32 AC_CHECK_HEADER(mmsystem.h,
33 [AUDIODRIVER="wince"
34 AUDIODEFS=-DCST_AUDIO_WINCE
35 diff -uNr flite-1.3-release/src/audio/au_alsa.c flite-1.3-release-mod/src/audio/au_alsa.c
36 --- flite-1.3-release/src/audio/au_alsa.c 1970-01-01 02:00:00.000000000 +0200
37 +++ flite-1.3-release-mod/src/audio/au_alsa.c 2006-11-13 21:16:54.000000000 +0200
38 @@ -0,0 +1,311 @@
39 +/*************************************************************************/
40 +/* */
41 +/* Language Technologies Institute */
42 +/* Carnegie Mellon University */
43 +/* Copyright (c) 2000 */
44 +/* All Rights Reserved. */
45 +/* */
46 +/* Permission is hereby granted, free of charge, to use and distribute */
47 +/* this software and its documentation without restriction, including */
48 +/* without limitation the rights to use, copy, modify, merge, publish, */
49 +/* distribute, sublicense, and/or sell copies of this work, and to */
50 +/* permit persons to whom this work is furnished to do so, subject to */
51 +/* the following conditions: */
52 +/* 1. The code must retain the above copyright notice, this list of */
53 +/* conditions and the following disclaimer. */
54 +/* 2. Any modifications must be clearly marked as such. */
55 +/* 3. Original authors' names are not deleted. */
56 +/* 4. The authors' names are not used to endorse or promote products */
57 +/* derived from this software without specific prior written */
58 +/* permission. */
59 +/* */
60 +/* CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK */
61 +/* DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING */
62 +/* ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT */
63 +/* SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE */
64 +/* FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */
65 +/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN */
66 +/* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, */
67 +/* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF */
68 +/* THIS SOFTWARE. */
69 +/* */
70 +/*********************************************************************** */
71 +/* Author: Lukas Loehrer ( */
72 +/* Date: January 2005 */
73 +/*************************************************************************/
74 +/* */
75 +/* Native access to alsa audio devices on Linux */
76 +/* Tested with libasound version 1.0.10 */
77 +/*************************************************************************/
78 +
79 +#include <stdlib.h>
80 +#include <unistd.h>
81 +#include <sys/types.h>
82 +#include <assert.h>
83 +#include <errno.h>
84 +
85 +#include "cst_string.h"
86 +#include "cst_wave.h"
87 +#include "cst_audio.h"
88 +
89 +#include <alsa/asoundlib.h>
90 +
91 +
92 +/*static char *pcm_dev_name = "hw:0,0"; */
93 +static char *pcm_dev_name ="default";
94 +
95 +static inline void print_pcm_state(snd_pcm_t *handle, char *msg)
96 +{
97 + fprintf(stderr, "PCM state at %s = %s\n", msg,
98 + snd_pcm_state_name(snd_pcm_state(handle)));
99 +}
100 +
101 +cst_audiodev *audio_open_alsa(int sps, int channels, cst_audiofmt fmt)
102 +{
103 + cst_audiodev *ad;
104 + unsigned int real_rate;
105 + int err;
106 +
107 + /* alsa specific stuff */
108 + snd_pcm_t *pcm_handle;
109 + snd_pcm_stream_t stream = SND_PCM_STREAM_PLAYBACK;
110 + snd_pcm_hw_params_t *hwparams;
111 + snd_pcm_format_t format;
112 + snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED;
113 +
114 + /* Allocate the snd_pcm_hw_params_t structure on the stack. */
115 + snd_pcm_hw_params_alloca(&hwparams);
116 +
117 + /* Open pcm device */
118 + err = snd_pcm_open(&pcm_handle, pcm_dev_name, stream, 0);
119 + if (err < 0)
120 + {
121 + cst_errmsg("audio_open_alsa: failed to open audio device %s. %s\n",
122 + pcm_dev_name, snd_strerror(err));
123 + return NULL;
124 + }
125 +
126 + /* Init hwparams with full configuration space */
127 + err = snd_pcm_hw_params_any(pcm_handle, hwparams);
128 + if (err < 0)
129 + {
130 + snd_pcm_close(pcm_handle);
131 + cst_errmsg("audio_open_alsa: failed to get hardware parameters from audio device. %s\n", snd_strerror(err));
132 + return NULL;
133 + }
134 +
135 + /* Set access mode */
136 + err = snd_pcm_hw_params_set_access(pcm_handle, hwparams, access);
137 + if (err < 0)
138 + {
139 + snd_pcm_close(pcm_handle);
140 + cst_errmsg("audio_open_alsa: failed to set access mode. %s.\n", snd_strerror(err));
141 + return NULL;
142 + }
143 +
144 + /* Determine matching alsa sample format */
145 + /* This could be implemented in a more */
146 + /* flexible way (byte order conversion). */
147 + switch (fmt)
148 + {
149 + case CST_AUDIO_LINEAR16:
150 + if (CST_LITTLE_ENDIAN)
151 + format = SND_PCM_FORMAT_S16_LE;
152 + else
153 + format = SND_PCM_FORMAT_S16_BE;
154 + break;
155 + case CST_AUDIO_LINEAR8:
156 + format = SND_PCM_FORMAT_U8;
157 + break;
158 + case CST_AUDIO_MULAW:
159 + format = SND_PCM_FORMAT_MU_LAW;
160 + break;
161 + default:
162 + snd_pcm_close(pcm_handle);
163 + cst_errmsg("audio_open_alsa: failed to find suitable format.\n");
164 + return NULL;
165 + break;
166 + }
167 +
168 + /* Set samble format */
169 + err = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format);
170 + if (err <0)
171 + {
172 + snd_pcm_close(pcm_handle);
173 + cst_errmsg("audio_open_alsa: failed to set format. %s.\n", snd_strerror(err));
174 + return NULL;
175 + }
176 +
177 + /* Set sample rate near the disired rate */
178 + real_rate = sps;
179 + err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &real_rate, 0);
180 + if (err < 0)
181 + {
182 + snd_pcm_close(pcm_handle);
183 + cst_errmsg("audio_open_alsa: failed to set sample rate near %d. %s.\n", sps, snd_strerror(err));
184 + return NULL;
185 + }
186 + /*FIXME: This is probably too strict */
187 + assert(sps == real_rate);
188 +
189 + /* Set number of channels */
190 + assert(channels >0);
191 + err = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, channels);
192 + if (err < 0)
193 + {
194 + snd_pcm_close(pcm_handle);
195 + cst_errmsg("audio_open_alsa: failed to set number of channels to %d. %s.\n", channels, snd_strerror(err));
196 + return NULL;
197 + }
198 +
199 + /* Commit hardware parameters */
200 + err = snd_pcm_hw_params(pcm_handle, hwparams);
201 + if (err < 0)
202 + {
203 + snd_pcm_close(pcm_handle);
204 + cst_errmsg("audio_open_alsa: failed to set hw parameters. %s.\n", snd_strerror(err));
205 + return NULL;
206 + }
207 +
208 + /* Make sure the device is ready to accept data */
209 + assert(snd_pcm_state(pcm_handle) == SND_PCM_STATE_PREPARED);
210 +
211 + /* Write hardware parameters to flite audio device data structure */
212 + ad = cst_alloc(cst_audiodev, 1);
213 + assert(ad != NULL);
214 + ad->real_sps = ad->sps = sps;
215 + ad->real_channels = ad->channels = channels;
216 + ad->real_fmt = ad->fmt = fmt;
217 + ad->platform_data = (void *) pcm_handle;
218 +
219 + return ad;
220 +}
221 +
222 +int audio_close_alsa(cst_audiodev *ad)
223 +{
224 + int result;
225 + snd_pcm_t *pcm_handle;
226 +
227 + if (ad == NULL)
228 + return 0;
229 +
230 + pcm_handle = (snd_pcm_t *) ad->platform_data;
231 + result = snd_pcm_close(pcm_handle);
232 + if (result < 0)
233 + {
234 + cst_errmsg("audio_close_alsa: Error: %s.\n", snd_strerror(result));
235 + }
236 + cst_free(ad);
237 + return result;
238 +}
239 +
240 +/* Returns zero if recovery was successful. */
241 +static int recover_from_error(snd_pcm_t *pcm_handle, ssize_t res)
242 +{
243 + if (res == -EPIPE) /* xrun */
244 + {
245 + res = snd_pcm_prepare(pcm_handle);
246 + if (res < 0)
247 + {
248 + /* Failed to recover from xrun */
249 + cst_errmsg("recover_from_write_error: failed to recover from xrun. %s\n.", snd_strerror(res));
250 + return res;
251 + }
252 + }
253 + else if (res == -ESTRPIPE) /* Suspend */
254 + {
255 + while ((res = snd_pcm_resume(pcm_handle)) == -EAGAIN)
256 + {
257 + snd_pcm_wait(pcm_handle, 1000);
258 + }
259 + if (res < 0)
260 + {
261 + res = snd_pcm_prepare(pcm_handle);
262 + if (res <0)
263 + {
264 + /* Resume failed */
265 + cst_errmsg("audio_recover_from_write_error: failed to resume after suspend. %s\n.", snd_strerror(res));
266 + return res;
267 + }
268 + }
269 + }
270 + else if (res < 0)
271 + {
272 + /* Unknown failure */
273 + cst_errmsg("audio_recover_from_write_error: %s.\n", snd_strerror(res));
274 + return res;
275 + }
276 + return 0;
277 +}
278 +
279 +int audio_write_alsa(cst_audiodev *ad, void *samples, int num_bytes)
280 +{
281 + size_t frame_size;
282 + ssize_t num_frames, res;
283 + snd_pcm_t *pcm_handle;
284 + char *buf = (char *) samples;
285 +
286 + /* Determine frame size in bytes */
287 + frame_size = audio_bps(ad->real_fmt) * ad->real_channels;
288 + /* Require that only complete frames are handed in */
289 + assert((num_bytes % frame_size) == 0);
290 + num_frames = num_bytes / frame_size;
291 + pcm_handle = (snd_pcm_t *) ad->platform_data;
292 +
293 + while (num_frames > 0)
294 + {
295 + res = snd_pcm_writei(pcm_handle, buf, num_frames);
296 + if (res != num_frames)
297 + {
298 + if (res == -EAGAIN || (res > 0 && res < num_frames))
299 + {
300 + snd_pcm_wait(pcm_handle, 100);
301 + }
302 + else if (recover_from_error(pcm_handle, res) < 0)
303 + {
304 + return -1;
305 + }
306 + }
307 +
308 + if (res >0)
309 + {
310 + num_frames -= res;
311 + buf += res * frame_size;
312 + }
313 + }
314 + return num_bytes;
315 +}
316 +
317 +int audio_flush_alsa(cst_audiodev *ad)
318 +{
319 + int result;
320 + result = snd_pcm_drain((snd_pcm_t *) ad->platform_data);
321 + if (result < 0)
322 + {
323 + cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
324 + }
325 + /* Prepare device for more data */
326 + result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
327 +if (result < 0)
328 + {
329 + cst_errmsg("audio_flush_alsa: Error: %s.\n", snd_strerror(result));
330 + }
331 + return result;
332 +}
333 +
334 +int audio_drain_alsa(cst_audiodev *ad)
335 +{
336 + int result;
337 + result = snd_pcm_drop((snd_pcm_t *) ad->platform_data);
338 + if (result < 0)
339 + {
340 + cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
341 + }
342 +/* Prepare device for more data */
343 + result = snd_pcm_prepare((snd_pcm_t *) ad->platform_data);
344 +if (result < 0)
345 + {
346 + cst_errmsg("audio_drain_alsa: Error: %s.\n", snd_strerror(result));
347 + }
348 + return result;
349 +}
350
351
352
353 1.1 app-accessibility/flite/files/digest-flite-1.3
354
355 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/digest-flite-1.3?rev=1.1&view=markup
356 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/digest-flite-1.3?rev=1.1&content-type=text/plain
357
358 Index: digest-flite-1.3
359 ===================================================================
360 MD5 ae0aca1cb7b4801f4372f3a75a9e52b5 flite-1.3-release.tar.gz 10663835
361 RMD160 a908acfd196754783ee4665ac84ea860d54bcf80 flite-1.3-release.tar.gz 10663835
362 SHA256 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b flite-1.3-release.tar.gz 10663835
363
364
365
366 1.1 app-accessibility/flite/files/flite-1.3-shared-libs.patch
367
368 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.3-shared-libs.patch?rev=1.1&view=markup
369 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.3-shared-libs.patch?rev=1.1&content-type=text/plain
370
371 Index: flite-1.3-shared-libs.patch
372 ===================================================================
373 diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules
374 --- flite-1.3-release/config/common_make_rules 2004-12-20 00:20:43.000000000 +0200
375 +++ flite-1.3-release-mod/config/common_make_rules 2006-11-12 12:17:25.000000000 +0200
376 @@ -59,27 +59,35 @@
377 endif
378 OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
379 BINDIR=$(BUILDDIR)/bin
380 +LIBDIR=$(BUILDDIR)/lib
381 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
382 BINDIR=$(TOP)/bin
383 +LIBDIR=$(TOP)/lib
384 endif
385
386 -LIBDIR=$(BUILDDIR)/lib
387 BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
388
389 -FLITELIBS = $(BUILDDIR)/lib/libflite.a
390 -LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
391 +ifdef SHFLAGS
392 +FLITELIBS = $(LIBDIR)/libflite.so
393 +LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
394 +else
395 +FLITELIBS = $(LIBDIR)/libflite.a
396 +LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
397 +endif
398
399 FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
400 ifdef SHFLAGS
401 SOOBJS = $(OBJS:.o=.os)
402 -FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
403 +FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
404 ifdef LIBNAME
405 ALL += $(OBJDIR)/.build_so
406 endif
407 -endif
408 +else
409 ifdef LIBNAME
410 ALL += $(OBJDIR)/.build_lib
411 endif
412 +endif
413 +
414 # Only do some directories when you are not cross compiling
415 ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
416 OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
417 @@ -117,14 +125,14 @@
418 @ touch $(OBJDIR)/.build_so
419
420 # Used in the lib/ directory and in building new voices
421 -$(OBJDIR)/%.so: %.shared.a
422 +%.so: %.shared.a
423 @ echo making $@
424 @ rm -rf shared_os && mkdir shared_os
425 - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
426 + @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
427 @ (cd shared_os && ar x ../$<)
428 - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
429 - @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
430 - @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
431 + @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
432 + @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
433 + @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
434 @ rm -rf shared_os
435
436 $(OBJDIR)/.make_build_dirs:
437 diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
438 --- flite-1.3-release/lib/Makefile 1970-01-01 02:00:00.000000000 +0200
439 +++ flite-1.3-release-mod/lib/Makefile 2006-11-12 12:17:40.000000000 +0200
440 @@ -0,0 +1,73 @@
441 +###########################################################################
442 +## ##
443 +## Language Technologies Institute ##
444 +## Carnegie Mellon University ##
445 +## Copyright (c) 1999 ##
446 +## All Rights Reserved. ##
447 +## ##
448 +## Permission is hereby granted, free of charge, to use and distribute ##
449 +## this software and its documentation without restriction, including ##
450 +## without limitation the rights to use, copy, modify, merge, publish, ##
451 +## distribute, sublicense, and/or sell copies of this work, and to ##
452 +## permit persons to whom this work is furnished to do so, subject to ##
453 +## the following conditions: ##
454 +## 1. The code must retain the above copyright notice, this list of ##
455 +## conditions and the following disclaimer. ##
456 +## 2. Any modifications must be clearly marked as such. ##
457 +## 3. Original authors' names are not deleted. ##
458 +## 4. The authors' names are not used to endorse or promote products ##
459 +## derived from this software without specific prior written ##
460 +## permission. ##
461 +## ##
462 +## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ##
463 +## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
464 +## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
465 +## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ##
466 +## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
467 +## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
468 +## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
469 +## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
470 +## THIS SOFTWARE. ##
471 +## ##
472 +###########################################################################
473 +## ##
474 +## FLITE libraries ##
475 +## ##
476 +###########################################################################
477 +TOP=..
478 +DIRNAME=lib
479 +BUILD_DIRS =
480 +ALL_DIRS=
481 +FILES = Makefile
482 +LIBNAMES = flite flite_cmulex flite_usenglish \
483 + flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
484 +
485 +STATICLIBS= $(LIBNAMES:%=lib%.a)
486 +SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
487 +#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
488 +SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
489 +VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
490 + $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
491 +ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
492 +
493 +ALL = shared_libs
494 +
495 +LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
496 +
497 +include $(TOP)/config/common_make_rules
498 +
499 +ifdef SHFLAGS
500 +shared_libs: $(SHAREDLIBS)
501 +libflite_LDLIBS = -lm $(AUDIOLIBS)
502 +libflite_cmulex_LDLIBS = -lflite
503 +libflite_usenglish_LDLIBS = -lflite
504 +libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
505 +libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
506 +libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
507 +else
508 +shared_libs: nothing
509 +endif
510 +
511 +install:
512 + @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
513 +
514 diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
515 --- flite-1.3-release/main/Makefile 2005-08-08 00:38:42.000000000 +0200
516 +++ flite-1.3-release-mod/main/Makefile 2006-11-12 11:44:46.000000000 +0200
517 @@ -50,11 +50,11 @@
518
519 flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
520 flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
521 -flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
522 +flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
523
524 flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
525 flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
526 -flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
527 +flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
528
529 include $(TOP)/config/common_make_rules
530
531 diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile
532 --- flite-1.3-release/Makefile 2005-11-01 15:40:45.000000000 +0200
533 +++ flite-1.3-release-mod/Makefile 2006-11-12 11:44:46.000000000 +0200
534 @@ -41,7 +41,7 @@
535 ###########################################################################
536 TOP=.
537 DIRNAME=
538 -BUILD_DIRS = include src lang doc
539 +BUILD_DIRS = include src lang lib doc
540 ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
541 CONFIG=configure configure.in config.sub config.guess \
542 missing install-sh mkinstalldirs
543
544
545
546 --
547 gentoo-commits@l.g.o mailing list