Compile via -DJACK_32_64 RHBZ#803865

- Adjust rtprio limit to 70. Adjust jack default priority to 60. RHBZ#795094
epel8
Orcan Ogetbil 13 years ago
parent 6f32490dcc
commit 3ccc2fda51

@ -1,6 +1,6 @@
# Default limits for users of jack-audio-connection-kit # Default limits for users of jack-audio-connection-kit
@@groupname@ - rtprio 20 @@groupname@ - rtprio 70
@@groupname@ - memlock 4194304 @@groupname@ - memlock 4194304
@@pagroup@ - rtprio 20 @@pagroup@ - rtprio 20

@ -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.8 Version: 1.9.8
Release: 6%{?dist} Release: 7%{?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
@ -22,6 +22,7 @@ Patch2: jack-apidoc-only.patch
# Enable ffado buffersize change at runtime. From upstream trunk # Enable ffado buffersize change at runtime. From upstream trunk
# https://github.com/jackaudio/jack2/commit/96e025123 # https://github.com/jackaudio/jack2/commit/96e025123
Patch3: jack-ffado-buffersize.patch Patch3: jack-ffado-buffersize.patch
# Adjust default priority. RHBZ#795094
Patch4: jack-realtime-compat.patch Patch4: jack-realtime-compat.patch
# Fix jack-connect segfault when invoked with no arguments. From upstream trunk # Fix jack-connect segfault when invoked with no arguments. From upstream trunk
# https://github.com/jackaudio/jack2/commit/00280570a # https://github.com/jackaudio/jack2/commit/00280570a
@ -96,7 +97,7 @@ pushd jack-%{version}
%patch1 -p1 -b .outdir %patch1 -p1 -b .outdir
%patch2 -p1 -b .nointernalapi %patch2 -p1 -b .nointernalapi
%patch3 -p1 -b .ffadobuffer %patch3 -p1 -b .ffadobuffer
%patch4 -p1 %patch4 -p1 -b .priority
%patch5 -p1 -b .connectcrash %patch5 -p1 -b .connectcrash
%patch6 -p1 -b .mpd %patch6 -p1 -b .mpd
%patch7 -p1 -b .uc_regs %patch7 -p1 -b .uc_regs
@ -113,7 +114,7 @@ popd
%build %build
pushd jack-%{version} pushd jack-%{version}
export CPPFLAGS="$RPM_OPT_FLAGS" export CPPFLAGS="$RPM_OPT_FLAGS -DJACK_32_64"
export PREFIX=%{_prefix} export PREFIX=%{_prefix}
# Parallel build disabled as it fails sometimes # Parallel build disabled as it fails sometimes
./waf configure \ ./waf configure \
@ -261,6 +262,10 @@ exit 0
%changelog %changelog
* Sat Apr 07 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.8-7
- Compile via -DJACK_32_64 RHBZ#803865
- Adjust rtprio limit to 70. Adjust jack default priority to 60. RHBZ#795094
* Sun Mar 25 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.8-6 * Sun Mar 25 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.8-6
- Rename limits file from 99-jack.conf to 95-jack.conf RHBZ#795094 - Rename limits file from 99-jack.conf to 95-jack.conf RHBZ#795094
- Increase maximum number of ports and clients RHBZ#803871 - Increase maximum number of ports and clients RHBZ#803871

@ -1,56 +1,24 @@
diff -rupN jack-1.9.6.old/common/JackControlAPI.cpp jack-1.9.6/common/JackControlAPI.cpp diff -rupN jack-1.9.8.old/common/JackControlAPI.cpp jack-1.9.8/common/JackControlAPI.cpp
--- jack-1.9.6.old/common/JackControlAPI.cpp 2010-08-30 06:23:53.000000000 -0400 --- jack-1.9.8.old/common/JackControlAPI.cpp 2011-12-19 06:54:02.000000000 -0500
+++ jack-1.9.6/common/JackControlAPI.cpp 2010-11-11 03:02:30.000000000 -0500 +++ jack-1.9.8/common/JackControlAPI.cpp 2012-04-07 15:04:06.882823048 -0400
@@ -32,6 +32,7 @@ @@ -678,7 +678,7 @@ SERVER_EXPORT jackctl_server_t * jackctl
#include <stdio.h>
#include <assert.h>
#include <signal.h>
+#include <sys/utsname.h>
#include "jslist.h"
#include "driver_interface.h"
@@ -675,7 +676,13 @@ EXPORT jackctl_server_t * jackctl_server
goto fail_free_parameters; goto fail_free_parameters;
} }
- value.i = 10; - value.i = 10;
+ struct utsname utsname; + value.i = 60;
+ int success;
+ success = uname( &utsname );
+ if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
+ value.i = 60;
+ else
+ 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.6.old/common/JackServerGlobals.cpp jack-1.9.6/common/JackServerGlobals.cpp diff -rupN jack-1.9.8.old/common/JackServerGlobals.cpp jack-1.9.8/common/JackServerGlobals.cpp
--- jack-1.9.6.old/common/JackServerGlobals.cpp 2010-08-30 06:23:53.000000000 -0400 --- jack-1.9.8.old/common/JackServerGlobals.cpp 2011-12-19 06:54:02.000000000 -0500
+++ jack-1.9.6/common/JackServerGlobals.cpp 2010-11-11 03:02:50.000000000 -0500 +++ jack-1.9.8/common/JackServerGlobals.cpp 2012-04-07 15:05:11.841498738 -0400
@@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg @@ -98,7 +98,7 @@ bool JackServerGlobals::Init()
#include "shm.h"
#include <getopt.h>
#include <errno.h>
+#include <sys/utsname.h>
static char* server_name = NULL;
@@ -67,9 +68,17 @@ void JackServerGlobals::Delete()
bool JackServerGlobals::Init()
{ {
+ struct utsname utsname;
+ int success;
+ success = uname( &utsname );
+
int realtime = 0; int realtime = 0;
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 = 60;
+ if( success == 0 && strstr( utsname.version, "PREEMPT RT" ) )
+ realtime_priority = 60;
+ else
+ realtime_priority = 20;
int verbose_aux = 0; int verbose_aux = 0;
int do_mlock = 1; int do_mlock = 1;
unsigned int port_max = 128; unsigned int port_max = 128;

Loading…
Cancel
Save