diff options
Diffstat (limited to 'audio/pulseaudio/files')
15 files changed, 47 insertions, 254 deletions
diff --git a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c b/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c deleted file mode 100644 index f16573727007..000000000000 --- a/audio/pulseaudio/files/extra-src_modules_oss_module-oss.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/oss/module-oss.c.orig 2010-11-26 01:45:23.000000000 +0100 -+++ src/modules/oss/module-oss.c 2011-03-11 10:14:04.000000000 +0100 -@@ -1164,7 +1164,7 @@ int pa__init(pa_module*m) { - int fd = -1; - int nfrags, orig_frag_size, frag_size; - int mode, caps; -- pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE; -+ pa_bool_t record = TRUE, playback = TRUE, use_mmap = FALSE; - pa_sample_spec ss; - pa_channel_map map; - pa_modargs *ma = NULL; diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure deleted file mode 100644 index 525356e4b0b5..000000000000 --- a/audio/pulseaudio/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- configure.orig 2010-11-27 12:59:51.000000000 -0500 -+++ configure 2010-11-27 13:00:33.000000000 -0500 -@@ -13773,6 +13773,7 @@ $as_echo_n "checking whether to check fo - check_inconsistencies=yes - case "${host_cpu}-${host_os}" in - *-darwin*) check_inconsistencies=no ;; -+ *-freebsd*) check_inconsistencies=no ;; - esac - if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -18300,7 +18301,7 @@ _ACEOF - - else - -- as_fn_error $? "*** libatomic-ops headers not found" "$LINENO" 5 -+# as_fn_error $? "*** libatomic-ops headers not found" "$LINENO" 5 - - fi - -@@ -18308,9 +18309,9 @@ done - - - # Win32 does not need the lib and breaks horribly if we try to include it -- if test "x$os_is_win32" != "x1" ; then -- LIBS="$LIBS -latomic_ops" -- fi -+# if test "x$os_is_win32" != "x1" ; then -+# LIBS="$LIBS -latomic_ops" -+# fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in index a4a6231f5ed9..e8503dd85719 100644 --- a/audio/pulseaudio/files/patch-src_Makefile.in +++ b/audio/pulseaudio/files/patch-src_Makefile.in @@ -1,23 +1,11 @@ ---- src/Makefile.in.orig 2010-06-25 21:42:58.000000000 +0200 -+++ src/Makefile.in 2010-06-25 21:52:27.000000000 +0200 -@@ -2914,7 +2914,7 @@ - libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \ - -avoid-version $(am__append_14) - libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \ -- $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \ -+ $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) -lexecinfo \ - $(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20) - - ################################### -@@ -7778,9 +7778,8 @@ - +--- src/Makefile.in.orig 2012-06-08 11:09:45.000000000 +0200 ++++ src/Makefile.in 2012-06-08 11:10:00.000000000 +0200 +@@ -8531,7 +8531,7 @@ info-am: --install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \ -- install-dbuspolicyDATA install-pulseconfDATA \ -- install-pulseincludeHEADERS install-udevrulesDATA \ -+install-data-am: install-dbuspolicyDATA \ -+ install-pulseincludeHEADERS \ - install-xdgautostartDATA + install-data-am: install-dbuspolicyDATA install-dist_alsapathsDATA \ +- install-dist_alsaprofilesetsDATA install-dist_udevrulesDATA \ ++ install-dist_alsaprofilesetsDATA \ + install-padsplibLTLIBRARIES install-pulseconfDATA \ + install-pulseincludeHEADERS install-xdgautostartDATA - install-dvi: install-dvi-am diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in index 0ca5a64e5ba6..b6e714e60174 100644 --- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in +++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in @@ -1,17 +1,17 @@ ---- src/daemon/default.pa.in.orig 2009-07-19 14:58:14.000000000 -0400 -+++ src/daemon/default.pa.in 2009-07-19 14:58:41.000000000 -0400 -@@ -22,10 +22,10 @@ - .nofail - - ### Load something into the sample cache +--- src/daemon/default.pa.in.orig 2011-10-21 15:14:14.000000000 +0200 ++++ src/daemon/default.pa.in 2011-10-21 15:15:21.000000000 +0200 +@@ -27,10 +27,10 @@ + load-sample x11-bell %WINDIR%\Media\ding.wav + load-sample-dir-lazy %WINDIR%\Media\*.wav + ], [dnl -#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav -#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav -#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav -#load-sample-lazy pulse-access /usr/share/sounds/generic.wav -+#load-sample-lazy x11-bell %%LOCALBASE%%/sounds/gtk-events/activate.wav -+#load-sample-lazy pulse-hotplug %%LOCALBASE%%/sounds/startup3.wav -+#load-sample-lazy pulse-coldplug %%LOCALBASE%%/sounds/startup3.wav -+#load-sample-lazy pulse-access %%LOCALBASE%%/sounds/generic.wav ++#load-sample-lazy x11-bell %%LOCALBASE%%/share/sounds/gtk-events/activate.wav ++#load-sample-lazy pulse-hotplug %%LOCALBASE%%/share/sounds/startup3.wav ++#load-sample-lazy pulse-coldplug %%LOCALBASE%%/share/sounds/startup3.wav ++#load-sample-lazy pulse-access %%LOCALBASE/share/sounds/generic.wav + ])dnl .fail - diff --git a/audio/pulseaudio/files/patch-src_modules_module-cli.c b/audio/pulseaudio/files/patch-src_modules_module-cli.c deleted file mode 100644 index 4b0fedcc8878..000000000000 --- a/audio/pulseaudio/files/patch-src_modules_module-cli.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/modules/module-cli.c.orig 2009-09-19 13:57:53.000000000 -0400 -+++ src/modules/module-cli.c 2009-09-19 14:04:25.000000000 -0400 -@@ -105,7 +105,12 @@ int pa__init(pa_module*m) { - * of log messages, particularly because if stdout and stderr are - * dup'ed they share the same O_NDELAY, too. */ - -+#ifdef O_CLOEXEC - if ((fd = open("/dev/tty", O_RDWR|O_CLOEXEC|O_NONBLOCK)) >= 0) { -+#else -+ if ((fd = open("/dev/tty", O_RDWR|O_NONBLOCK)) >= 0 && -+ fcntl(fd, F_SETFD, FD_CLOEXEC) != -1) { -+#endif - io = pa_iochannel_new(m->core->mainloop, fd, fd); - pa_log_debug("Managed to open /dev/tty."); - } else { diff --git a/audio/pulseaudio/files/patch-src_modules_module-detect.c b/audio/pulseaudio/files/patch-src_modules_module-detect.c index 0d13b281e846..e538ea0e80a3 100644 --- a/audio/pulseaudio/files/patch-src_modules_module-detect.c +++ b/audio/pulseaudio/files/patch-src_modules_module-detect.c @@ -1,6 +1,16 @@ ---- src/modules/module-detect.c.orig 2009-11-22 22:57:05.000000000 -0500 -+++ src/modules/module-detect.c 2010-06-17 19:20:39.000000000 -0400 -@@ -161,8 +161,7 @@ +--- src/modules/module-detect.c.orig 2010-11-26 01:45:43.000000000 +0100 ++++ src/modules/module-detect.c 2011-03-03 00:35:10.000000000 +0100 +@@ -50,7 +50,9 @@ PA_MODULE_DESCRIPTION("Detect available + PA_MODULE_VERSION(PACKAGE_VERSION); + PA_MODULE_LOAD_ONCE(TRUE); + PA_MODULE_USAGE("just-one=<boolean>"); ++#ifdef __linux__ + PA_MODULE_DEPRECATED("Please use module-udev-detect instead of module-detect!"); ++#endif + + static const char* const valid_modargs[] = { + "just-one", +@@ -161,8 +163,7 @@ static int detect_oss(pa_core *c, int ju continue; } else if (sscanf(line, "pcm%u: ", &device) == 1) { diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c index a723999af7fd..4edcb6627c96 100644 --- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c +++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c @@ -1,24 +1,26 @@ ---- src/modules/oss/module-oss.c.orig 2009-04-13 17:11:32.000000000 -0400 -+++ src/modules/oss/module-oss.c 2009-07-19 14:24:25.000000000 -0400 -@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) { - use_mmap = FALSE; +--- src/modules/oss/module-oss.c.orig 2014-01-23 19:57:55.000000000 +0100 ++++ src/modules/oss/module-oss.c 2014-03-22 10:59:05.000000000 +0100 +@@ -1229,10 +1229,14 @@ int pa__init(pa_module*m) { + use_mmap = false; } +#ifndef __FreeBSD__ ++/* Disable mmap. The OSS on FreeBSD doesn't support read & write on ++ the same socket */ if (use_mmap && mode == O_WRONLY) { pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); - use_mmap = FALSE; + use_mmap = false; } +#endif if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) pa_log_info("Hardware name is '%s'.", hwdesc); -@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) { +@@ -1428,7 +1432,7 @@ int pa__init(pa_module*m) { if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { - pa_bool_t do_close = TRUE; + bool do_close = true; - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) + if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno)); - else { + if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) { diff --git a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c deleted file mode 100644 index 2dbcad26ab0d..000000000000 --- a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/modules/rtp/rtsp_client.c.orig 2009-07-19 14:38:38.000000000 -0400 -+++ src/modules/rtp/rtsp_client.c 2009-07-19 14:39:46.000000000 -0400 -@@ -23,6 +23,9 @@ - #include <config.h> - #endif - -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> - #include <fcntl.h> - #include <stdlib.h> - #include <string.h> diff --git a/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c b/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c deleted file mode 100644 index 4e7d9a8fe616..000000000000 --- a/audio/pulseaudio/files/patch-src_pulsecore_cpu-arm.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/pulsecore/cpu-arm.c.orig 2011-06-23 20:18:54.443125000 +0000 -+++ src/pulsecore/cpu-arm.c 2013-03-09 23:00:50.000000000 +0000 -@@ -82,10 +82,10 @@ - - void pa_cpu_init_arm (void) { - #if defined (__arm__) -+ pa_cpu_arm_flag_t flags = 0; - #if defined (__linux__) - char *cpuinfo, *line; - int arch; -- pa_cpu_arm_flag_t flags = 0; - - /* We need to read the CPU flags from /proc/cpuinfo because there is no user - * space support to get the CPU features. This only works on linux AFAIK. */ diff --git a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c b/audio/pulseaudio/files/patch-src_pulsecore_pstream.c deleted file mode 100644 index b242e2e416da..000000000000 --- a/audio/pulseaudio/files/patch-src_pulsecore_pstream.c +++ /dev/null @@ -1,23 +0,0 @@ ---- src/pulsecore/pstream.c.orig 2007-10-28 15:13:53.000000000 -0400 -+++ src/pulsecore/pstream.c 2008-01-01 16:14:18.000000000 -0500 -@@ -183,14 +183,17 @@ static void do_something(pa_pstream *p) - p->mainloop->defer_enable(p->defer_event, 0); - - if (!p->dead && pa_iochannel_is_readable(p->io)) { -- if (do_read(p) < 0) -+ if (do_read(p) < 0) { - goto fail; -- } else if (!p->dead && pa_iochannel_is_hungup(p->io)) -+ } -+ } else if (!p->dead && pa_iochannel_is_hungup(p->io)) { - goto fail; -+ } - - if (!p->dead && pa_iochannel_is_writable(p->io)) { -- if (do_write(p) < 0) -+ if (do_write(p) < 0) { - goto fail; -+ } - } - - pa_pstream_unref(p); diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c index 4dfa3a3a9392..85030b5ea4f5 100644 --- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c +++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c @@ -1,20 +1,11 @@ ---- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800 -+++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800 -@@ -91,7 +91,7 @@ - #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker)) +--- src/pulsecore/shm.c.orig 2013-04-14 06:42:35.000000000 +0200 ++++ src/pulsecore/shm.c 2013-06-24 17:25:58.000000000 +0200 +@@ -97,7 +97,7 @@ struct shm_marker { + #ifdef HAVE_SHM_OPEN static char *segment_name(char *fn, size_t l, unsigned id) { - pa_snprintf(fn, l, "/pulse-shm-%u", id); + pa_snprintf(fn, l, "/tmp/pulse-shm-%u", id); return fn; } - -@@ -142,7 +142,7 @@ - pa_random(&m->id, sizeof(m->id)); - segment_name(fn, sizeof(fn), m->id); - -- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) { -+ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) { - pa_log("shm_open() failed: %s", pa_cstrerror(errno)); - goto fail; - } + #endif diff --git a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c b/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c deleted file mode 100644 index 99d2f5d37135..000000000000 --- a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/pulsecore/svolume_mmx.c.orig 2011-06-23 20:18:54.484125000 +0000 -+++ src/pulsecore/svolume_mmx.c 2013-04-18 09:22:42.000000000 +0000 -@@ -154,9 +154,9 @@ - "6: \n\t" - " emms \n\t" - -- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) -+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - #if defined (__i386__) -- : "m" ((pa_reg_x86)channels) -+ : "m" (channels) - #else - : "r" ((pa_reg_x86)channels) - #endif -@@ -235,9 +235,9 @@ - "6: \n\t" - " emms \n\t" - -- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp) -+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - #if defined (__i386__) -- : "m" ((pa_reg_x86)channels) -+ : "m" (channels) - #else - : "r" ((pa_reg_x86)channels) - #endif diff --git a/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c b/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c deleted file mode 100644 index 420389c4e43e..000000000000 --- a/audio/pulseaudio/files/patch-src_pulsecore_svolume_sse.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/pulsecore/svolume_sse.c.orig 2013-04-19 14:02:51.000000000 +0000 -+++ src/pulsecore/svolume_sse.c 2013-04-19 14:03:14.000000000 +0000 -@@ -155,7 +155,7 @@ - - : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - #if defined (__i386__) -- : "m" ((pa_reg_x86)channels) -+ : "m" (channels) - #else - : "r" ((pa_reg_x86)channels) - #endif -@@ -249,7 +249,7 @@ - - : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp) - #if defined (__i386__) -- : "m" ((pa_reg_x86)channels) -+ : "m" (channels) - #else - : "r" ((pa_reg_x86)channels) - #endif diff --git a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c b/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c deleted file mode 100644 index 365ca8d2bec7..000000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtpoll-test.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tests/rtpoll-test.c.orig 2008-01-03 20:03:03.000000000 -0500 -+++ src/tests/rtpoll-test.c 2008-01-03 20:03:25.000000000 -0500 -@@ -45,6 +45,7 @@ static int worker(pa_rtpoll_item *w) { - } - - int main(int argc, char *argv[]) { -+#ifdef SIGRTMIN - pa_rtpoll *p; - pa_rtpoll_item *i, *w; - struct pollfd *pollfd; -@@ -86,6 +87,7 @@ int main(int argc, char *argv[]) { - pa_rtpoll_item_free(w); - - pa_rtpoll_free(p); -+#endif - - return 0; - } diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c deleted file mode 100644 index c80737b1946f..000000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c +++ /dev/null @@ -1,27 +0,0 @@ ---- src/tests/rtstutter.c.orig 2009-07-23 15:40:47.000000000 +0200 -+++ src/tests/rtstutter.c 2009-11-24 16:26:36.000000000 +0100 -@@ -31,6 +31,11 @@ - #include <string.h> - #include <pthread.h> - -+#ifdef HAVE_PTHREAD_SETAFFINITY_NP -+#include <sys/param.h> -+#include <sys/cpuset.h> -+#endif -+ - #include <pulse/timeval.h> - #include <pulse/gccmacro.h> - -@@ -44,8 +49,12 @@ - - static void* work(void *p) { - #ifdef HAVE_PTHREAD_SETAFFINITY_NP -+#ifdef __FreeBSD__ -+ cpuset_t mask; -+#else - cpu_set_t mask; - #endif -+#endif - struct sched_param param; - - pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p)); |