diff options
| author | drochner <drochner> | 2007-08-31 17:08:54 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-08-31 17:08:54 +0000 |
| commit | f151cb85a7a5ad8cd21ac3fb26a17fe80171e076 (patch) | |
| tree | d5a8a1d19a1cdd5d5953d87c1b9b4710c97250d0 /audio | |
| parent | 36c0121bbccff5541e552c2533caf71865e1f367 (diff) | |
| download | pkgsrc-f151cb85a7a5ad8cd21ac3fb26a17fe80171e076.tar.gz | |
restore the timeout argument to pselect() -- this is intended to work
non-blocking
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/bmpx/distinfo | 4 | ||||
| -rw-r--r-- | audio/bmpx/patches/patch-ab | 18 |
2 files changed, 6 insertions, 16 deletions
diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo index a3f64df2c7b..adb6509d1b0 100644 --- a/audio/bmpx/distinfo +++ b/audio/bmpx/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2007/08/30 15:30:30 joerg Exp $ +$NetBSD: distinfo,v 1.6 2007/08/31 17:08:54 drochner Exp $ SHA1 (bmpx-0.40.1.tar.bz2) = c2d69fd8909d1d7a69ff13eee149084da9b802f0 RMD160 (bmpx-0.40.1.tar.bz2) = 8d00392449ad4602e380c9f78cb12c4077db9eec Size (bmpx-0.40.1.tar.bz2) = 1793356 bytes SHA1 (patch-aa) = b4a761b618aa976945c6983e752389cc226b1cbb -SHA1 (patch-ab) = 120eb75ae966e59a071c3023470c9204428440e6 +SHA1 (patch-ab) = 71e24c8d18b9223a9a9895a9af18e5818886a60c SHA1 (patch-ac) = 77d88acc2c74259f293dc54699a322962f50ce57 SHA1 (patch-ad) = baaff3d28d81532d692a7594818d763552b81349 SHA1 (patch-ae) = 249f85f328d82e69b440999063a4b42be5f0614d diff --git a/audio/bmpx/patches/patch-ab b/audio/bmpx/patches/patch-ab index ae902ee963d..e3ad7ed63dd 100644 --- a/audio/bmpx/patches/patch-ab +++ b/audio/bmpx/patches/patch-ab @@ -1,21 +1,11 @@ -$NetBSD: patch-ab,v 1.3 2007/08/30 15:30:31 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2007/08/31 17:08:54 drochner Exp $ ---- jnetlib/connection.cpp.orig 2007-08-30 13:39:23.000000000 +0000 +--- jnetlib/connection.cpp.orig 2007-08-11 20:41:49.000000000 +0200 +++ jnetlib/connection.cpp -@@ -205,8 +205,6 @@ void JNL_Connection::run(int max_send_by - FD_SET(m_socket,&f[1]); - FD_SET(m_socket,&f[2]); - -- struct timespec ts; -- memset(&ts,0,sizeof(ts)); - sigset_t sigs; - sigfillset (&sigs); - sigdelset (&sigs, SIGBUS); -@@ -215,7 +213,16 @@ void JNL_Connection::run(int max_send_by +@@ -215,7 +215,16 @@ void JNL_Connection::run(int max_send_by sigdelset (&sigs, SIGSEGV); sigdelset (&sigs, SIGKILL); sigdelset (&sigs, SIGSTOP); -- if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1) +#ifdef __DragonFly__ + sigset_t cur_set; + sigprocmask(SIG_SETMASK, &sigs, &cur_set); @@ -24,7 +14,7 @@ $NetBSD: patch-ab,v 1.3 2007/08/30 15:30:31 joerg Exp $ + + if (select_retval == -1) +#else -+ if (pselect(m_socket+1,&f[0],&f[1],&f[2],NULL,&sigs)==-1) + if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1) +#endif { m_errorstr="connecting to host (calling select())"; |