diff options
author | ryoon <ryoon@pkgsrc.org> | 2012-11-03 01:54:55 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2012-11-03 01:54:55 +0000 |
commit | 7c6e92414c269b2f4eb940410be341f2d3d638f7 (patch) | |
tree | 3e32991602d9cd02129f8bb05302e75436f3cb98 /audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c | |
parent | 98e9ff282c0b1e01e553312fd31dcef360f6bc4b (diff) | |
download | pkgsrc-7c6e92414c269b2f4eb940410be341f2d3d638f7.tar.gz |
Update to 2.1
* Tested on NetBSD/i386 5.1, /i386 6.0, and /amd64 6.99.13
* Also tested on OpenIndiana/i386 151a7, but my environment lacks audio
device, so I cannot check audio output
* Tested with multimedia/mplayer's -ao pulse option, works fine
* Add gm4 to USE_TOOLS for OpenIndiana build
Changelog:
Many changes. See http://www.freedesktop.org/wiki/Software/PulseAudio .
Diffstat (limited to 'audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c')
-rw-r--r-- | audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c b/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c deleted file mode 100644 index 263dbca4ac3..00000000000 --- a/audio/pulseaudio/patches/patch-src_modules_bluetooth_module-bluetooth-device.c +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-src_modules_bluetooth_module-bluetooth-device.c,v 1.1 2011/10/12 20:12:35 hans Exp $ - ---- src/modules/bluetooth/module-bluetooth-device.c.orig Wed Nov 11 05:11:07 2009 -+++ src/modules/bluetooth/module-bluetooth-device.c Tue Oct 11 19:23:10 2011 -@@ -781,9 +781,11 @@ - pa_make_fd_nonblock(u->stream_fd); - pa_make_socket_low_delay(u->stream_fd); - -+#ifdef SO_TIMESTAMP - one = 1; - if (setsockopt(u->stream_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one)) < 0) - pa_log_warn("Failed to enable SO_TIMESTAMP: %s", pa_cstrerror(errno)); -+#endif - - pa_log_debug("Stream properly set up, we're ready to roll!"); - -@@ -1104,6 +1106,7 @@ - memchunk.length = (size_t) l; - u->read_index += (uint64_t) l; - -+#ifdef SO_TIMESTAMP - for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) - if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SO_TIMESTAMP) { - struct timeval *tv = (struct timeval*) CMSG_DATA(cm); -@@ -1117,6 +1120,9 @@ - pa_log_warn("Couldn't find SO_TIMESTAMP data in auxiliary recvmsg() data!"); - tstamp = pa_rtclock_now(); - } -+#else -+ tstamp = pa_rtclock_now(); -+#endif - - pa_smoother_put(u->read_smoother, tstamp, pa_bytes_to_usec(u->read_index, &u->sample_spec)); - pa_smoother_resume(u->read_smoother, tstamp, TRUE); |