diff options
| author | asau <asau@pkgsrc.org> | 2013-12-16 19:00:03 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2013-12-16 19:00:03 +0000 |
| commit | 84c9b73088e9af4e05e80ea4648ead73cdeec00b (patch) | |
| tree | 0fb370538f032094b20f5e4c7853ce1102f87f12 /audio/pulseaudio | |
| parent | a8eb05c0fe3e042943b35d6116b16d8d2ffe47eb (diff) | |
| download | pkgsrc-84c9b73088e9af4e05e80ea4648ead73cdeec00b.tar.gz | |
Use "cpuset_t" on FreeBSD, this lets the package build.
Diffstat (limited to 'audio/pulseaudio')
| -rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
| -rw-r--r-- | audio/pulseaudio/patches/patch-src_tests_once-test.c | 28 | ||||
| -rw-r--r-- | audio/pulseaudio/patches/patch-src_tests_rtstutter.c | 28 |
3 files changed, 59 insertions, 1 deletions
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 58969cda97f..9024438c126 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2013/11/30 12:34:52 wiz Exp $ +$NetBSD: distinfo,v 1.40 2013/12/16 19:00:03 asau Exp $ SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485 @@ -10,3 +10,5 @@ SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78 SHA1 (patch-src_pulsecore_semaphore-osx.c) = f9b1962a700932434e05471b2d4df4a5ff5c1b00 SHA1 (patch-src_pulsecore_svolume__mmx.c) = a3af18563fd11e3813d7a474ff8807ee9bf62390 SHA1 (patch-src_pulsecore_svolume__sse.c) = 6d2406ad0889219bae96f52f9b525da9b19b9af9 +SHA1 (patch-src_tests_once-test.c) = ba0ca03e9f1cbc47e7985497397d03e7406420c6 +SHA1 (patch-src_tests_rtstutter.c) = e6d1627cb8a150cc5a106bb98ed31147ce8689d2 diff --git a/audio/pulseaudio/patches/patch-src_tests_once-test.c b/audio/pulseaudio/patches/patch-src_tests_once-test.c new file mode 100644 index 00000000000..9d9b2c9422d --- /dev/null +++ b/audio/pulseaudio/patches/patch-src_tests_once-test.c @@ -0,0 +1,28 @@ +$NetBSD: patch-src_tests_once-test.c,v 1.1 2013/12/16 19:00:03 asau Exp $ + +--- src/tests/once-test.c.orig 2012-07-03 12:47:50.000000000 +0000 ++++ src/tests/once-test.c 2013-09-26 00:26:09.760505519 +0000 +@@ -25,6 +25,11 @@ + #include <pthread.h> + #endif + ++#if defined(__FreeBSD__) ++#include <sys/param.h> ++#include <sys/cpuset.h> ++#endif ++ + #include <pulsecore/thread.h> + #include <pulsecore/once.h> + #include <pulsecore/log.h> +@@ -54,7 +59,11 @@ + + #ifdef HAVE_PTHREAD_SETAFFINITY_NP + static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0); ++#if defined(__FreeBSD__) ++ cpuset_t mask; ++#else + cpu_set_t mask; ++#endif + + CPU_ZERO(&mask); + CPU_SET((size_t) (pa_atomic_inc(&i_cpu) % n_cpu), &mask); diff --git a/audio/pulseaudio/patches/patch-src_tests_rtstutter.c b/audio/pulseaudio/patches/patch-src_tests_rtstutter.c new file mode 100644 index 00000000000..ee7d1cd23d8 --- /dev/null +++ b/audio/pulseaudio/patches/patch-src_tests_rtstutter.c @@ -0,0 +1,28 @@ +$NetBSD: patch-src_tests_rtstutter.c,v 1.1 2013/12/16 19:00:03 asau Exp $ + +--- src/tests/rtstutter.c.orig 2011-09-26 15:51:42.000000000 +0000 ++++ src/tests/rtstutter.c 2013-09-26 00:28:11.949504937 +0000 +@@ -32,6 +32,11 @@ + #include <pthread.h> + #endif + ++#if defined(__FreeBSD__) ++#include <sys/param.h> ++#include <sys/cpuset.h> ++#endif ++ + #include <pulse/util.h> + #include <pulse/timeval.h> + #include <pulse/gccmacro.h> +@@ -54,7 +59,11 @@ + + #ifdef HAVE_PTHREAD_SETAFFINITY_NP + { ++#if defined(__FreeBSD__) ++ cpuset_t mask; ++#else + cpu_set_t mask; ++#endif + + CPU_ZERO(&mask); + CPU_SET((size_t) PA_PTR_TO_UINT(p), &mask); |