pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/espeak Fix pthread linkage. Define timespeccmp i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/78c5002ffd3d
branches: trunk
changeset: 531684:78c5002ffd3d
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Aug 04 12:52:56 2007 +0000
description:
Fix pthread linkage. Define timespeccmp if necessary.
diffstat:
audio/espeak/Makefile | 3 ++-
audio/espeak/distinfo | 8 ++++----
audio/espeak/patches/patch-aa | 19 ++++++++++++++++---
audio/espeak/patches/patch-ab | 19 ++++++++++++++++---
audio/espeak/patches/patch-ac | 8 ++++----
5 files changed, 42 insertions(+), 15 deletions(-)
diffs (114 lines):
diff -r e102cba12321 -r 78c5002ffd3d audio/espeak/Makefile
--- a/audio/espeak/Makefile Sat Aug 04 12:33:45 2007 +0000
+++ b/audio/espeak/Makefile Sat Aug 04 12:52:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/07/19 21:29:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/04 12:52:56 joerg Exp $
#
DISTNAME= espeak-1.28-source
@@ -27,4 +27,5 @@
${CP} -r ${WRKDIR}/espeak-1.28-source/espeak-data ${PREFIX}/share
.include "../../audio/portaudio/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e102cba12321 -r 78c5002ffd3d audio/espeak/distinfo
--- a/audio/espeak/distinfo Sat Aug 04 12:33:45 2007 +0000
+++ b/audio/espeak/distinfo Sat Aug 04 12:52:56 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/08/04 12:52:57 joerg Exp $
SHA1 (espeak-1.28-source.zip) = e2c017c821ee93b28a70de1027591bb999365622
RMD160 (espeak-1.28-source.zip) = e48f57daca3710326b0918c3adf6cc444830c7fc
Size (espeak-1.28-source.zip) = 1054248 bytes
-SHA1 (patch-aa) = 8e67be9cb1f82a66132196b8dcab16c996b6914d
-SHA1 (patch-ab) = b4eb69f17a4bf8b3f64624fec283126e970dd781
-SHA1 (patch-ac) = 19607eb203f8af5172ca92ec95a4fd394ff20b44
+SHA1 (patch-aa) = a01dccb651c0160a7af5af14f3292578c8396ae0
+SHA1 (patch-ab) = 37e434f3c3e2fb722f927da4ca83a2b814c28879
+SHA1 (patch-ac) = 7fec475aa7a6d77d8cb641e51c02e1cd1d96e545
diff -r e102cba12321 -r 78c5002ffd3d audio/espeak/patches/patch-aa
--- a/audio/espeak/patches/patch-aa Sat Aug 04 12:33:45 2007 +0000
+++ b/audio/espeak/patches/patch-aa Sat Aug 04 12:52:56 2007 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2007/08/04 12:52:57 joerg Exp $
---- event.cpp.orig 2007-07-17 14:24:45.000000000 +0200
+--- event.cpp.orig 2007-07-16 17:54:23.000000000 +0000
+++ event.cpp
-@@ -398,10 +398,14 @@ ENTER("sleep_until_timeout_or_stop_reque
+@@ -40,6 +40,12 @@
+ //>
+ //<decls and function prototypes
+
++#ifndef timespeccmp
++#define timespeccmp(tvp, uvp, cmp) \
++ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
++ ((tvp)->tv_nsec cmp (uvp)->tv_nsec) : \
++ ((tvp)->tv_sec cmp (uvp)->tv_sec))
++#endif
+
+ // my_mutex: protects my_thread_is_talking,
+ static pthread_mutex_t my_mutex;
+@@ -398,10 +404,14 @@ ENTER("sleep_until_timeout_or_stop_reque
to.tv_sec, to.tv_nsec,
ts.tv_sec, ts.tv_nsec);
diff -r e102cba12321 -r 78c5002ffd3d audio/espeak/patches/patch-ab
--- a/audio/espeak/patches/patch-ab Sat Aug 04 12:33:45 2007 +0000
+++ b/audio/espeak/patches/patch-ab Sat Aug 04 12:52:56 2007 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2007/08/04 12:52:57 joerg Exp $
---- fifo.cpp.orig 2007-07-17 14:50:26.000000000 +0200
+--- fifo.cpp.orig 2007-07-16 17:54:23.000000000 +0000
+++ fifo.cpp
-@@ -306,10 +306,14 @@ int sleep_until_start_request_or_inactiv
+@@ -39,6 +39,12 @@
+ #include "wave.h"
+ #include "debug.h"
+
++#ifndef timespeccmp
++#define timespeccmp(tvp, uvp, cmp) \
++ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
++ ((tvp)->tv_nsec cmp (uvp)->tv_nsec) : \
++ ((tvp)->tv_sec cmp (uvp)->tv_sec))
++#endif
+
+ //>
+ //<decls and function prototypes
+@@ -306,10 +312,14 @@ int sleep_until_start_request_or_inactiv
to.tv_sec, to.tv_nsec,
ts.tv_sec, ts.tv_nsec);
diff -r e102cba12321 -r 78c5002ffd3d audio/espeak/patches/patch-ac
--- a/audio/espeak/patches/patch-ac Sat Aug 04 12:33:45 2007 +0000
+++ b/audio/espeak/patches/patch-ac Sat Aug 04 12:52:56 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/07/17 19:18:44 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/04 12:52:57 joerg Exp $
---- Makefile.orig 2007-06-08 12:21:45.000000000 +0200
+--- Makefile.orig 2007-07-16 17:52:51.000000000 +0000
+++ Makefile
@@ -1,7 +1,7 @@
BINDIR=/usr/bin
@@ -20,12 +20,12 @@
SRCS1=$(speak_SOURCES)
OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
-LIBS1=-lstdc++ -lportaudio -lpthread
-+LIBS1=-lstdc++ $(LPATH) -lportaudio -lpthread
++LIBS1=-lstdc++ $(LPATH) -lportaudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
SRCS2=$(libespeak_SOURCES)
OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
-LIBS2=-lstdc++ -lportaudio -lpthread
-+LIBS2=-lstdc++ $(LPATH) -lportaudio -lpthread
++LIBS2=-lstdc++ $(LPATH) -lportaudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
SRCS3 = espeak.cpp
OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
Home |
Main Index |
Thread Index |
Old Index