This is an automated email from the git hooks/post-receive script. themuso-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit 48c8926816584be2b0e0c6eda40e9ad379d02b26 Author: Luke Yelavich <[email protected]> Date: Wed Nov 26 10:03:18 2014 +1100 Refreshed patches, and dropped patches that were either applied upstream or are obsolete --- debian/changelog | 2 ++ .../0005-dont-load-cork-music-on-phone.patch | 8 ++--- debian/patches/0006-load-module-x11-bell.patch | 16 ++------- debian/patches/0016-nodisplay-autostart.patch | 2 +- ...rapper-Quit-daemon-if-pid-file-is-removed.patch | 26 +++++++-------- ...nd_mixer_poll_descriptors_count_when_zero.patch | 6 ++-- ....c-changing-default-rlimit_rttime-value-t.patch | 26 --------------- debian/patches/0202-dont-probe-ucm.patch | 8 ++--- ...0203-card-Add-hook-before-profile-changes.patch | 2 +- debian/patches/0207-Enable-pulseaudio-droid.patch | 14 ++++---- ...tooth-device-Allow-leaving-transport-runn.patch | 12 +++---- ...ch-on-connect-adding-parameter-to-allow-s.patch | 29 ++++++++--------- ...le-device-restore-adding-property-to-skip.patch | 8 ++--- ...pi-adding-missing-fields-for-sink_input-s.patch | 38 ---------------------- debian/patches/series | 3 -- 15 files changed, 60 insertions(+), 140 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f7856c..bdd68e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ pulseaudio (1:5.0-13ubuntu1) UNRELEASED; urgency=medium pulseaudio.install to match * Update shlibs * Update symbols + * Refreshed patches, and dropped patches that were either applied upstream + or are obsolete -- Luke Yelavich <[email protected]> Wed, 19 Nov 2014 11:21:32 +1100 diff --git a/debian/patches/0005-dont-load-cork-music-on-phone.patch b/debian/patches/0005-dont-load-cork-music-on-phone.patch index 803287b..c5918f0 100644 --- a/debian/patches/0005-dont-load-cork-music-on-phone.patch +++ b/debian/patches/0005-dont-load-cork-music-on-phone.patch @@ -1,8 +1,8 @@ -Index: pulseaudio-2.99.1/src/daemon/default.pa.in +Index: pulseaudio/src/daemon/default.pa.in =================================================================== ---- pulseaudio-2.99.1.orig/src/daemon/default.pa.in 2012-11-16 11:19:57.904259183 +0100 -+++ pulseaudio-2.99.1/src/daemon/default.pa.in 2012-11-16 11:20:18.408258877 +0100 -@@ -154,7 +154,7 @@ +--- pulseaudio.orig/src/daemon/default.pa.in ++++ pulseaudio/src/daemon/default.pa.in +@@ -161,7 +161,7 @@ load-module module-systemd-login load-module module-position-event-sounds ### Cork music/video streams when a phone stream is active diff --git a/debian/patches/0006-load-module-x11-bell.patch b/debian/patches/0006-load-module-x11-bell.patch index 6720ac4..a6b06ac 100644 --- a/debian/patches/0006-load-module-x11-bell.patch +++ b/debian/patches/0006-load-module-x11-bell.patch @@ -2,23 +2,11 @@ Index: pulseaudio/src/daemon/start-pulseaudio-x11.in =================================================================== --- pulseaudio.orig/src/daemon/start-pulseaudio-x11.in +++ pulseaudio/src/daemon/start-pulseaudio-x11.in -@@ -31,6 +31,7 @@ fi +@@ -22,6 +22,7 @@ set -e if [ x"$DISPLAY" != x ] ; then @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null + @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null - if [ x"$SESSION_MANAGER" != x ] ; then -Index: pulseaudio/src/daemon/start-pulseaudio-kde.in -=================================================================== ---- pulseaudio.orig/src/daemon/start-pulseaudio-kde.in -+++ pulseaudio/src/daemon/start-pulseaudio-kde.in -@@ -33,6 +33,7 @@ fi - if [ x"$DISPLAY" != x ] ; then - - @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null -+ @PACTL_BINARY@ load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null - - fi - + if [ x"$KDE_FULL_SESSION" = x"true" ]; then diff --git a/debian/patches/0016-nodisplay-autostart.patch b/debian/patches/0016-nodisplay-autostart.patch index e0a2c39..fdea536 100644 --- a/debian/patches/0016-nodisplay-autostart.patch +++ b/debian/patches/0016-nodisplay-autostart.patch @@ -10,5 +10,5 @@ Index: pulseaudio/src/daemon/pulseaudio.desktop.in @@ -9,3 +9,4 @@ Categories= GenericName= X-GNOME-Autostart-Phase=Initialization - NotShowIn=KDE; + X-KDE-autostart-phase=1 +NoDisplay=true diff --git a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch index 4bbb704..41ecf2d 100644 --- a/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch +++ b/debian/patches/0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch @@ -29,9 +29,9 @@ Index: pulseaudio/src/Makefile.am =================================================================== --- pulseaudio.orig/src/Makefile.am +++ pulseaudio/src/Makefile.am -@@ -883,6 +883,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES +@@ -920,6 +920,7 @@ libpulsecore_@PA_MAJORMINOR@_la_SOURCES + pulsecore/core-subscribe.c pulsecore/core-subscribe.h \ pulsecore/core.c pulsecore/core.h \ - pulsecore/fdsem.c pulsecore/fdsem.h \ pulsecore/hook-list.c pulsecore/hook-list.h \ + pulsecore/inotify-wrapper.c pulsecore/inotify-wrapper.h \ pulsecore/ltdl-helper.c pulsecore/ltdl-helper.h \ @@ -41,7 +41,7 @@ Index: pulseaudio/src/daemon/main.c =================================================================== --- pulseaudio.orig/src/daemon/main.c +++ pulseaudio/src/daemon/main.c -@@ -74,6 +74,7 @@ +@@ -75,6 +75,7 @@ #include <pulsecore/core-rtclock.h> #include <pulsecore/core-scache.h> #include <pulsecore/core.h> @@ -49,7 +49,7 @@ Index: pulseaudio/src/daemon/main.c #include <pulsecore/module.h> #include <pulsecore/cli-command.h> #include <pulsecore/log.h> -@@ -360,6 +361,15 @@ static char *check_configured_address(vo +@@ -334,6 +335,15 @@ static char *check_configured_address(vo return default_server; } @@ -65,23 +65,23 @@ Index: pulseaudio/src/daemon/main.c #ifdef HAVE_DBUS static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const char* name) { DBusError error; -@@ -402,7 +412,6 @@ int main(int argc, char *argv[]) { +@@ -376,7 +386,6 @@ int main(int argc, char *argv[]) { char *s; char *configured_address; int r = 0, retval = 1, d = 0; - bool valid_pid_file = false; bool ltdl_init = false; - int passed_fd = -1; + int n_fds = 0, *passed_fds = NULL; const char *e; -@@ -414,6 +423,7 @@ int main(int argc, char *argv[]) { - pa_time_event *win32_timer; - struct timeval win32_tv; +@@ -384,6 +393,7 @@ int main(int argc, char *argv[]) { + int daemon_pipe[2] = { -1, -1 }; + int daemon_pipe2[2] = { -1, -1 }; #endif + pa_inotify *pid_monitor = NULL; int autospawn_fd = -1; bool autospawn_locked = false; #ifdef HAVE_DBUS -@@ -1032,6 +1042,9 @@ int main(int argc, char *argv[]) { +@@ -1024,6 +1034,9 @@ int main(int argc, char *argv[]) { goto finish; } @@ -91,9 +91,9 @@ Index: pulseaudio/src/daemon/main.c c->default_sample_spec = conf->default_sample_spec; c->alternate_sample_rate = conf->alternate_sample_rate; c->default_channel_map = conf->default_channel_map; -@@ -1179,6 +1192,9 @@ finish: - pa_mainloop_get_api(mainloop)->time_free(win32_timer); - #endif +@@ -1155,6 +1168,9 @@ finish: + pa_autospawn_lock_done(false); + } + if (pid_monitor) + pa_inotify_stop(pid_monitor); diff --git a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch index c4439fa..4dce3f96 100644 --- a/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch +++ b/debian/patches/0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch @@ -2,9 +2,9 @@ Description: Avoid abort when poll descriptor is 0 (LP: #1092377) Index: pulseaudio/src/modules/alsa/alsa-mixer.c =================================================================== ---- pulseaudio.orig/src/modules/alsa/alsa-mixer.c 2012-12-20 00:37:53.862456000 -0200 -+++ pulseaudio/src/modules/alsa/alsa-mixer.c 2012-12-20 00:39:58.631080479 -0200 -@@ -160,6 +160,9 @@ +--- pulseaudio.orig/src/modules/alsa/alsa-mixer.c ++++ pulseaudio/src/modules/alsa/alsa-mixer.c +@@ -217,6 +217,9 @@ static void defer_cb(pa_mainloop_api *a, if (n < 0) { pa_log("snd_mixer_poll_descriptors_count() failed: %s", pa_alsa_strerror(n)); return; diff --git a/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch b/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch deleted file mode 100644 index f2cde66..0000000 --- a/debian/patches/0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 264e2d7c27d0f690b67e4cacf7b19dfeb7eeeca0 Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti de Araujo <[email protected]> -Date: Fri, 27 Jun 2014 16:36:48 -0300 -Subject: [PATCH] daemon-conf.c: changing default rlimit_rttime value to 200 ms - -Since rtkit v11, the top limit for rttime is 200 ms (previously it -was wrongly limited to 2 seconds). - -Signed-off-by: Ricardo Salveti de Araujo <[email protected]> ---- - src/daemon/daemon-conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: pulseaudio/src/daemon/daemon-conf.c -=================================================================== ---- pulseaudio.orig/src/daemon/daemon-conf.c -+++ pulseaudio/src/daemon/daemon-conf.c -@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf - ,.rlimit_rtprio = { .value = 9, .is_set = true } /* One below JACK's default for the server */ - #endif - #ifdef RLIMIT_RTTIME -- ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true } -+ ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */ - #endif - #endif - }; diff --git a/debian/patches/0202-dont-probe-ucm.patch b/debian/patches/0202-dont-probe-ucm.patch index f0e0ca8..d669f4f 100644 --- a/debian/patches/0202-dont-probe-ucm.patch +++ b/debian/patches/0202-dont-probe-ucm.patch @@ -1,8 +1,8 @@ -Index: pulseaudio-5.0/src/modules/alsa/alsa-ucm.c +Index: pulseaudio/src/modules/alsa/alsa-ucm.c =================================================================== ---- pulseaudio-5.0.orig/src/modules/alsa/alsa-ucm.c 2014-03-19 13:15:43.734768910 +1100 -+++ pulseaudio-5.0/src/modules/alsa/alsa-ucm.c 2014-03-19 13:15:43.730768910 +1100 -@@ -1541,7 +1541,8 @@ +--- pulseaudio.orig/src/modules/alsa/alsa-ucm.c ++++ pulseaudio/src/modules/alsa/alsa-ucm.c +@@ -1540,7 +1540,8 @@ pa_alsa_profile_set* pa_alsa_ucm_add_pro ucm_create_profile(ucm, ps, verb, verb_name, verb_desc); } diff --git a/debian/patches/0203-card-Add-hook-before-profile-changes.patch b/debian/patches/0203-card-Add-hook-before-profile-changes.patch index 0d091af..500892b 100644 --- a/debian/patches/0203-card-Add-hook-before-profile-changes.patch +++ b/debian/patches/0203-card-Add-hook-before-profile-changes.patch @@ -27,7 +27,7 @@ Index: pulseaudio/src/pulsecore/core.h =================================================================== --- pulseaudio.orig/src/pulsecore/core.h +++ pulseaudio/src/pulsecore/core.h -@@ -116,6 +116,7 @@ typedef enum pa_core_hook { +@@ -124,6 +124,7 @@ typedef enum pa_core_hook { PA_CORE_HOOK_CARD_PUT, PA_CORE_HOOK_CARD_UNLINK, PA_CORE_HOOK_CARD_PROFILE_CHANGED, diff --git a/debian/patches/0207-Enable-pulseaudio-droid.patch b/debian/patches/0207-Enable-pulseaudio-droid.patch index 3105b2d..3fdecaf 100644 --- a/debian/patches/0207-Enable-pulseaudio-droid.patch +++ b/debian/patches/0207-Enable-pulseaudio-droid.patch @@ -2,7 +2,7 @@ Index: pulseaudio/configure.ac =================================================================== --- pulseaudio.orig/configure.ac +++ pulseaudio/configure.ac -@@ -796,6 +796,21 @@ AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV +@@ -807,6 +807,21 @@ AM_CONDITIONAL([HAVE_ALSA], [test "x$HAV AS_IF([test "x$HAVE_ALSA" = "x1"], AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])) AS_IF([test "x$HAVE_ALSA_UCM" = "x1"], AC_DEFINE([HAVE_ALSA_UCM], 1, [Have ALSA UCM?])) @@ -24,7 +24,7 @@ Index: pulseaudio/configure.ac #### EsounD support (optional) #### AC_ARG_ENABLE([esound], -@@ -1417,6 +1432,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE +@@ -1497,6 +1512,7 @@ AS_IF([test "x$HAVE_X11" = "x1"], ENABLE AS_IF([test "x$HAVE_OSS_OUTPUT" = "x1"], ENABLE_OSS_OUTPUT=yes, ENABLE_OSS_OUTPUT=no) AS_IF([test "x$HAVE_OSS_WRAPPER" = "x1"], ENABLE_OSS_WRAPPER=yes, ENABLE_OSS_WRAPPER=no) AS_IF([test "x$HAVE_ALSA" = "x1"], ENABLE_ALSA=yes, ENABLE_ALSA=no) @@ -32,7 +32,7 @@ Index: pulseaudio/configure.ac AS_IF([test "x$HAVE_COREAUDIO" = "x1"], ENABLE_COREAUDIO=yes, ENABLE_COREAUDIO=no) AS_IF([test "x$HAVE_SOLARIS" = "x1"], ENABLE_SOLARIS=yes, ENABLE_SOLARIS=no) AS_IF([test "x$HAVE_WAVEOUT" = "x1"], ENABLE_WAVEOUT=yes, ENABLE_WAVEOUT=no) -@@ -1473,6 +1489,7 @@ echo " +@@ -1557,6 +1573,7 @@ echo " Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER} Enable EsounD: ${ENABLE_ESOUND} Enable Alsa: ${ENABLE_ALSA} @@ -44,7 +44,7 @@ Index: pulseaudio/src/Makefile.am =================================================================== --- pulseaudio.orig/src/Makefile.am +++ pulseaudio/src/Makefile.am -@@ -1196,6 +1196,16 @@ modlibexec_LTLIBRARIES += \ +@@ -1249,6 +1249,16 @@ modlibexec_LTLIBRARIES += \ module-alsa-source.la \ module-alsa-card.la @@ -60,8 +60,8 @@ Index: pulseaudio/src/Makefile.am + dist_alsaprofilesets_DATA = \ modules/alsa/mixer/profile-sets/default.conf \ - modules/alsa/mixer/profile-sets/extra-hdmi.conf \ -@@ -1459,6 +1469,13 @@ SYMDEF_FILES = \ + modules/alsa/mixer/profile-sets/force-speaker.conf \ +@@ -1518,6 +1528,13 @@ SYMDEF_FILES = \ module-filter-apply-symdef.h \ module-filter-heuristics-symdef.h @@ -75,7 +75,7 @@ Index: pulseaudio/src/Makefile.am if HAVE_ESOUND SYMDEF_FILES += \ module-esound-protocol-tcp-symdef.h \ -@@ -1768,6 +1785,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS) +@@ -1827,6 +1844,44 @@ libalsa_util_la_LIBADD += $(DBUS_LIBS) libalsa_util_la_CFLAGS += $(DBUS_CFLAGS) endif diff --git a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch index 7d21968..8d9eaca 100644 --- a/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch +++ b/debian/patches/0208-module-bluetooth-device-Allow-leaving-transport-runn.patch @@ -155,7 +155,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c /* Run from IO thread */ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { struct userdata *u = PA_SINK(o)->userdata; -@@ -1423,6 +1487,10 @@ static int sco_over_pcm_state_update(str +@@ -1430,6 +1494,10 @@ static int sco_over_pcm_state_update(str if (u->stream_fd < 0) return 0; @@ -166,7 +166,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c pa_log_debug("Closing SCO over PCM"); bt_transport_release(u); -@@ -1466,6 +1534,11 @@ static pa_hook_result_t transport_nrec_c +@@ -1473,6 +1541,11 @@ static pa_hook_result_t transport_nrec_c if (t != u->transport) return PA_HOOK_OK; @@ -178,7 +178,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c p = pa_proplist_new(); pa_proplist_sets(p, "bluetooth.nrec", t->nrec ? "1" : "0"); pa_source_update_proplist(u->source, PA_UPDATE_REPLACE, p); -@@ -1828,7 +1901,7 @@ static int setup_transport(struct userda +@@ -1835,7 +1908,7 @@ static int setup_transport(struct userda pa_bluez4_transport *t; pa_assert(u); @@ -187,7 +187,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c pa_assert(u->profile != PA_BLUEZ4_PROFILE_OFF); /* check if profile has a transport */ -@@ -1908,7 +1981,8 @@ static void stop_thread(struct userdata +@@ -1915,7 +1988,8 @@ static void stop_thread(struct userdata if (u->transport) { bt_transport_release(u); @@ -197,7 +197,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c } if (u->sink) { -@@ -2513,6 +2587,10 @@ int pa__init(pa_module *m) { +@@ -2520,6 +2594,10 @@ int pa__init(pa_module *m) { pa_hook_connect(pa_bluez4_discovery_hook(u->discovery, PA_BLUEZ4_HOOK_TRANSPORT_SPEAKER_GAIN_CHANGED), PA_HOOK_NORMAL, (pa_hook_cb_t) transport_speaker_gain_changed_cb, u); @@ -208,7 +208,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez4-device.c /* Add the card structure. This will also initialize the default profile */ if (add_card(u) < 0) goto fail; -@@ -2592,6 +2670,9 @@ void pa__done(pa_module *m) { +@@ -2599,6 +2677,9 @@ void pa__done(pa_module *m) { if (u->transport_speaker_changed_slot) pa_hook_slot_free(u->transport_speaker_changed_slot); diff --git a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch index c2c3776..2d0c47f 100644 --- a/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch +++ b/debian/patches/0209-module-switch-on-connect-adding-parameter-to-allow-s.patch @@ -12,19 +12,18 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c =================================================================== --- pulseaudio.orig/src/modules/module-switch-on-connect.c +++ pulseaudio/src/modules/module-switch-on-connect.c -@@ -41,6 +41,8 @@ PA_MODULE_AUTHOR("Michael Terry"); - PA_MODULE_DESCRIPTION("When a sink/source is added, switch to it"); - PA_MODULE_VERSION(PACKAGE_VERSION); +@@ -43,6 +43,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(true); -+PA_MODULE_USAGE( + PA_MODULE_USAGE( + "only_from_unavailable=<boolean, only switch from unavailable ports> " + "skip_abstract=<yes or no>"); + ); static const char* const valid_modargs[] = { - NULL, -@@ -50,13 +52,15 @@ struct userdata { - pa_hook_slot +@@ -55,13 +56,14 @@ struct userdata { *sink_put_slot, *source_put_slot; + bool only_from_unavailable; + bool skip_abstract; }; @@ -34,11 +33,10 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c pa_sink *def; - const char *s; + const char *s, *class; -+ struct userdata *u = userdata; + struct userdata *u = userdata; pa_assert(c); - pa_assert(sink); -@@ -73,6 +77,12 @@ static pa_hook_result_t sink_put_hook_ca +@@ -80,6 +82,12 @@ static pa_hook_result_t sink_put_hook_ca return PA_HOOK_OK; } @@ -51,17 +49,16 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c def = pa_namereg_get_default_sink(c); if (def == sink) return PA_HOOK_OK; -@@ -105,7 +115,8 @@ static pa_hook_result_t source_put_hook_ +@@ -116,7 +124,7 @@ static pa_hook_result_t source_put_hook_ pa_source_output *o; uint32_t idx; pa_source *def; - const char *s; + const char *s, *class; -+ struct userdata *u = userdata; + struct userdata *u = userdata; pa_assert(c); - pa_assert(source); -@@ -126,6 +137,12 @@ static pa_hook_result_t source_put_hook_ +@@ -139,6 +147,12 @@ static pa_hook_result_t source_put_hook_ return PA_HOOK_OK; } @@ -74,9 +71,9 @@ Index: pulseaudio/src/modules/module-switch-on-connect.c def = pa_namereg_get_default_source(c); if (def == source) return PA_HOOK_OK; -@@ -167,6 +184,11 @@ int pa__init(pa_module*m) { +@@ -184,6 +198,11 @@ int pa__init(pa_module*m) { - m->userdata = u = pa_xnew(struct userdata, 1); + m->userdata = u = pa_xnew0(struct userdata, 1); + if (pa_modargs_get_value_boolean(ma, "skip_abstract", &u->skip_abstract) < 0) { + pa_log_error("skip_abstract= expects a boolean argument, assuming false by default"); diff --git a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch index 04830ed..b4a5566 100644 --- a/debian/patches/0210-module-device-restore-adding-property-to-skip.patch +++ b/debian/patches/0210-module-device-restore-adding-property-to-skip.patch @@ -28,7 +28,7 @@ Index: pulseaudio/src/modules/module-device-restore.c static const char* const valid_modargs[] = { "restore_volume", -@@ -611,6 +613,9 @@ static void subscribe_callback(pa_core * +@@ -613,6 +615,9 @@ static void subscribe_callback(pa_core * if (!(sink = pa_idxset_get_by_index(c->sinks, idx))) return; @@ -38,7 +38,7 @@ Index: pulseaudio/src/modules/module-device-restore.c type = PA_DEVICE_TYPE_SINK; name = pa_sprintf_malloc("sink:%s", sink->name); if (sink->active_port) -@@ -650,6 +655,9 @@ static void subscribe_callback(pa_core * +@@ -652,6 +657,9 @@ static void subscribe_callback(pa_core * if (!(source = pa_idxset_get_by_index(c->sources, idx))) return; @@ -48,7 +48,7 @@ Index: pulseaudio/src/modules/module-device-restore.c type = PA_DEVICE_TYPE_SOURCE; name = pa_sprintf_malloc("source:%s", source->name); if (source->active_port) -@@ -815,6 +823,9 @@ static pa_hook_result_t sink_port_hook_c +@@ -818,6 +826,9 @@ static pa_hook_result_t sink_port_hook_c pa_assert(u); pa_assert(u->restore_volume || u->restore_muted); @@ -58,7 +58,7 @@ Index: pulseaudio/src/modules/module-device-restore.c name = pa_sprintf_malloc("sink:%s", sink->name); if ((e = perportentry_read(u, name, (sink->active_port ? sink->active_port->name : NULL)))) { -@@ -956,6 +967,9 @@ static pa_hook_result_t source_port_hook +@@ -960,6 +971,9 @@ static pa_hook_result_t source_port_hook pa_assert(u); pa_assert(u->restore_volume || u->restore_muted); diff --git a/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch b/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch deleted file mode 100644 index 82a45e9..0000000 --- a/debian/patches/0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5c0bea7f5a0a649d86262d9dc8d81b69ad614cb4 Mon Sep 17 00:00:00 2001 -From: Ricardo Salveti de Araujo <[email protected]> -Date: Wed, 17 Sep 2014 01:07:58 -0300 -Subject: [PATCH] libpulse.vapi: adding missing fields for - sink_input/source_output info struct - -Upstream: http://lists.freedesktop.org/archives/pulseaudio-discuss/2014-October/021885.html -Signed-off-by: Ricardo Salveti de Araujo <[email protected]> ---- - vala/libpulse.vapi | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: pulseaudio/vala/libpulse.vapi -=================================================================== ---- pulseaudio.orig/vala/libpulse.vapi -+++ pulseaudio/vala/libpulse.vapi -@@ -1376,6 +1376,9 @@ namespace PulseAudio { - public string driver; - public int mute; - public Proplist proplist; -+ public int corked; -+ public int has_volume; -+ public int volume_writable; - } - - [CCode (cname="pa_source_output_info", has_type_id=false)] -@@ -1392,6 +1395,11 @@ namespace PulseAudio { - public string resample_method; - public string driver; - public Proplist proplist; -+ public int corked; -+ public CVolume volume; -+ public int mute; -+ public int has_volume; -+ public int volume_writable; - } - - [CCode (cname="pa_stat_info", has_type_id=false)] diff --git a/debian/patches/series b/debian/patches/series index 7f56643..20f93ea 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,10 +5,8 @@ gnu-kfreebsd.patch 0005-dont-load-cork-music-on-phone.patch 0006-load-module-x11-bell.patch 0016-nodisplay-autostart.patch -#0020-stream-Return-error-in-case-a-client-peeks-to-early.patch 0022-inotify-wrapper-Quit-daemon-if-pid-file-is-removed.patch 0023-fixing_snd_mixer_poll_descriptors_count_when_zero.patch -0024-daemon-conf.c-changing-default-rlimit_rttime-value-t.patch # Ubuntu touch stuff 0202-dont-probe-ucm.patch @@ -18,4 +16,3 @@ gnu-kfreebsd.patch 0208-module-bluetooth-device-Allow-leaving-transport-runn.patch 0209-module-switch-on-connect-adding-parameter-to-allow-s.patch 0210-module-device-restore-adding-property-to-skip.patch -0212-libpulse.vapi-adding-missing-fields-for-sink_input-s.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
