[PATCH] audio/jack: don't crash with -R

[trasz]

>Submitter-Id:	current-users
>Originator:	trasz
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] audio/jack: don't crash with -R
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 6.1-RELEASE-p10 i386
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006
>Description:
Prevent 'jackd -R' from crashing at startup in dlopen(3).

Port maintainer (multimedia at FreeBSD.org) is cc'd.

This patch is orthogonal to ports/111157, i.e. i'd like both to be commited.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- jack-0.102.28.20061216_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/jack/files/patch-jackd_engine.c /home/trasz/jack/files/patch-jackd_engine.c
--- /usr/ports/audio/jack/files/patch-jackd_engine.c	Thu Dec  7 20:42:00 2006
+++ /home/trasz/jack/files/patch-jackd_engine.c	Wed Apr  4 16:42:39 2007
@@ -1,6 +1,6 @@
---- jackd/engine.c.orig	Wed Dec  6 23:40:20 2006
-+++ jackd/engine.c	Wed Dec  6 23:40:58 2006
-@@ -1444,7 +1444,7 @@
+--- jackd/engine.c.orig	Tue Mar  6 06:24:05 2007
++++ jackd/engine.c	Tue Apr  3 18:01:29 2007
+@@ -1442,7 +1442,7 @@
  				    (engine, pfd[i].fd)) {
  					jack_error ("could not handle external"
  						    " client request");
@@ -9,3 +9,13 @@
                                      /* poll is implemented using
  				       select (see the macosx/fakepoll
  				       code). When the socket is closed
+@@ -1552,7 +1552,8 @@
+ 
+ 		jack_drop_real_time_scheduling (pthread_self());
+ 
+-#ifdef USE_MLOCK
++/* Workaround to prevent 'jackd -R' from crashing at startup. */
++#if 0
+ 
+ 		if (do_mlock && (mlockall (MCL_CURRENT | MCL_FUTURE) != 0)) {
+ 			jack_error ("cannot lock down memory for jackd (%s)",
--- jack-0.102.28.20061216_1.patch ends here ---