- Fix the realtime compat patch so it can detect the realtime kernel better

epel8
Orcan Ogetbil 14 years ago
parent 6eabaff591
commit afc7226267

@ -4,7 +4,7 @@
Summary: The Jack Audio Connection Kit Summary: The Jack Audio Connection Kit
Name: jack-audio-connection-kit Name: jack-audio-connection-kit
Version: 1.9.6 Version: 1.9.6
Release: 1%{?dist} Release: 2%{?dist}
# The entire source (~500 files) is a mixture of these three licenses # The entire source (~500 files) is a mixture of these three licenses
License: GPLv2 and GPLv2+ and LGPLv2+ License: GPLv2 and GPLv2+ and LGPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
@ -221,6 +221,9 @@ exit 0
%changelog %changelog
* Fri Nov 12 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.6-2
- Fix the realtime compat patch so it can detect the realtime kernel better
* Sat Nov 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.6-1 * Sat Nov 06 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.6-1
- update to 1.9.6 - update to 1.9.6
- update README.Fedora file with more recent information - update README.Fedora file with more recent information

@ -1,6 +1,6 @@
diff -rupN jack-1.9.5.old/common/JackControlAPI.cpp jack-1.9.5/common/JackControlAPI.cpp diff -rupN jack-1.9.6.old/common/JackControlAPI.cpp jack-1.9.6/common/JackControlAPI.cpp
--- jack-1.9.5.old/common/JackControlAPI.cpp 2010-02-12 05:57:47.000000000 -0500 --- jack-1.9.6.old/common/JackControlAPI.cpp 2010-08-30 06:23:53.000000000 -0400
+++ jack-1.9.5/common/JackControlAPI.cpp 2010-07-20 00:42:55.000000000 -0400 +++ jack-1.9.6/common/JackControlAPI.cpp 2010-11-11 03:02:30.000000000 -0500
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
@ -17,16 +17,16 @@ diff -rupN jack-1.9.5.old/common/JackControlAPI.cpp jack-1.9.5/common/JackContro
+ struct utsname utsname; + struct utsname utsname;
+ int success; + int success;
+ success = uname( &utsname ); + success = uname( &utsname );
+ if( success == 0 && strstr( utsname.version, "ccrma" ) ) + if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
+ value.i = 60; + value.i = 60;
+ else + else
+ value.i = 20; + value.i = 20;
if (jackctl_add_parameter( if (jackctl_add_parameter(
&server_ptr->parameters, &server_ptr->parameters,
"realtime-priority", "realtime-priority",
diff -rupN jack-1.9.5.old/common/JackServerGlobals.cpp jack-1.9.5/common/JackServerGlobals.cpp diff -rupN jack-1.9.6.old/common/JackServerGlobals.cpp jack-1.9.6/common/JackServerGlobals.cpp
--- jack-1.9.5.old/common/JackServerGlobals.cpp 2010-02-12 05:57:47.000000000 -0500 --- jack-1.9.6.old/common/JackServerGlobals.cpp 2010-08-30 06:23:53.000000000 -0400
+++ jack-1.9.5/common/JackServerGlobals.cpp 2010-07-20 00:40:43.000000000 -0400 +++ jack-1.9.6/common/JackServerGlobals.cpp 2010-11-11 03:02:50.000000000 -0500
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg @@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
#include "shm.h" #include "shm.h"
#include <getopt.h> #include <getopt.h>
@ -47,7 +47,7 @@ diff -rupN jack-1.9.5.old/common/JackServerGlobals.cpp jack-1.9.5/common/JackSer
int client_timeout = 0; /* msecs; if zero, use period size. */ int client_timeout = 0; /* msecs; if zero, use period size. */
- int realtime_priority = 10; - int realtime_priority = 10;
+ int realtime_priority; + int realtime_priority;
+ if( success == 0 && strstr( utsname.version, "ccrma" ) ) + if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
+ realtime_priority = 60; + realtime_priority = 60;
+ else + else
+ realtime_priority = 20; + realtime_priority = 20;

Loading…
Cancel
Save