Attachment #34834 for bug #56460

View | Details | Raw Unified | Return to bug 56460
Collapse All | Expand All




# Date created:			May 9, 2002
# Whom:				ijliao
#
# $FreeBSD: ports/audio/rawrec/Makefile,v 1.9 2003/07/14 02:52:55 sf Exp $
#

PORTNAME=	rawrec
PORTVERSION=	0.9.98
PORTREVISION=	3
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SUNSITE} \
		${MASTER_SITE_SOURCEFORGE}

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (rawrec-0.9.97.tar.gz) = 67a219555cfbf0fff1eb62b1e03f3e6b	1	MD5 (rawrec-0.9.98.tar.gz) = 15a26258853cf061e9b7e5a81f147528




--- 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));
   }
 
+/* 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). */




--- 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
+*/
 
   /* Getting ugly.  Here we install a handler (which sets a global
      flag which the threads can poll in order to do graceful
+#if _POSIX_MEMLOCK == 1
     if ( mlockall(MCL_CURRENT) == -1 ) {
       fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
       perror("");

Added Link Here

(-)files/patch-sleep_on_motion.c (+11 lines)
1	--- sleep_on_option.c.orig Tue Jul 22 15:27:18 2003
2	+++ sleep_on_option.c Tue Jul 22 15:27:32 2003
3	@@ -15,7 +15,7 @@
4
5	if ( time > samples / speed ) {
6	reqst.tv_sec = (time_t) floor(time);
7	- reqst.tv_nsec = (long) nearbyint((time - floor(time)) * 1000000);
8	+ reqst.tv_nsec = (long) rint((time - floor(time)) * 1000000);
9	} else {
10	reqst.tv_sec = (time_t) floor(samples / speed);
11	reqst.tv_nsec = (long) rint((samples / speed - floor(samples / speed))

Return to bug 56460

Lines 3-14 Link Here

(-)Makefile (-3 / +2 lines)
3	# Date created: May 9, 2002	3	# Date created: May 9, 2002
4	# Whom: ijliao	4	# Whom: ijliao
5	#	5	#
6	# $FreeBSD: /repoman/r/pcvs/ports/audio/rawrec/Makefile,v 1.9 2003/07/14 02:52:55 sf Exp $	6	# $FreeBSD: ports/audio/rawrec/Makefile,v 1.9 2003/07/14 02:52:55 sf Exp $
7	#	7	#
8		8
9	PORTNAME= rawrec	9	PORTNAME= rawrec
10	PORTVERSION= 0.9.97	10	PORTVERSION= 0.9.98
11	PORTREVISION= 3
12	CATEGORIES= audio	11	CATEGORIES= audio
13	MASTER_SITES= ${MASTER_SITE_SUNSITE} \	12	MASTER_SITES= ${MASTER_SITE_SUNSITE} \
14	${MASTER_SITE_SOURCEFORGE}	13	${MASTER_SITE_SOURCEFORGE}

Lines 1-11 Link Here

(-)files/patch-play.c (-10 / +40 lines)
1	--- play.c.orig Tue Nov 5 22:11:11 2002	1	--- play.c.orig Fri Nov 29 03:33:21 2002
2	+++ play.c Tue Nov 5 22:11:38 2002	2	+++ play.c Thu Sep 4 22:13:08 2003
3	@@ -400,7 +400,7 @@	3	@@ -263,6 +263,10 @@
4	}	4	PTHREAD_CREATE_JOINABLE)) ) {
		5	err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
		6	}
		7	+
		8	+/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
		9	+ but it does not support PTHREAD_SCOPE_SYSTEM
		10	+
		11	#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
		12	&& _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
		13	&& _POSIX_THREAD_PRIORITY_SCHEDULING != 0
		14	@@ -282,6 +286,8 @@
		15	err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
		16	}
		17	#endif
		18	+*/
		19	+
		20	if ( (rtn = pthread_attr_init(&move_fd_attr)) )
		21	err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
		22	if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr,
		23	@@ -289,6 +295,9 @@
		24	err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
		25	}
5		26
6	/* Entering critical section. Lock down our memory, if possible. */	27	+/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
7	-#ifdef _POSIX_MEMLOCK	28	+ but it does not support PTHREAD_SCOPE_SYSTEM
8	+#if _POSIX_MEMLOCK == 1	29	+
9	if ( mlockall(MCL_CURRENT) == -1 ) {	30	#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
10	fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);	31	&& _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
11	perror("");	32	&& _POSIX_THREAD_PRIORITY_SCHEDULING != 0
		33	@@ -306,7 +315,7 @@
		34	err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
		35	}
		36	#endif
		37	-
		38	+*/
		39	/* Getting ugly. Here we install a handler (which sets a global
		40	flag which the threads can poll in order to do graceful
		41	death). */

Lines 1-11 Link Here

(-)files/patch-record.c (-10 / +38 lines)
1	--- record.c.orig Tue Nov 5 22:11:18 2002	1	--- record.c.orig Fri Nov 29 03:33:21 2002
2	+++ record.c Tue Nov 5 22:11:55 2002	2	+++ record.c Thu Sep 4 22:12:48 2003
3	@@ -317,7 +317,7 @@	3	@@ -185,6 +185,10 @@
4	}	4	PTHREAD_CREATE_JOINABLE)) ) {
		5	err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
		6	}
		7	+
		8	+/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
		9	+ but it does not support PTHREAD_SCOPE_SYSTEM
		10	+
		11	#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
		12	&& _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
		13	&& _POSIX_THREAD_PRIORITY_SCHEDULING != 0
		14	@@ -204,12 +208,17 @@
		15	err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
		16	}
		17	#endif
		18	+*/
		19	if ( (rtn = pthread_attr_init(&move_fd_attr)) )
		20	err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
		21	if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr,
		22	PTHREAD_CREATE_JOINABLE)) ) {
		23	err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
		24	}
		25	+
		26	+/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
		27	+ but it does not support PTHREAD_SCOPE_SYSTEM
		28	+
		29	#if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
		30	&& _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
		31	&& _POSIX_THREAD_PRIORITY_SCHEDULING != 0
		32	@@ -227,6 +236,7 @@
		33	err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
		34	}
		35	#endif
		36	+*/
5		37
6	/* Entering critical section. Lock down our memory, if possible. */	38	/* Getting ugly. Here we install a handler (which sets a global
7	-#ifdef _POSIX_MEMLOCK	39	flag which the threads can poll in order to do graceful
8	+#if _POSIX_MEMLOCK == 1
9	if ( mlockall(MCL_CURRENT) == -1 ) {
10	fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
11	perror("");