Attachment 34834 Details for Bug 56460 – file.diff

[patch] file.diff

file.diff (text/plain), 5.13 KB, created by Simon Barner on 2003-09-04 22:10:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Barner

Created: 2003-09-04 22:10:16 UTC

Size: 5.13 KB

patch

obsolete

>--- Makefile.orig	Thu Sep  4 22:43:27 2003
>+++ Makefile	Thu Sep  4 21:09:13 2003
>@@ -3,12 +3,11 @@
> # Date created:			May 9, 2002
> # Whom:				ijliao
> #
>-# $FreeBSD: /repoman/r/pcvs/ports/audio/rawrec/Makefile,v 1.9 2003/07/14 02:52:55 sf Exp $
>+# $FreeBSD: ports/audio/rawrec/Makefile,v 1.9 2003/07/14 02:52:55 sf Exp $
> #
> 
> PORTNAME=	rawrec
>-PORTVERSION=	0.9.97
>-PORTREVISION=	3
>+PORTVERSION=	0.9.98
> CATEGORIES=	audio
> MASTER_SITES=	${MASTER_SITE_SUNSITE} \
> 		${MASTER_SITE_SOURCEFORGE}
>--- distinfo.orig	Thu May  9 18:04:23 2002
>+++ distinfo	Thu Sep  4 21:08:44 2003
>@@ -1 +1 @@
>-MD5 (rawrec-0.9.97.tar.gz) = 67a219555cfbf0fff1eb62b1e03f3e6b
>+MD5 (rawrec-0.9.98.tar.gz) = 15a26258853cf061e9b7e5a81f147528
>--- files/patch-play.c.orig	Thu Sep  4 22:45:26 2003
>+++ files/patch-play.c	Thu Sep  4 22:13:12 2003
>@@ -1,11 +1,41 @@
>---- play.c.orig	Tue Nov  5 22:11:11 2002
>-+++ play.c	Tue Nov  5 22:11:38 2002
>-@@ -400,7 +400,7 @@
>-     }
>+--- play.c.orig	Fri Nov 29 03:33:21 2002
>++++ play.c	Thu Sep  4 22:13:08 2003
>+@@ -263,6 +263,10 @@
>+ 					  PTHREAD_CREATE_JOINABLE)) ) {
>+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
>+   }
>++
>++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
>++   but it does not support PTHREAD_SCOPE_SYSTEM
>++ 
>+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
>+@@ -282,6 +286,8 @@
>+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
>+   }
>+ #endif
>++*/
>++    
>+   if ( (rtn = pthread_attr_init(&move_fd_attr)) )
>+     err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
>+   if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr, 
>+@@ -289,6 +295,9 @@
>+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
>+   }
>  
>-     /* Entering critical section.  Lock down our memory, if possible.  */
>--#ifdef _POSIX_MEMLOCK
>-+#if _POSIX_MEMLOCK == 1
>-     if ( mlockall(MCL_CURRENT) == -1 ) {
>-       fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
>-       perror("");
>++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
>++   but it does not support PTHREAD_SCOPE_SYSTEM
>++ 
>+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
>+@@ -306,7 +315,7 @@
>+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
>+   }
>+ #endif
>+-
>++*/
>+   /* Getting ugly.  Here we install a handler (which sets a global
>+      flag which the threads can poll in order to do graceful
>+      death). */
>--- files/patch-record.c.orig	Thu Sep  4 22:45:44 2003
>+++ files/patch-record.c	Thu Sep  4 22:13:09 2003
>@@ -1,11 +1,39 @@
>---- record.c.orig	Tue Nov  5 22:11:18 2002
>-+++ record.c	Tue Nov  5 22:11:55 2002
>-@@ -317,7 +317,7 @@
>-     }
>+--- record.c.orig	Fri Nov 29 03:33:21 2002
>++++ record.c	Thu Sep  4 22:12:48 2003
>+@@ -185,6 +185,10 @@
>+ 					  PTHREAD_CREATE_JOINABLE)) ) {
>+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
>+   }
>++
>++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
>++   but it does not support PTHREAD_SCOPE_SYSTEM
>++
>+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
>+@@ -204,12 +208,17 @@
>+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
>+   }
>+ #endif
>++*/    
>+   if ( (rtn = pthread_attr_init(&move_fd_attr)) )
>+     err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
>+   if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr, 
>+ 					  PTHREAD_CREATE_JOINABLE)) ) {
>+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
>+   }
>++
>++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
>++   but it does not support PTHREAD_SCOPE_SYSTEM
>++
>+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
>+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
>+@@ -227,6 +236,7 @@
>+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
>+   }
>+ #endif
>++*/
>  
>-     /* Entering critical section.  Lock down our memory, if possible.  */
>--#ifdef _POSIX_MEMLOCK
>-+#if _POSIX_MEMLOCK == 1
>-     if ( mlockall(MCL_CURRENT) == -1 ) {
>-       fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
>-       perror("");
>+   /* Getting ugly.  Here we install a handler (which sets a global
>+      flag which the threads can poll in order to do graceful
>--- /dev/null	Thu Sep  4 22:45:58 2003
>+++ files/patch-sleep_on_motion.c	Tue Jul 22 15:27:52 2003
>@@ -0,0 +1,11 @@
>+--- sleep_on_option.c.orig	Tue Jul 22 15:27:18 2003
>++++ sleep_on_option.c	Tue Jul 22 15:27:32 2003
>+@@ -15,7 +15,7 @@
>+ 
>+     if ( time > samples / speed ) {
>+       reqst.tv_sec = (time_t) floor(time);
>+-      reqst.tv_nsec = (long) nearbyint((time - floor(time)) * 1000000);      
>++      reqst.tv_nsec = (long) rint((time - floor(time)) * 1000000);      
>+     } else {
>+       reqst.tv_sec = (time_t) floor(samples / speed);
>+       reqst.tv_nsec = (long) rint((samples / speed - floor(samples / speed))

Actions: View | Diff

Attachments on bug 56460: 34834