rpms
/
jack-audio-connection-kit
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.9.7

Browse Source
epel8
Orcan Ogetbil 14 years ago
parent 7dfaca28f5
commit a64fdde9b3
15 changed files with 67 additions and 5047 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -1,2 +1,3 @@
jack-1.9.5.tar.bz2
/jack-1.9.6.tar.bz2
/jack-1.9.7.tar.bz2

21
jack-1.9.6-celt011.patch
Unescape View File

@ -1,21 +0,0 @@
diff -Nur jack-1.9.6-orig/common/JackNetOneDriver.cpp jack-1.9.6/common/JackNetOneDriver.cpp
--- jack-1.9.6-orig/common/JackNetOneDriver.cpp 2010-08-30 12:23:53.000000000 +0200
+++ jack-1.9.6/common/JackNetOneDriver.cpp 2011-02-19 23:55:14.000000000 +0100
@@ -161,7 +161,7 @@
#if HAVE_CELT_API_0_7
celt_int32 lookahead;
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
- netj.capture_srcs = jack_slist_append(netj.capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) );
+ netj.capture_srcs = jack_slist_append(netj.capture_srcs, celt_decoder_create_custom( celt_mode, 1, NULL ) );
#else
celt_int32_t lookahead;
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL );
@@ -209,7 +209,7 @@
#if HAVE_CELT
#if HAVE_CELT_API_0_7
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, netj.period_size, NULL );
- netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) );
+ netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) );
#else
CELTMode *celt_mode = celt_mode_create( netj.sample_rate, 1, netj.period_size, NULL );
netj.playback_srcs = jack_slist_append(netj.playback_srcs, celt_encoder_create( celt_mode ) );

11
jack-DSO-linking.patch
Unescape View File

@ -1,11 +0,0 @@
--- jack-1.9.5/wscript~ 2010-02-12 05:58:08.000000000 -0500
+++ jack-1.9.5/wscript 2010-05-18 14:14:27.000000000 -0400
@@ -230,6 +230,8 @@
print Logs.colors.NORMAL,
print
+ conf.env.append_unique('LINKFLAGS', '-lm -lstdc++')
+
if Options.options.mixed == True:
env_variant2 = conf.env.copy()
conf.set_env_name('lib32', env_variant2)

273
jack-audio-connection-kit-1.9.5-64bit.patch
Unescape View File

@ -1,273 +0,0 @@
diff -up jack-1.9.5/common/JackAPI.cpp.s390x jack-1.9.5/common/JackAPI.cpp
--- jack-1.9.5/common/JackAPI.cpp.s390x 2010-08-28 15:34:33.000000000 +0200
+++ jack-1.9.5/common/JackAPI.cpp 2010-08-28 15:35:59.000000000 +0200
@@ -317,7 +317,7 @@ EXPORT void* jack_port_get_buffer(jack_p
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_get_buffer");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -337,7 +337,7 @@ EXPORT const char* jack_port_name(const
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_name");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -357,7 +357,7 @@ EXPORT const char* jack_port_short_name(
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_short_name");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -377,7 +377,7 @@ EXPORT int jack_port_flags(const jack_po
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_flags");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -397,7 +397,7 @@ EXPORT const char* jack_port_type(const
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_type");
#endif
- #if defined(__x86_64__) || defined(__ppc64__)
+ #if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -417,7 +417,7 @@ EXPORT jack_port_type_id_t jack_port_typ
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_type_id");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -437,7 +437,7 @@ EXPORT int jack_port_connected(const jac
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_connected");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -458,7 +458,7 @@ EXPORT int jack_port_connected_to(const
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_connected_to");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -488,7 +488,7 @@ EXPORT int jack_port_tie(jack_port_t* sr
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_tie");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t src_aux = (uint64_t)src;
#else
uint32_t src_aux = (uint32_t)src;
@@ -498,7 +498,7 @@ EXPORT int jack_port_tie(jack_port_t* sr
jack_error("jack_port_tie called with a NULL src port");
return -1;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t dst_aux = (uint64_t)dst;
#else
uint32_t dst_aux = (uint32_t)dst;
@@ -522,7 +522,7 @@ EXPORT int jack_port_untie(jack_port_t*
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_untie");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -542,7 +542,7 @@ EXPORT jack_nframes_t jack_port_get_late
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_get_latency");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -563,7 +563,7 @@ EXPORT void jack_port_set_latency(jack_p
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_set_latency");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -585,7 +585,7 @@ EXPORT int jack_recompute_total_latency(
#endif
JackClient* client = (JackClient*)ext_client;
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -630,7 +630,7 @@ EXPORT int jack_port_set_name(jack_port_
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_set_name");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -660,7 +660,7 @@ EXPORT int jack_port_set_alias(jack_port
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_set_alias");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -683,7 +683,7 @@ EXPORT int jack_port_unset_alias(jack_po
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_unset_alias");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -706,7 +706,7 @@ EXPORT int jack_port_get_aliases(const j
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_get_aliases");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -726,7 +726,7 @@ EXPORT int jack_port_request_monitor(jac
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_request_monitor");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -769,7 +769,7 @@ EXPORT int jack_port_ensure_monitor(jack
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_ensure_monitor");
#endif
- #if defined(__x86_64__) || defined(__ppc64__)
+ #if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -789,7 +789,7 @@ EXPORT int jack_port_monitoring_input(ja
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_monitoring_input");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1128,7 +1128,7 @@ EXPORT jack_port_t* jack_port_register(j
jack_error("jack_port_register called with a NULL port name or a NULL port_type");
return NULL;
} else {
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
return (jack_port_t *)((uint64_t)client->PortRegister(port_name, port_type, flags, buffer_size));
#else
return (jack_port_t *)client->PortRegister(port_name, port_type, flags, buffer_size);
@@ -1146,7 +1146,7 @@ EXPORT int jack_port_unregister(jack_cli
jack_error("jack_port_unregister called with a NULL client");
return -1;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1169,7 +1169,7 @@ EXPORT int jack_port_is_mine(const jack_
jack_error("jack_port_is_mine called with a NULL client");
return -1;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1187,7 +1187,7 @@ EXPORT const char** jack_port_get_connec
#ifdef __CLIENTDEBUG__
JackGlobals::CheckContext("jack_port_get_connections");
#endif
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1215,7 +1215,7 @@ EXPORT const char** jack_port_get_all_co
return NULL;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1242,7 +1242,7 @@ EXPORT jack_nframes_t jack_port_get_tota
return 0;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)port;
#else
uint32_t port_aux = (uint32_t)port;
@@ -1307,7 +1307,7 @@ EXPORT int jack_port_disconnect(jack_cli
jack_error("jack_port_disconnect called with a NULL client");
return -1;
}
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
uint64_t port_aux = (uint64_t)src;
#else
uint32_t port_aux = (uint32_t)src;
@@ -1383,7 +1383,7 @@ EXPORT jack_port_t* jack_port_by_name(ja
if (!manager)
return NULL;
int res = manager->GetPort(portname); // returns a port index at least > 1
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
return (res == NO_PORT) ? NULL : (jack_port_t*)((uint64_t)res);
#else
return (res == NO_PORT) ? NULL : (jack_port_t*)res;
@@ -1397,7 +1397,7 @@ EXPORT jack_port_t* jack_port_by_id(jack
JackGlobals::CheckContext("jack_port_by_id");
#endif
/* jack_port_t* type is actually the port index */
-#if defined(__x86_64__) || defined(__ppc64__)
+#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__)
return (jack_port_t*)((uint64_t)id);
#else
return (jack_port_t*)id;

37
jack-audio-connection-kit-1.9.5-atomic.patch
Unescape View File

@ -1,37 +0,0 @@
diff -up jack-1.9.5/linux/JackAtomic_os.h.atomic jack-1.9.5/linux/JackAtomic_os.h
--- jack-1.9.5/linux/JackAtomic_os.h.atomic 2010-08-28 15:23:58.000000000 +0200
+++ jack-1.9.5/linux/JackAtomic_os.h 2010-09-01 09:29:03.000000000 +0200
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suit
#include "JackTypes.h"
-#ifdef __PPC__
+#if defined(__PPC__)
static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
{
@@ -48,9 +48,7 @@ static inline int CAS(register UInt32 va
return result;
}
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
+#elif defined(__i386__) || defined(__x86_64__)
#define LOCK "lock ; "
@@ -67,6 +65,13 @@ static inline char CAS(volatile UInt32 v
return ret;
}
+#else
+
+static inline int CAS(register UInt32 value, register UInt32 newvalue, register volatile void* addr)
+{
+ return __sync_val_compare_and_swap((UInt32 *)addr, value, newvalue);
+}
+
#endif
#endif

55
jack-audio-connection-kit-1.9.5-cycles.patch
Unescape View File

@ -1,55 +0,0 @@
diff -up jack-1.9.5/linux/cycles.h.cycles jack-1.9.5/linux/cycles.h
--- jack-1.9.5/linux/cycles.h.cycles 2010-08-28 16:03:40.000000000 +0200
+++ jack-1.9.5/linux/cycles.h 2010-08-28 16:05:47.000000000 +0200
@@ -39,7 +39,7 @@
#ifdef __linux__
-#ifdef __x86_64__
+#if defined(__x86_64__)
typedef unsigned long cycles_t;
extern cycles_t cacheflush_time;
@@ -51,9 +51,7 @@ static inline unsigned long get_cycles(v
return (((unsigned long)hi)<<32) | ((unsigned long)lo);
}
-#endif
-
-#ifdef __PPC__
+#elif defined(__PPC__)
/* PowerPC */
@@ -82,9 +80,7 @@ static inline cycles_t get_cycles(void)
return ret;
}
-#endif
-
-#ifdef __i386__
+#elif defined(__i386__)
typedef unsigned long long cycles_t;
@@ -101,8 +97,19 @@ static inline cycles_t get_cycles (void)
return ret;
}
-#endif
+#else
+
+/* fallback solution */
+typedef unsigned long cycles_t;
+
+static inline cycles_t get_cycles (void)
+{
+ return 0;
+}
+
#endif
+#endif /* __linux__ */
+
#endif /* __jack_cycles_h__ */

2
jack-audio-connection-kit-README.Fedora
Unescape View File

@ -7,6 +7,7 @@ Install the required packages:
Add yourself to the jackuser group.
usermod -a -G jackuser "<your username>"
Now you will need to log out and log back in, or simply restart the system.
Start the jack daemon (your parameters may be different):
jackd -R -P4 -dalsa -r44100 -p512 -n4 -D -Chw:0 -Phw:0
@ -16,6 +17,7 @@ if you have it installed and configured.
INTEGRATE JACK WITH PULSEAUDIO
*** Note that this section is outdated ***
The original text is placed at:
http://www.harald-hoyer.de/linux/pulseaudio-and-jackd

22
jack-audio-connection-kit-no_date_footer.patch
Unescape View File

@ -1,18 +1,18 @@
diff -rupN jack-1.9.5.old/doxyfile jack-1.9.5/doxyfile
--- jack-1.9.5.old/doxyfile 2010-02-12 05:57:30.000000000 -0500
+++ jack-1.9.5/doxyfile 2010-07-19 23:18:57.000000000 -0400
@@ -413,7 +413,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile
--- jack-1.9.7.old/doxyfile 2011-03-30 11:03:54.000000000 -0400
+++ jack-1.9.7/doxyfile 2011-04-02 23:03:35.000000000 -0400
@@ -800,7 +800,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
-HTML_FOOTER =
+HTML_FOOTER = no_date_footer.html
# The HTML_STYLESHEET tag can be used to specify a user defined cascading
# style sheet that is used by each HTML page. It can be used to
diff -rupN jack-1.9.5.old/no_date_footer.html jack-1.9.5/no_date_footer.html
--- jack-1.9.5.old/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.5/no_date_footer.html 2010-07-19 23:19:19.000000000 -0400
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to
diff -rupN jack-1.9.7.old/no_date_footer.html jack-1.9.7/no_date_footer.html
--- jack-1.9.7.old/no_date_footer.html 1969-12-31 19:00:00.000000000 -0500
+++ jack-1.9.7/no_date_footer.html 2011-04-02 22:53:49.000000000 -0400
@@ -0,0 +1,6 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by <a href="http://www.doxygen.org/

56
jack-audio-connection-kit.spec
Unescape View File

@ -3,8 +3,8 @@
Summary: The Jack Audio Connection Kit
Name: jack-audio-connection-kit
Version: 1.9.6
Release: 6%{?dist}
Version: 1.9.7
Release: 1%{?dist}
# The entire source (~500 files) is a mixture of these three licenses
License: GPLv2 and GPLv2+ and LGPLv2+
Group: System Environment/Daemons
@ -15,14 +15,11 @@ Source2: %{name}-script.pa
Source3: %{name}-limits.conf
# No-date-footer hack to remove dates from doxygen documentation
Patch0: jack-audio-connection-kit-no_date_footer.patch
# Enables renaming of the jack ports based on a configuration file
# Under discussion upstream. We need it for CCRMA compatibility
Patch1: jack-infrastructure.patch
# Build fix
Patch1: jack-doxygen-output-dir-fix.patch
# Compilation fix
Patch3: jack-freebob-buildfix.patch
Patch4: jack-realtime-compat.patch
# Compile against celt-0.8.0
Patch5: jack-celt08.patch
# compile with CELT 0.11 API
Patch6: jack-1.9.6-celt011.patch
# uc_regs no longer available on ppc64
Patch7: jack-audio-connection-kit-ppc-uc_regs.patch
@ -47,17 +44,16 @@ Requires(pre): shadow-utils
Requires: pam
%description
JACK is a low-latency audio server, written primarily for the Linux
operating system. It can connect a number of different applications to
an audio device, as well as allowing them to share audio between
themselves. Its clients can run in their own processes (i.e. as a
normal application), or can they can run within a JACK server (i.e. a
"plugin").
JACK is different from other audio server efforts in that it has been
designed from the ground up to be suitable for professional audio
work. This means that it focuses on two key areas: synchronous
execution of all clients, and low latency operation.
JACK is a low-latency audio server, written primarily for the Linux operating
system. It can connect a number of different applications to an audio device, as
well as allowing them to share audio between themselves. Its clients can run in
their own processes (i.e. as a normal application), or can they can run within a
JACK server (i.e. a "plugin").
JACK is different from other audio server efforts in that it has been designed
from the ground up to be suitable for professional audio work. This means that
it focuses on two key areas: synchronous execution of all clients, and low
latency operation.
%package devel
Summary: Header files for Jack
@ -79,14 +75,9 @@ Small example clients that use the Jack Audio Connection Kit.
%prep
%setup -q -n jack-%{version}
%patch0 -p1 -b .nodate
%patch1 -p1 -b .infra
%patch1 -p1 -b .outdir
%patch3 -p1 -b .compilationfix
%patch4 -p1
%if 0%{?fedora} > 13
%patch5 -p1 -b .celt08
%endif
%if 0%{?fedora} > 14
%patch6 -p1 -b .celt11
%endif
%patch7 -p1 -b .uc_regs
# Fix encoding issues
@ -112,6 +103,7 @@ export PREFIX=%{_prefix}
%endif
--alsa
./waf build %{?_smp_mflags} -v
%install
@ -165,8 +157,10 @@ exit 0
%exclude %{_bindir}/jack_control
%{_bindir}/jack_cpu
%{_bindir}/jack_cpu_load
%{_bindir}/jack_delay
%{_bindir}/jack_iodelay
%{_bindir}/jack_midi_dump
%{_bindir}/jack_server_control
%{_bindir}/jack_session_notify
%{_bindir}/jack_test
%{_bindir}/jack_thru
%{_bindir}/jack_zombie
@ -177,6 +171,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
%{_mandir}/man1/alsa_*.1*
%{_mandir}/man1/jack_freewheel*.1*
%{_mandir}/man1/jack_iodelay.1*
%{_mandir}/man1/jack_load*.1*
%{_mandir}/man1/jack_unload*.1*
%{_mandir}/man1/jackd*.1*
@ -208,8 +203,10 @@ exit 0
%{_bindir}/jack_showtime
%{_bindir}/jack_transport
%{_bindir}/jack_wait
%{_bindir}/jack_latent_client
%{_bindir}/jack_monitor_client
%{_bindir}/jack_simple_client
%{_bindir}/jack_simple_session_client
%{_bindir}/jack_midiseq
%{_bindir}/jack_midisine
%{_bindir}/jack_multiple_metro
@ -229,6 +226,9 @@ exit 0
%changelog
* Sun Apr 03 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.9.7-1
- update to 1.9.7
* Fri Mar 11 2011 Karsten Hopp <karsten@redhat.com> 1.9.6-6
- powerpc64 doesn't have uc_regs anymore

30
jack-celt08.patch
Unescape View File

@ -1,30 +0,0 @@
diff -rupN jack-1.9.5.old/common/JackNetOneDriver.cpp jack-1.9.5/common/JackNetOneDriver.cpp
--- jack-1.9.5.old/common/JackNetOneDriver.cpp 2010-02-12 05:57:48.000000000 -0500
+++ jack-1.9.5/common/JackNetOneDriver.cpp 2010-07-20 01:26:44.000000000 -0400
@@ -709,9 +709,9 @@ JackNetOneDriver::render_payload_to_jack
CELTDecoder *decoder = (CELTDecoder *)src_node->data;
if( !packet_payload )
- celt_decode_float( decoder, NULL, net_period_down, buf );
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
else
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
src_node = jack_slist_next (src_node);
}
diff -rupN jack-1.9.5.old/common/netjack_packet.c jack-1.9.5/common/netjack_packet.c
--- jack-1.9.5.old/common/netjack_packet.c 2010-02-12 05:57:47.000000000 -0500
+++ jack-1.9.5/common/netjack_packet.c 2010-07-20 01:12:42.000000000 -0400
@@ -1428,9 +1428,9 @@ render_payload_to_jack_ports_celt (void
CELTDecoder *decoder = src_node->data;
if( !packet_payload )
- celt_decode_float( decoder, NULL, net_period_down, buf );
+ celt_decode_float( decoder, NULL, net_period_down, buf, NULL );
else
- celt_decode_float( decoder, packet_bufX, net_period_down, buf );
+ celt_decode_float( decoder, packet_bufX, net_period_down, buf, NULL );
src_node = jack_slist_next (src_node);
}

12
jack-doxygen-output-dir-fix.patch
Unescape View File

@ -0,0 +1,12 @@
diff -rupN jack-1.9.7.old/doxyfile jack-1.9.7/doxyfile
--- jack-1.9.7.old/doxyfile 2011-03-30 11:03:54.000000000 -0400
+++ jack-1.9.7/doxyfile 2011-04-03 08:54:03.000000000 -0400
@@ -38,7 +38,7 @@ PROJECT_NUMBER = 1.9.7
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY = build/default/
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output

12
jack-freebob-buildfix.patch
Unescape View File

@ -0,0 +1,12 @@
diff -rupN jack-1.9.7.old/linux/freebob/JackFreebobDriver.cpp jack-1.9.7/linux/freebob/JackFreebobDriver.cpp
--- jack-1.9.7.old/linux/freebob/JackFreebobDriver.cpp 2011-03-30 11:04:28.000000000 -0400
+++ jack-1.9.7/linux/freebob/JackFreebobDriver.cpp 2011-04-03 09:56:03.000000000 -0400
@@ -768,7 +768,7 @@ int JackFreebobDriver::Attach()
}
port = fGraphManager->GetPort(port_index);
// Add one buffer more latency if "async" mode is used...
- range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency);
+ range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency;
port->SetLatencyRange(JackPlaybackLatency, &range);
fPlaybackPortList[i] = port_index;
jack_log("JackFreebobDriver::Attach fPlaybackPortList[i] %ld ", port_index);

3365
jack-infrastructure.patch
View File

File diff suppressed because it is too large Load Diff

1215
jack-manpages.patch
View File

File diff suppressed because it is too large Load Diff

2
sources
Unescape View File

@ -1 +1 @@
fcd4bdb44f51d71c9e19bc1d0e887902 jack-1.9.6.tar.bz2
9759670feecbd43eeccf1c0f743ec199 jack-1.9.7.tar.bz2

Write Preview
Loading…
Cancel
Save