[SCM] Audacity debian packaging branch, master, updated. debian/1.3.10-2-5-g6b5f7de
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Tue Jan 19 21:23:32 UTC 2010
The following commit has been merged in the master branch:
commit 8371f88e45ba5d1e5b8869253c9f8ddf2788db08
Author: Benjamin Drung <bdrung at gmail.com>
Date: Tue Jan 19 16:35:28 2010 +0100
Drop hurd.patch (accepted upstream).
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index bb0b992..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Fix missing NOFILE on GNU/Hurd
-Author: Benjamin Drung <bdrung at ubuntu.com>
-
---- audacity-1.3.10.orig/lib-src/libnyquist/nyquist/cmt/userio.c
-+++ audacity-1.3.10/lib-src/libnyquist/nyquist/cmt/userio.c
-@@ -70,6 +70,7 @@ ascii_input = poll for char + CR->EOL co
- */
-
- #include "switches.h"
-+#include <sys/resource.h>
-
- #include <stdio.h>
- #include <string.h>
-@@ -1205,6 +1206,7 @@ public int wait_ascii()
- #endif /* !UNIX_MACH */
- #endif
- char c;
-+ struct rlimit file_limit;
-
- if (abort_flag == ABORT_LEVEL) return ABORT_CHAR;
- if (abort_flag == BREAK_LEVEL) return BREAK_CHAR;
-@@ -1233,7 +1235,8 @@ public int wait_ascii()
- FD_ZERO(&readfds);
- FD_SET(IOinputfd, &readfds);
- gflush();
-- select(NOFILE+1, &readfds, 0, 0, NULL);
-+ getrlimit(RLIMIT_NOFILE, &file_limit);
-+ select(file_limit.rlim_max+1, &readfds, 0, 0, NULL);
- #endif /* !UNIX_MACH */
- #endif /* ifdef UNIX */
- }
---- audacity-1.3.10.orig/lib-src/libnyquist/nyquist/cmt/midifns.c
-+++ audacity-1.3.10/lib-src/libnyquist/nyquist/cmt/midifns.c
-@@ -22,6 +22,7 @@
- *****************************************************************************/
-
- #include "switches.h"
-+#include <sys/resource.h>
-
- #ifdef UNIX
- #include <sys/param.h>
-@@ -376,6 +377,7 @@ void eventwait(timeout)
- struct timeval unix_timeout;
- struct timeval *waitspec = NULL;
- fd_set readfds;
-+ struct rlimit file_limit;
-
- FD_ZERO(&readfds);
- FD_SET(MI_CONNECTION(midiconn), &readfds);
-@@ -387,7 +389,8 @@ void eventwait(timeout)
- unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
- waitspec = &unix_timeout;
- }
-- select(NOFILE+1, &readfds, 0, 0, waitspec);
-+ getrlimit(RLIMIT_NOFILE, &file_limit);
-+ select(file_limit.rlim_max+1, &readfds, 0, 0, waitspec);
- return;
- }
- #else /* !UNIX_ITC */
-@@ -424,6 +427,7 @@ void eventwait(timeout)
- {
- struct timeval unix_timeout;
- struct timeval *waitspec = NULL;
-+ struct rlimit file_limit;
-
- if (timeout >= 0) {
- timeout -= gettime(); /* convert to millisecond delay */
-@@ -431,7 +435,8 @@ void eventwait(timeout)
- /* remainder become microsecs: */
- unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
- waitspec = &unix_timeout;
-- select(NOFILE+1, 0, 0, 0, waitspec);
-+ getrlimit(RLIMIT_NOFILE, &file_limit);
-+ select(file_limit.rlim_max+1, 0, 0, 0, waitspec);
- } else {
- int c = getc(stdin);
- ungetc(c, stdin);
-@@ -445,6 +450,7 @@ void eventwait(timeout)
- struct timeval unix_timeout;
- struct timeval *waitspec = NULL;
- int readfds = 1 << IOinputfd;
-+ struct rlimit file_limit;
-
- if (timeout >= 0) {
- timeout -= gettime(); /* convert to millisecond delay */
-@@ -453,7 +459,8 @@ void eventwait(timeout)
- unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
- waitspec = &unix_timeout;
- }
-- select(NOFILE+1, &readfds, 0, 0, waitspec);
-+ getrlimit(RLIMIT_NOFILE, &file_limit);
-+ select(file_limit.rlim_max+1, &readfds, 0, 0, waitspec);
- return;
- }
- #endif /* BUFFERED_SYNCHRONOUS_INPUT */
diff --git a/debian/patches/series b/debian/patches/series
index d1ab70a..f45722c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ disk-full-on-export.patch
export-multiple.patch
lang.patch
switch-hostapi-crash.patch
-hurd.patch
diff --git a/lib-src/libnyquist/nyquist/cmt/midifns.c b/lib-src/libnyquist/nyquist/cmt/midifns.c
index f925ecd..f1dba20 100644
--- a/lib-src/libnyquist/nyquist/cmt/midifns.c
+++ b/lib-src/libnyquist/nyquist/cmt/midifns.c
@@ -22,7 +22,6 @@
*****************************************************************************/
#include "switches.h"
-#include <sys/resource.h>
#ifdef UNIX
#include <sys/param.h>
@@ -377,7 +376,6 @@ void eventwait(timeout)
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
fd_set readfds;
- struct rlimit file_limit;
FD_ZERO(&readfds);
FD_SET(MI_CONNECTION(midiconn), &readfds);
@@ -389,8 +387,7 @@ void eventwait(timeout)
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = &unix_timeout;
}
- getrlimit(RLIMIT_NOFILE, &file_limit);
- select(file_limit.rlim_max+1, &readfds, 0, 0, waitspec);
+ select(NOFILE+1, &readfds, 0, 0, waitspec);
return;
}
#else /* !UNIX_ITC */
@@ -427,7 +424,6 @@ void eventwait(timeout)
{
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
- struct rlimit file_limit;
if (timeout >= 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -435,8 +431,7 @@ void eventwait(timeout)
/* remainder become microsecs: */
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = &unix_timeout;
- getrlimit(RLIMIT_NOFILE, &file_limit);
- select(file_limit.rlim_max+1, 0, 0, 0, waitspec);
+ select(NOFILE+1, 0, 0, 0, waitspec);
} else {
int c = getc(stdin);
ungetc(c, stdin);
@@ -450,7 +445,6 @@ void eventwait(timeout)
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
int readfds = 1 << IOinputfd;
- struct rlimit file_limit;
if (timeout >= 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -459,8 +453,7 @@ void eventwait(timeout)
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = &unix_timeout;
}
- getrlimit(RLIMIT_NOFILE, &file_limit);
- select(file_limit.rlim_max+1, &readfds, 0, 0, waitspec);
+ select(NOFILE+1, &readfds, 0, 0, waitspec);
return;
}
#endif /* BUFFERED_SYNCHRONOUS_INPUT */
diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c
index 04c46e3..a06ff77 100644
--- a/lib-src/libnyquist/nyquist/cmt/userio.c
+++ b/lib-src/libnyquist/nyquist/cmt/userio.c
@@ -70,7 +70,6 @@ ascii_input = poll for char + CR->EOL conversion
*/
#include "switches.h"
-#include <sys/resource.h>
#include <stdio.h>
#include <string.h>
@@ -1206,7 +1205,6 @@ public int wait_ascii()
#endif /* !UNIX_MACH */
#endif
char c;
- struct rlimit file_limit;
if (abort_flag == ABORT_LEVEL) return ABORT_CHAR;
if (abort_flag == BREAK_LEVEL) return BREAK_CHAR;
@@ -1235,8 +1233,7 @@ public int wait_ascii()
FD_ZERO(&readfds);
FD_SET(IOinputfd, &readfds);
gflush();
- getrlimit(RLIMIT_NOFILE, &file_limit);
- select(file_limit.rlim_max+1, &readfds, 0, 0, NULL);
+ select(NOFILE+1, &readfds, 0, 0, NULL);
#endif /* !UNIX_MACH */
#endif /* ifdef UNIX */
}
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list