diff options
author | Tilman Keskinoz <arved@FreeBSD.org> | 2004-03-09 20:27:51 +0000 |
---|---|---|
committer | Tilman Keskinoz <arved@FreeBSD.org> | 2004-03-09 20:27:51 +0000 |
commit | 02602525de8960f31f6c919c67923b6957cdb443 (patch) | |
tree | 752381bdcbf64bb56e515595198544eb93570f7e /audio/jack/files | |
parent | o) fix annoying message when killall didn't find any lost slaves (diff) |
Add JACK an audio server
Requested by: epilogue@allstream.net
Notes
Notes:
svn path=/head/; revision=103465
Diffstat (limited to 'audio/jack/files')
-rw-r--r-- | audio/jack/files/patch-client.c | 57 | ||||
-rw-r--r-- | audio/jack/files/patch-driver.c | 31 | ||||
-rw-r--r-- | audio/jack/files/patch-engine.c | 25 | ||||
-rw-r--r-- | audio/jack/files/patch-jack.h | 17 | ||||
-rw-r--r-- | audio/jack/files/patch-ringbuffer.c | 10 |
5 files changed, 140 insertions, 0 deletions
diff --git a/audio/jack/files/patch-client.c b/audio/jack/files/patch-client.c new file mode 100644 index 000000000000..18b68558a6f1 --- /dev/null +++ b/audio/jack/files/patch-client.c @@ -0,0 +1,57 @@ +--- libjack/client.c.orig Sun Jan 11 20:07:14 2004 ++++ libjack/client.c Tue Mar 9 20:19:15 2004 +@@ -26,20 +26,23 @@ + #else + #include <sys/poll.h> + #endif +- ++#include <sys/types.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <pthread.h> + #include <errno.h> + #include <fcntl.h> +-#include <sys/types.h> ++ + #include <sys/ipc.h> + #include <sys/mman.h> + + #include <stdarg.h> + #include <stdio.h> ++#if HAVE_STDINT_H + #include <stdint.h> ++#endif + #include <regex.h> ++#include <string.h> + + #include <config.h> + +@@ -1152,8 +1155,12 @@ + "thread (%s)", strerror (errno)); + return -1; + } +- +-#if defined(__APPLE__) && defined(__POWERPC__) ++ ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#endif ++#if defined(__APPLE__) && defined(__POWERPC__) || (__FreeBSD_version < 501000) ++ + // To be implemented + #else + if (mlockall (MCL_CURRENT | MCL_FUTURE) != 0) { +@@ -1307,8 +1314,11 @@ + * pages are actually mapped (more important for mlockall(2) + * usage in jack_start_thread()) + */ +- +-#if defined(__APPLE__) && defined(__POWERPC__) ++ ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#endif ++#if (defined(__APPLE__) && defined(__POWERPC__)) || (__FreeBSD_version < 501000) + /* a bigger stack makes the application crash... */ + #define BIG_ENOUGH_STACK 10000 + #else diff --git a/audio/jack/files/patch-driver.c b/audio/jack/files/patch-driver.c new file mode 100644 index 000000000000..15194d406eeb --- /dev/null +++ b/audio/jack/files/patch-driver.c @@ -0,0 +1,31 @@ +--- libjack/driver.c.orig Thu Dec 11 00:50:40 2003 ++++ libjack/driver.c Tue Mar 9 19:52:04 2004 +@@ -24,6 +24,7 @@ + #include <stdarg.h> + #include <stdlib.h> + #include <stdio.h> ++#include <sys/types.h> + #include <sys/mman.h> + #include <errno.h> + +@@ -105,6 +106,11 @@ + return -1; + } + ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#endif ++#if (defined(__APPLE__) && defined(__POWERPC__)) || (__FreeBSD_version < 501000) ++#else + if (mlockall (MCL_CURRENT | MCL_FUTURE) != 0) { + jack_error ("cannot lock down memory for RT thread (%s)", + strerror (errno)); +@@ -112,7 +118,7 @@ + return -1; + #endif /* ENSURE_MLOCK */ + } +- ++#endif + return 0; + } + diff --git a/audio/jack/files/patch-engine.c b/audio/jack/files/patch-engine.c new file mode 100644 index 000000000000..1c6607fed22a --- /dev/null +++ b/audio/jack/files/patch-engine.c @@ -0,0 +1,25 @@ +--- jackd/engine.c.orig Sun Jan 11 20:07:13 2004 ++++ jackd/engine.c Tue Mar 9 19:43:47 2004 +@@ -36,7 +36,9 @@ + #include <fcntl.h> + #include <stdio.h> + #include <stdarg.h> ++#ifdef HAVE_STDINT_H + #include <stdint.h> ++#endif + #include <dirent.h> + #include <sys/ipc.h> + #include <signal.h> +@@ -2119,8 +2124,10 @@ + strerror (errno)); + return -1; + } +- +-#if defined(__APPLE__) && defined(__POWERPC__) ++#ifdef __FreeBSD__ ++#include <osreldate.h> ++#endif ++#if (defined(__APPLE__) && defined(__POWERPC__)) || (__FreeBSD_version < 501000) + // To be implemented + #else + if (mlockall (MCL_CURRENT | MCL_FUTURE) != 0) { diff --git a/audio/jack/files/patch-jack.h b/audio/jack/files/patch-jack.h new file mode 100644 index 000000000000..74a2c0732793 --- /dev/null +++ b/audio/jack/files/patch-jack.h @@ -0,0 +1,17 @@ +--- jack/types.h.org Tue Mar 9 20:12:17 2004 ++++ jack/types.h Tue Mar 9 20:12:22 2004 +@@ -22,6 +22,14 @@ + #define __jack_types_h__ + + #include <inttypes.h> ++#ifndef PRIu32 ++#define PRIi32 "i" /* int32_t */ ++#define PRIu32 "u" /* uint32_t */ ++#define PRIu64 "llu" /* uint64_t */ ++#define SCNu64 "llu" /* uint64_t */ ++#define PRId32 "d" /* int32_t */ ++#define PRIx64 "llx" /* uint64_t */ ++#endif + + typedef char shm_name_t[32]; + typedef int32_t jack_shmsize_t; diff --git a/audio/jack/files/patch-ringbuffer.c b/audio/jack/files/patch-ringbuffer.c new file mode 100644 index 000000000000..7e5bf885a72f --- /dev/null +++ b/audio/jack/files/patch-ringbuffer.c @@ -0,0 +1,10 @@ +--- libjack/ringbuffer.c.orig Tue Mar 9 18:57:50 2004 ++++ libjack/ringbuffer.c Tue Mar 9 18:58:07 2004 +@@ -22,6 +22,7 @@ + + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + #include <sys/mman.h> + #include <jack/ringbuffer.h> + |