[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-3-8-g416c970
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Sun May 2 22:18:03 UTC 2010
The following commit has been merged in the master branch:
commit 31e72467587b0af902d3a972a7286f58b69ab5d3
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Sun May 2 21:48:22 2010 +0200
Refresh VCS patch to upstream r3995.
diff --git a/debian/patches/0000_sync_upstream_VCS.patch b/debian/patches/0000_sync_upstream_VCS.patch
index d3dc64f..fe65291 100644
--- a/debian/patches/0000_sync_upstream_VCS.patch
+++ b/debian/patches/0000_sync_upstream_VCS.patch
@@ -1,10 +1,10 @@
-Description: Sync with upstream SVN trunk revision 3968
+Description: Sync with upstream SVN trunk revision 3995
From: Jonas Smedegaard <dr at jones.dk>
Forwarded: yes
-Last-Update: 2010-04-05
+Last-Update: 2010-05-02
--- a/ChangeLog
+++ b/ChangeLog
-@@ -19,194 +19,230 @@
+@@ -19,194 +19,238 @@
Florian Faber
Michael Voigt
Torben Hohn
@@ -25,13 +25,25 @@ Last-Update: 2010-04-05
+---------------------------
-2010-01-29 Gabriel M. Beddingfield <gabriel at teuton.org>
++2010-04-016 Stephane Letz <letz at grame.fr>
+
+- * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
++ * Make jack_connect/jack_disconnect wait for effective port connection/disconnection.
+
+-2009-12-15 Stephane Letz <letz at grame.fr>
++2010-04-07 Stephane Letz <letz at grame.fr>
+
+- * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
++ * Remove call to exit in library code.
+
+-2009-12-13 Stephane Letz <letz at grame.fr>
+2010-03-26 Stephane Letz <letz at grame.fr>
+
+ * ffado-portname-sync.patch from ticket #163 applied.
-
-- * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
-+2010-03-24 Stephane Letz <letz at grame.fr>
+
++2010-03-24 Stephane Letz <letz at grame.fr>
+
+- * Mario Lang alsa_io time calculation overflow patch.
+ * On Windows, now use TRE library for regexp (BSD license instead of GPL license).
+2010-03-19 Stephane Letz <letz at grame.fr>
@@ -65,16 +77,12 @@ Last-Update: 2010-04-05
+
+ * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
+
- 2009-12-15 Stephane Letz <letz at grame.fr>
-
-- * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
--
++2009-12-15 Stephane Letz <letz at grame.fr>
++
+ * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
+
- 2009-12-13 Stephane Letz <letz at grame.fr>
-
-- * Mario Lang alsa_io time calculation overflow patch.
--
++2009-12-13 Stephane Letz <letz at grame.fr>
++
+ * Mario Lang alsa_io time calculation overflow patch.
+
2009-12-10 Stephane Letz <letz at grame.fr>
@@ -338,7 +346,7 @@ Last-Update: 2010-04-05
* Fix issues in JackNetDriver::DecodeTransportData and JackNetDriver::Initialize.
2009-08-28 Stephane Letz <letz at grame.fr>
-@@ -557,7 +593,7 @@
+@@ -557,7 +601,7 @@
2008-11-21 Stephane Letz <letz at grame.fr>
* Report ringbuffer.c fixes from JACK1.
@@ -399,7 +407,36 @@ Last-Update: 2010-04-05
#define BUFFER_SIZE_MAX 8192
-@@ -88,7 +88,7 @@
+@@ -59,36 +59,12 @@
+
+ #define JACK_DEFAULT_SERVER_NAME "default"
+
+-#ifdef WIN32
+-#define jack_server_dir "server"
+-#define jack_client_dir "client"
+-#define ADDON_DIR "jack"
+-#endif
+-
+-#ifdef __APPLE__
+-#define jack_server_dir "/tmp"
+-#define jack_client_dir "/tmp"
+-#define JACK_DEFAULT_DRIVER "coreaudio"
+-#endif
+-
+-#ifdef __linux__
+-#define jack_server_dir "/dev/shm"
+-#define jack_client_dir "/dev/shm"
+-#define JACK_DEFAULT_DRIVER "alsa"
+-#endif
+-
+-#if defined(__sun__) || defined(sun)
+-#define jack_server_dir "/tmp"
+-#define jack_client_dir "/tmp"
+-#define JACK_DEFAULT_DRIVER "oss"
+-#endif
+-
+ #define jack_server_entry "jackdmp_entry"
+ #define jack_client_entry "jack_client"
#define ALL_CLIENTS -1 // for notification
@@ -1632,6 +1669,194 @@ Last-Update: 2010-04-05
);
runOnlyForDeploymentPostprocessing = 0;
};
+@@ -7966,16 +7950,17 @@
+ LIBRARY_STYLE = DYNAMIC;
+ MACH_O_TYPE = mh_dylib;
+ OTHER_CFLAGS = "";
+- OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT_API_0_7",
++ "-DHAVE_CELT",
++ "-DMACH_RPC_MACH_SEMA",
++ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackservermp,
+ "-framework",
+- CoreAudio,
+- "-framework",
+ CoreServices,
+- "-framework",
+- AudioUnit,
+ );
+ OTHER_REZFLAGS = "";
+ PREBINDING = NO;
+@@ -8016,8 +8001,13 @@
+ MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+ OTHER_CFLAGS = "";
+- OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT_API_0_7",
++ "-DHAVE_CELT",
++ "-DMACH_RPC_MACH_SEMA",
++ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackservermp,
+ "-framework",
+@@ -8053,7 +8043,11 @@
+ LIBRARY_STYLE = DYNAMIC;
+ MACH_O_TYPE = mh_dylib;
+ OTHER_CFLAGS = "";
+- OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT_API_0_7",
++ "-DHAVE_CELT",
++ "-DMACH_RPC_MACH_SEMA",
++ );
+ OTHER_LDFLAGS = (
+ "-framework",
+ Jackdmp,
+@@ -8103,17 +8097,19 @@
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = DYNAMIC;
+ MACH_O_TYPE = mh_dylib;
+- OTHER_CFLAGS = "";
+- OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
++ OTHER_CFLAGS = "-DJACK_32_64";
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DJACK_32_64",
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ "-DMACH_RPC_MACH_SEMA",
++ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackservermp,
+ "-framework",
+- CoreAudio,
+- "-framework",
+ CoreServices,
+- "-framework",
+- AudioUnit,
+ );
+ OTHER_REZFLAGS = "";
+ PREBINDING = NO;
+@@ -8153,10 +8149,13 @@
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+ OTHER_CFLAGS = "-DJACK_32_64";
+ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
+ "-DMACH_RPC_MACH_SEMA",
+ "-DJACK_32_64",
+ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackservermp,
+ "-framework",
+@@ -8232,8 +8231,17 @@
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ HEADER_SEARCH_PATHS = ../common;
+- OTHER_CFLAGS = "";
++ OTHER_CFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ );
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ "$(OTHER_CFLAGS)",
++ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackmp,
+ "-framework",
+@@ -8265,8 +8273,17 @@
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ HEADER_SEARCH_PATHS = ../common;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+- OTHER_CFLAGS = "";
++ OTHER_CFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ );
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ "$(OTHER_CFLAGS)",
++ );
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackmp,
+ "-framework",
+@@ -8296,6 +8313,11 @@
+ FRAMEWORK_SEARCH_PATHS = "";
+ HEADER_SEARCH_PATHS = ../common;
+ OTHER_CFLAGS = "";
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ "$(OTHER_CFLAGS)",
++ );
+ OTHER_LDFLAGS = (
+ "-framework",
+ Jackmp,
+@@ -8327,8 +8349,13 @@
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ HEADER_SEARCH_PATHS = ../common;
+- OTHER_CFLAGS = "";
++ OTHER_CFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ );
++ OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackmp,
+ "-framework",
+@@ -8358,8 +8385,13 @@
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ HEADER_SEARCH_PATHS = ../common;
+ MACOSX_DEPLOYMENT_TARGET = 10.4;
+- OTHER_CFLAGS = "";
++ OTHER_CFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ );
++ OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+ OTHER_LDFLAGS = (
++ libcelt.a,
+ "-framework",
+ Jackmp,
+ "-framework",
+@@ -8388,7 +8420,15 @@
+ );
+ FRAMEWORK_SEARCH_PATHS = "";
+ HEADER_SEARCH_PATHS = ../common;
+- OTHER_CFLAGS = "";
++ OTHER_CFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ );
++ OTHER_CPLUSPLUSFLAGS = (
++ "-DHAVE_CELT",
++ "-DHAVE_CELT_API_0_7",
++ "$(OTHER_CFLAGS)",
++ );
+ OTHER_LDFLAGS = (
+ "-framework",
+ Jackmp,
--- a/macosx/coreaudio/JackCoreAudioAdapter.cpp
+++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp
@@ -545,10 +545,23 @@
@@ -2045,7 +2270,7 @@ Last-Update: 2010-04-05
#define __JackNetWinSocket__
--- a/windows/JackPlatformPlug_os.h
+++ b/windows/JackPlatformPlug_os.h
-@@ -1,21 +1,22 @@
+@@ -1,25 +1,30 @@
/*
-Copyright (C) 2004-2008 Grame
+ Copyright (C) 2004-2008 Grame
@@ -2084,6 +2309,14 @@ Last-Update: 2010-04-05
#ifndef __JackPlatformPlug_WIN32__
#define __JackPlatformPlug_WIN32__
+
++#define jack_server_dir "server"
++#define jack_client_dir "client"
++#define ADDON_DIR "jack"
++
+ namespace Jack
+ {
+ struct JackRequest;
--- a/windows/JackShmMem_os.h
+++ b/windows/JackShmMem_os.h
@@ -1,28 +1,28 @@
@@ -9182,3 +9415,404 @@ Last-Update: 2010-04-05
if Options.options.dbus:
conf.sub_config('dbus')
if conf.env['BUILD_JACKDBUS'] != True:
+--- a/common/JackDriverLoader.cpp
++++ b/common/JackDriverLoader.cpp
+@@ -152,7 +152,7 @@
+
+ fprintf (stderr, "Options for driver '%s':\n", desc->name);
+ jack_print_driver_options (desc, stderr);
+- exit (1);
++ return 1;
+ }
+
+ for (param_index = 0; param_index < desc->nparams; param_index++) {
+--- a/common/jack/jack.h
++++ b/common/jack/jack.h
+@@ -732,7 +732,7 @@
+ * @return a null-terminated array of full port names to which the @a
+ * port is connected. If none, returns NULL.
+ *
+- * The caller is responsible for calling free(3) on any non-NULL
++ * The caller is responsible for calling jack_free(3) on any non-NULL
+ * returned value.
+ *
+ * @param port locally owned jack_port_t pointer.
+@@ -745,7 +745,7 @@
+ * @return a null-terminated array of full port names to which the @a
+ * port is connected. If none, returns NULL.
+ *
+- * The caller is responsible for calling free(3) on any non-NULL
++ * The caller is responsible for calling jack_free(3) on any non-NULL
+ * returned value.
+ *
+ * This differs from jack_port_get_connections() in two important
+@@ -996,7 +996,7 @@
+ * If zero, no selection based on flags will be carried out.
+ *
+ * @return a NULL-terminated array of ports that match the specified
+- * arguments. The caller is responsible for calling free(3) any
++ * arguments. The caller is responsible for calling jack_free(3) any
+ * non-NULL returned value.
+ *
+ * @see jack_port_name_size(), jack_port_type_size()
+--- a/dbus/sigsegv.c
++++ b/dbus/sigsegv.c
+@@ -99,7 +99,13 @@
+ jack_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
+ jack_error("info.si_addr = %p", info->si_addr);
+ for(i = 0; i < NGREG; i++)
+- jack_error("reg[%02d] = 0x" REGFORMAT, i, ucontext->uc_mcontext.gregs[i]);
++ jack_error("reg[%02d] = 0x" REGFORMAT, i,
++#if defined(__powerpc__)
++ ucontext->uc_mcontext.uc_regs[i]
++#else
++ ucontext->uc_mcontext.gregs[i]
++#endif
++ );
+
+ #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
+ # if defined(SIGSEGV_STACK_IA64)
+--- a/example-clients/connect.c
++++ b/example-clients/connect.c
+@@ -1,6 +1,6 @@
+ /*
+ Copyright (C) 2002 Jeremy Hall
+-
++
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+@@ -29,9 +29,16 @@
+ jack_port_t *input_port;
+ jack_port_t *output_port;
+ int connecting, disconnecting;
++int done = 0;
+ #define TRUE 1
+ #define FALSE 0
+
++
++void port_connect_callback(jack_port_id_t a, jack_port_id_t b, int connect, void* arg)
++{
++ done = 1;
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -43,7 +50,7 @@
+ } else {
+ my_name ++;
+ }
+-
++
+ printf("name %s\n", my_name);
+
+ if (strstr(my_name, "jack_disconnect")) {
+@@ -70,7 +77,9 @@
+ return 1;
+ }
+
+- /* display the current sample rate. once the client is activated
++ jack_set_port_connect_callback(client, port_connect_callback, NULL);
++
++ /* display the current sample rate. once the client is activated
+ (see below), you should rely on your own sample rate
+ callback (see above) for this value.
+ */
+@@ -85,7 +94,7 @@
+ fprintf (stderr, "ERROR %s not a valid port\n", argv[2]);
+ goto error;
+ }
+-
++
+ /* tell the JACK server that we are ready to roll */
+
+ if (jack_activate (client)) {
+@@ -109,12 +118,22 @@
+ goto error;
+ }
+ }
++
++ // Wait for connection/disconnection to be effective
++ while(!done) {
++ #ifdef WIN32
++ Sleep(10);
++ #else
++ usleep(10000);
++ #endif
++ }
++
+ jack_deactivate (client);
+ jack_client_close (client);
+ return 0;
+-
++
+ error:
+- if (client)
++ if (client)
+ jack_client_close (client);
+ return 1;
+ }
+--- a/example-clients/netsource.c
++++ b/example-clients/netsource.c
+@@ -503,11 +503,12 @@
+ if (hostinfo == NULL) {
+ fprintf (stderr, "init_sockaddr_in: unknown host: %s.\n", hostname);
+ fflush( stderr );
++ return;
+ }
+ #ifdef WIN32
+- name->sin_addr.s_addr = inet_addr( hostname );
++ name->sin_addr.s_addr = inet_addr( hostname );
+ #else
+- name->sin_addr = *(struct in_addr *) hostinfo->h_addr ;
++ name->sin_addr = *(struct in_addr *) hostinfo->h_addr ;
+ #endif
+ }
+ else
+@@ -622,15 +623,15 @@
+ case 'b':
+ bitdepth = atoi (optarg);
+ break;
+- case 'c':
+-#if HAVE_CELT
+- bitdepth = 1000;
++ case 'c':
++ #if HAVE_CELT
++ bitdepth = 1000;
+ factor = atoi (optarg);
+-#else
++ #else
+ printf( "not built with celt supprt\n" );
+ exit(10);
+-#endif
+- break;
++ #endif
++ break;
+ case 'm':
+ mtu = atoi (optarg);
+ break;
+@@ -677,18 +678,17 @@
+ }
+
+ init_sockaddr_in ((struct sockaddr_in *) &destaddr, peer_ip, peer_port);
+- if(bind_port) {
++ if (bind_port) {
+ init_sockaddr_in ((struct sockaddr_in *) &bindaddr, NULL, bind_port);
+ if( bind (outsockfd, &bindaddr, sizeof (bindaddr)) ) {
+- fprintf (stderr, "bind failure\n" );
+- }
++ fprintf (stderr, "bind failure\n" );
++ }
+ }
+- if(reply_port)
+- {
++ if (reply_port) {
+ init_sockaddr_in ((struct sockaddr_in *) &bindaddr, NULL, reply_port);
+ if( bind (insockfd, &bindaddr, sizeof (bindaddr)) ) {
+- fprintf (stderr, "bind failure\n" );
+- }
++ fprintf (stderr, "bind failure\n" );
++ }
+ }
+
+ /* try to become a client of the JACK server */
+--- a/example-clients/wscript
++++ b/example-clients/wscript
+@@ -57,7 +57,7 @@
+
+ conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
+
+- conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.is_defined('HAVE_SAMPLERATE')
++ conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.is_defined('HAVE_SAMPLERATE') and conf.is_defined('HAVE_ALSA')
+
+ def build(bld):
+ if bld.env['IS_LINUX']:
+--- a/linux/alsa/JackAlsaDriver.cpp
++++ b/linux/alsa/JackAlsaDriver.cpp
+@@ -260,7 +260,7 @@
+ return 0;
+ }
+
+-void
++int
+ JackAlsaDriver::alsa_driver_setup_io_function_pointers (alsa_driver_t *driver)
+ {
+ if (driver->playback_handle) {
+@@ -340,7 +340,7 @@
+ default:
+ jack_error ("impossible sample width (%d) discovered!",
+ driver->playback_sample_bytes);
+- exit (1);
++ return -1;
+ }
+ }
+ }
+@@ -364,6 +364,8 @@
+ break;
+ }
+ }
++
++ return 0;
+ }
+
+ int
+@@ -779,7 +781,7 @@
+ default:
+ jack_error ("programming error: unhandled format "
+ "type for playback");
+- exit (1);
++ return -1;
+ }
+ }
+
+@@ -797,7 +799,7 @@
+ default:
+ jack_error ("programming error: unhandled format "
+ "type for capture");
+- exit (1);
++ return -1;
+ }
+ }
+
+@@ -836,7 +838,8 @@
+ driver->user_nchannels = driver->playback_nchannels;
+ }
+
+- alsa_driver_setup_io_function_pointers (driver);
++ if (alsa_driver_setup_io_function_pointers (driver) != 0)
++ return -1;
+
+ /* Allocate and initialize structures that rely on the
+ channels counts.
+--- a/linux/alsa/JackAlsaDriver.h
++++ b/linux/alsa/JackAlsaDriver.h
+@@ -53,7 +53,7 @@
+ int alsa_driver_generic_hardware(alsa_driver_t *driver);
+ int alsa_driver_hw_specific(alsa_driver_t *driver, int hw_monitoring,
+ int hw_metering);
+- void alsa_driver_setup_io_function_pointers (alsa_driver_t *driver);
++ int alsa_driver_setup_io_function_pointers (alsa_driver_t *driver);
+ int alsa_driver_configure_stream(alsa_driver_t *driver, char *device_name,
+ const char *stream_name,
+ snd_pcm_t *handle,
+--- a/linux/JackAtomic_os.h
++++ b/linux/JackAtomic_os.h
+@@ -42,9 +42,9 @@
+ "1: \n"
+ " li %0, 0 \n"
+ "2: \n"
+- : "=r" (result)
+- : "r" (addr), "r" (value), "r" (newvalue), "r" (tmp)
+- );
++ : "=r" (result)
++ : "r" (addr), "r" (value), "r" (newvalue), "r" (tmp)
++ );
+ return result;
+ }
+
+@@ -61,12 +61,21 @@
+ "# CAS \n\t"
+ LOCK "cmpxchg %2, (%1) \n\t"
+ "sete %0 \n\t"
+- : "=a" (ret)
+- : "c" (addr), "d" (newvalue), "a" (value)
+- );
++ : "=a" (ret)
++ : "c" (addr), "d" (newvalue), "a" (value)
++ );
+ return ret;
+ }
+
++#else
++
++#warning using builtin gcc (version > 4.1) atomic
++
++static inline char CAS(volatile uint32_t value, uint32_t newvalue, volatile int32_t* addr)
++{
++ return __sync_bool_compare_and_swap (addr, value, newvalue);
++}
++
+ #endif
+
+ #endif
+--- a/linux/JackPlatformPlug_os.h
++++ b/linux/JackPlatformPlug_os.h
+@@ -20,6 +20,10 @@
+ #ifndef __JackPlatformPlug_linux__
+ #define __JackPlatformPlug_linux__
+
++#define jack_server_dir "/dev/shm"
++#define jack_client_dir "/dev/shm"
++#define JACK_DEFAULT_DRIVER "alsa"
++
+ namespace Jack
+ {
+ struct JackRequest;
+--- a/macosx/JackAtomic_os.h
++++ b/macosx/JackAtomic_os.h
+@@ -41,10 +41,10 @@
+ "1: \n"
+ " li %0, 0 \n"
+ "2: \n"
+- : "=r" (result)
+- : "r" (addr), "r" (value), "r" (newvalue)
+- : "r0"
+- );
++ : "=r" (result)
++ : "r" (addr), "r" (value), "r" (newvalue)
++ : "r0"
++ );
+ return result;
+ }
+
+@@ -61,9 +61,9 @@
+ "# CAS \n\t"
+ LOCK "cmpxchg %2, (%1) \n\t"
+ "sete %0 \n\t"
+- : "=a" (ret)
+- : "c" (addr), "d" (newvalue), "a" (value)
+- );
++ : "=a" (ret)
++ : "c" (addr), "d" (newvalue), "a" (value)
++ );
+ return ret;
+ }
+
+--- a/macosx/JackPlatformPlug_os.h
++++ b/macosx/JackPlatformPlug_os.h
+@@ -20,6 +20,10 @@
+ #ifndef __JackPlatformPlug_APPLE__
+ #define __JackPlatformPlug_APPLE__
+
++#define jack_server_dir "/tmp"
++#define jack_client_dir "/tmp"
++#define JACK_DEFAULT_DRIVER "coreaudio"
++
+ namespace Jack
+ {
+ class JackPosixMutex;
+--- a/posix/JackFifo.cpp
++++ b/posix/JackFifo.cpp
+@@ -20,7 +20,7 @@
+ #include "JackFifo.h"
+ #include "JackTools.h"
+ #include "JackError.h"
+-#include "JackConstants.h"
++#include "JackPlatformPlug.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- a/solaris/JackPlatformPlug_os.h
++++ b/solaris/JackPlatformPlug_os.h
+@@ -20,6 +20,10 @@
+ #ifndef __JackPlatformPlug_sun__
+ #define __JackPlatformPlug_sun__
+
++#define jack_server_dir "/tmp"
++#define jack_client_dir "/tmp"
++#define JACK_DEFAULT_DRIVER "oss"
++
+ namespace Jack
+ {
+ struct JackRequest;
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list