This is an automated email from the git hooks/post-receive script. themuso-guest pushed a commit to branch ubuntu in repository pulseaudio.
commit 0af5209053172f166aa88dc1781c3e668fd4feb2 Author: Luke Yelavich <them...@ubuntu.com> Date: Wed Oct 26 12:49:12 2016 +1100 Refresh patches --- ...luez5-let-user-specify-a-default-profile-.patch | 25 +++++----- ...luez5-prevent-SCO-sink-source-to-be-suspe.patch | 8 ++-- ...luez5-drop-save-restore-of-SCO-sink-sourc.patch | 17 +++---- ...luez5-don-t-reactivate-default-profile-wh.patch | 13 ++---- ...Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch | 53 ++++++++++------------ 5 files changed, 52 insertions(+), 64 deletions(-) diff --git a/debian/patches/0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch b/debian/patches/0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch index 60a3ee1..a4be85b 100644 --- a/debian/patches/0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch +++ b/debian/patches/0505-bluetooth-bluez5-let-user-specify-a-default-profile-.patch @@ -8,11 +8,11 @@ Subject: [PATCH 505/507] bluetooth: bluez5: let user specify a default profile src/modules/bluetooth/module-bluez5-device.c | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) -diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c -index 999c254..07f88d0 100644 ---- a/src/modules/bluetooth/module-bluez5-device.c -+++ b/src/modules/bluetooth/module-bluez5-device.c -@@ -58,6 +58,7 @@ PA_MODULE_DESCRIPTION("BlueZ 5 Bluetooth audio sink and source"); +Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/module-bluez5-device.c ++++ pulseaudio/src/modules/bluetooth/module-bluez5-device.c +@@ -58,6 +58,7 @@ PA_MODULE_DESCRIPTION("BlueZ 5 Bluetooth PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE("path=<device object path> " @@ -20,7 +20,7 @@ index 999c254..07f88d0 100644 "sco_sink=<name of sink> " "sco_source=<name of source> "); -@@ -74,6 +75,7 @@ PA_MODULE_USAGE("path=<device object path> " +@@ -74,6 +75,7 @@ PA_MODULE_USAGE("path=<device object pat #define USE_SCO_OVER_PCM(u) (u->profile == PA_BLUETOOTH_PROFILE_HEADSET_HEAD_UNIT && (u->hsp.sco_sink && u->hsp.sco_source)) static const char* const valid_modargs[] = { "path", @@ -36,7 +36,7 @@ index 999c254..07f88d0 100644 bool transport_acquire_pending; pa_io_event *stream_event; }; -@@ -2069,6 +2072,7 @@ static int add_card(struct userdata *u) { +@@ -2068,6 +2071,7 @@ static int add_card(struct userdata *u) pa_bluetooth_profile_t *p; const char *uuid; void *state; @@ -44,7 +44,7 @@ index 999c254..07f88d0 100644 pa_assert(u); pa_assert(u->device); -@@ -2121,6 +2125,16 @@ static int add_card(struct userdata *u) { +@@ -2120,6 +2124,16 @@ static int add_card(struct userdata *u) *p = PA_BLUETOOTH_PROFILE_OFF; pa_hashmap_put(data.profiles, cp->name, cp); @@ -61,7 +61,7 @@ index 999c254..07f88d0 100644 u->card = pa_card_new(u->core, &data); pa_card_new_data_done(&data); if (!u->card) { -@@ -2132,6 +2146,15 @@ static int add_card(struct userdata *u) { +@@ -2131,6 +2145,15 @@ static int add_card(struct userdata *u) u->card->set_profile = set_profile_cb; p = PA_CARD_PROFILE_DATA(u->card->active_profile); @@ -77,7 +77,7 @@ index 999c254..07f88d0 100644 u->profile = *p; if (USE_SCO_OVER_PCM(u)) -@@ -2246,6 +2269,11 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa +@@ -2245,6 +2268,11 @@ static pa_hook_result_t transport_state_ if (t->device == u->device) handle_transport_state_change(u, t); @@ -89,7 +89,7 @@ index 999c254..07f88d0 100644 return PA_HOOK_OK; } -@@ -2503,6 +2531,10 @@ void pa__done(pa_module *m) { +@@ -2502,6 +2530,10 @@ void pa__done(pa_module *m) { if (u->modargs) pa_modargs_free(u->modargs); @@ -100,6 +100,3 @@ index 999c254..07f88d0 100644 pa_xfree(u); } --- -2.6.2 - diff --git a/debian/patches/0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch b/debian/patches/0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch index e86feed..96e0350 100644 --- a/debian/patches/0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch +++ b/debian/patches/0506-bluetooth-bluez5-prevent-SCO-sink-source-to-be-suspe.patch @@ -104,7 +104,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez5-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; -@@ -2036,6 +2103,13 @@ static int set_profile_cb(pa_card *c, pa +@@ -2035,6 +2102,13 @@ static int set_profile_cb(pa_card *c, pa if (!d->transports[*p] || d->transports[*p]->state <= PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED) { pa_log_warn("Refused to switch profile to %s: Not connected", new_profile->name); @@ -118,7 +118,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c return -PA_ERR_IO; } } -@@ -2162,6 +2236,7 @@ static int add_card(struct userdata *u) +@@ -2161,6 +2235,7 @@ static int add_card(struct userdata *u) pa_log_debug("Created card (current profile %s)", pa_bluetooth_profile_to_string(u->profile)); @@ -126,7 +126,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c return 0; } -@@ -2445,6 +2520,10 @@ int pa__init(pa_module* m) { +@@ -2444,6 +2519,10 @@ int pa__init(pa_module* m) { pa_hook_connect(&u->core->hooks[PA_CORE_HOOK_SOURCE_STATE_CHANGED], PA_HOOK_NORMAL, (pa_hook_cb_t) source_state_changed_cb, u); @@ -137,7 +137,7 @@ Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c if (add_card(u) < 0) goto fail; -@@ -2508,6 +2587,10 @@ void pa__done(pa_module *m) { +@@ -2507,6 +2586,10 @@ void pa__done(pa_module *m) { if (u->source_state_changed_slot) pa_hook_slot_free(u->source_state_changed_slot); diff --git a/debian/patches/0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch b/debian/patches/0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch index 9d408f0..4dfa37b 100644 --- a/debian/patches/0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch +++ b/debian/patches/0507-bluetooth-bluez5-drop-save-restore-of-SCO-sink-sourc.patch @@ -9,10 +9,10 @@ Still needs to be verified that this can be dropped. src/modules/bluetooth/module-bluez5-device.c | 24 ------------------------ 1 file changed, 24 deletions(-) -diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c -index f1e887c..c153aa5 100644 ---- a/src/modules/bluetooth/module-bluez5-device.c -+++ b/src/modules/bluetooth/module-bluez5-device.c +Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/module-bluez5-device.c ++++ pulseaudio/src/modules/bluetooth/module-bluez5-device.c @@ -109,9 +109,7 @@ typedef struct sbc_info { struct hsp_info { @@ -23,7 +23,7 @@ index f1e887c..c153aa5 100644 }; struct userdata { -@@ -2067,22 +2065,6 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid +@@ -2066,22 +2064,6 @@ static pa_card_profile *create_card_prof return cp; } @@ -46,7 +46,7 @@ index f1e887c..c153aa5 100644 /* Run from main thread */ static int set_profile_cb(pa_card *c, pa_card_profile *new_profile) { struct userdata *u; -@@ -2231,9 +2213,6 @@ static int add_card(struct userdata *u) { +@@ -2230,9 +2212,6 @@ static int add_card(struct userdata *u) p = PA_CARD_PROFILE_DATA(u->card->active_profile); u->profile = *p; @@ -56,7 +56,7 @@ index f1e887c..c153aa5 100644 pa_log_debug("Created card (current profile %s)", pa_bluetooth_profile_to_string(u->profile)); -@@ -2597,9 +2576,6 @@ void pa__done(pa_module *m) { +@@ -2596,9 +2575,6 @@ void pa__done(pa_module *m) { if (u->sbc_info.sbc_initialized) sbc_finish(&u->sbc_info.sbc); @@ -66,6 +66,3 @@ index f1e887c..c153aa5 100644 if (u->msg) pa_xfree(u->msg); --- -2.6.2 - diff --git a/debian/patches/0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch b/debian/patches/0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch index 04756b8..1279291 100644 --- a/debian/patches/0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch +++ b/debian/patches/0509-bluetooth-bluez5-don-t-reactivate-default-profile-wh.patch @@ -8,11 +8,11 @@ Subject: [PATCH] bluetooth: bluez5: don't reactivate default profile when off src/modules/bluetooth/module-bluez5-device.c | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c -index b4f81cd..8c5a9cc 100644 ---- a/src/modules/bluetooth/module-bluez5-device.c -+++ b/src/modules/bluetooth/module-bluez5-device.c -@@ -2323,11 +2323,6 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa +Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/module-bluez5-device.c ++++ pulseaudio/src/modules/bluetooth/module-bluez5-device.c +@@ -2322,11 +2322,6 @@ static pa_hook_result_t transport_state_ if (t->device == u->device) handle_transport_state_change(u, t); @@ -24,6 +24,3 @@ index b4f81cd..8c5a9cc 100644 return PA_HOOK_OK; } --- -2.5.0 - diff --git a/debian/patches/0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch b/debian/patches/0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch index 3f6606e..133bc68 100644 --- a/debian/patches/0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch +++ b/debian/patches/0510-Further-fixes-for-HFP-A2DP-with-BlueZ-5.x.patch @@ -10,11 +10,11 @@ Subject: [PATCH] Further fixes for HFP/A2DP with BlueZ 5.x src/modules/bluetooth/module-bluez5-device.c | 44 +++++++++++++++++++++++----- 4 files changed, 46 insertions(+), 9 deletions(-) -diff --git a/src/modules/bluetooth/backend-native.c b/src/modules/bluetooth/backend-native.c -index 1f65146..442bb64 100644 ---- a/src/modules/bluetooth/backend-native.c -+++ b/src/modules/bluetooth/backend-native.c -@@ -351,7 +351,8 @@ static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *m, +Index: pulseaudio/src/modules/bluetooth/backend-native.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/backend-native.c ++++ pulseaudio/src/modules/bluetooth/backend-native.c +@@ -351,7 +351,8 @@ static DBusMessage *profile_new_connecti goto fail; } @@ -24,11 +24,11 @@ index 1f65146..442bb64 100644 pa_log_error("Remote device %s supports HFP as well which is preferred over HSP. Aborting.", d->address); goto fail; -diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c -index 747384a..3acc4a5 100644 ---- a/src/modules/bluetooth/bluez5-util.c -+++ b/src/modules/bluetooth/bluez5-util.c -@@ -299,6 +299,12 @@ bool pa_bluetooth_device_any_transport_connected(const pa_bluetooth_device *d) { +Index: pulseaudio/src/modules/bluetooth/bluez5-util.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/bluez5-util.c ++++ pulseaudio/src/modules/bluetooth/bluez5-util.c +@@ -299,6 +299,12 @@ bool pa_bluetooth_device_any_transport_c return false; } @@ -41,11 +41,11 @@ index 747384a..3acc4a5 100644 static int transport_state_from_string(const char* value, pa_bluetooth_transport_state_t *state) { pa_assert(value); pa_assert(state); -diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h -index 3f97de7..9180263 100644 ---- a/src/modules/bluetooth/bluez5-util.h -+++ b/src/modules/bluetooth/bluez5-util.h -@@ -144,6 +144,8 @@ void pa_bluetooth_transport_unlink(pa_bluetooth_transport *t); +Index: pulseaudio/src/modules/bluetooth/bluez5-util.h +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/bluez5-util.h ++++ pulseaudio/src/modules/bluetooth/bluez5-util.h +@@ -144,6 +144,8 @@ void pa_bluetooth_transport_unlink(pa_bl void pa_bluetooth_transport_free(pa_bluetooth_transport *t); bool pa_bluetooth_device_any_transport_connected(const pa_bluetooth_device *d); @@ -54,10 +54,10 @@ index 3f97de7..9180263 100644 pa_bluetooth_device* pa_bluetooth_discovery_get_device_by_path(pa_bluetooth_discovery *y, const char *path); pa_bluetooth_device* pa_bluetooth_discovery_get_device_by_address(pa_bluetooth_discovery *y, const char *remote, const char *local); -diff --git a/src/modules/bluetooth/module-bluez5-device.c b/src/modules/bluetooth/module-bluez5-device.c -index 8c5a9cc..b4b627a 100644 ---- a/src/modules/bluetooth/module-bluez5-device.c -+++ b/src/modules/bluetooth/module-bluez5-device.c +Index: pulseaudio/src/modules/bluetooth/module-bluez5-device.c +=================================================================== +--- pulseaudio.orig/src/modules/bluetooth/module-bluez5-device.c ++++ pulseaudio/src/modules/bluetooth/module-bluez5-device.c @@ -165,6 +165,8 @@ struct userdata { char *default_profile; bool transport_acquire_pending; @@ -67,7 +67,7 @@ index 8c5a9cc..b4b627a 100644 }; typedef enum pa_bluetooth_form_factor { -@@ -2085,13 +2087,6 @@ static int set_profile_cb(pa_card *c, pa_card_profile *new_profile) { +@@ -2084,13 +2086,6 @@ static int set_profile_cb(pa_card *c, pa if (!d->transports[*p] || d->transports[*p]->state <= PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED) { pa_log_warn("Refused to switch profile to %s: Not connected", new_profile->name); @@ -81,7 +81,7 @@ index 8c5a9cc..b4b627a 100644 return -PA_ERR_IO; } } -@@ -2209,6 +2204,10 @@ static int add_card(struct userdata *u) { +@@ -2208,6 +2203,10 @@ static int add_card(struct userdata *u) u->card->active_profile = pa_hashmap_get(u->card->profiles, "off"); u->card->save_profile = false; } @@ -92,7 +92,7 @@ index 8c5a9cc..b4b627a 100644 p = PA_CARD_PROFILE_DATA(u->card->active_profile); u->profile = *p; -@@ -2308,6 +2307,23 @@ static pa_hook_result_t device_connection_changed_cb(pa_bluetooth_discovery *y, +@@ -2307,6 +2306,23 @@ static pa_hook_result_t device_connectio return PA_HOOK_OK; } @@ -116,7 +116,7 @@ index 8c5a9cc..b4b627a 100644 /* Run from main thread */ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa_bluetooth_transport *t, struct userdata *u) { pa_assert(t); -@@ -2317,7 +2333,13 @@ static pa_hook_result_t transport_state_changed_cb(pa_bluetooth_discovery *y, pa +@@ -2316,7 +2332,13 @@ static pa_hook_result_t transport_state_ pa_bluetooth_profile_to_string(t->profile), pa_bluetooth_transport_state_to_string(t->state)); @@ -131,7 +131,7 @@ index 8c5a9cc..b4b627a 100644 pa_assert_se(pa_card_set_profile(u->card, pa_hashmap_get(u->card->profiles, "off"), false) >= 0); if (t->device == u->device) -@@ -2504,6 +2526,9 @@ int pa__init(pa_module* m) { +@@ -2503,6 +2525,9 @@ int pa__init(pa_module* m) { if (!(u->msg = pa_msgobject_new(bluetooth_msg))) goto fail; @@ -141,7 +141,7 @@ index 8c5a9cc..b4b627a 100644 u->msg->parent.process_msg = device_process_msg; u->msg->card = u->card; -@@ -2589,6 +2614,9 @@ void pa__done(pa_module *m) { +@@ -2588,6 +2613,9 @@ void pa__done(pa_module *m) { if (u->default_profile) pa_xfree(u->default_profile); @@ -151,6 +151,3 @@ index 8c5a9cc..b4b627a 100644 pa_xfree(u); } --- -2.5.0 - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list pkg-pulseaudio-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel