bluez: add 4 patches from Debian/Ubuntu.

This commit is contained in:
Juan RP 2012-05-24 17:45:44 +02:00
parent 3871289ae6
commit 11b2a36b45
5 changed files with 118 additions and 1 deletions

View file

@ -0,0 +1,19 @@
Description: a2dpsink should have a rank < GST_RANK_MARGINAL
Author: Sebastian Dröge <slomo@circular-chaos.org>
Origin: Sebastian Dröge <slomo@circular-chaos.org>
Updated by Nobuhiro Iwamatsu <iwamatsu@debian.org>
Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571595
--- audio/gsta2dpsink.c
+++ audio/gsta2dpsink.c
@@ -725,6 +725,6 @@ static void gst_a2dp_sink_init(GstA2dpSink *self,
gboolean gst_a2dp_sink_plugin_init(GstPlugin *plugin)
{
return gst_element_register(plugin, "a2dpsink",
- GST_RANK_MARGINAL, GST_TYPE_A2DP_SINK);
+ GST_RANK_MARGINAL-1, GST_TYPE_A2DP_SINK);
}
--
1.7.5.4

View file

@ -0,0 +1,61 @@
Description: bluez: getting a "Logitech, Inc. diNovo Edge Keyboard" working
Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Origin: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626975
--- tools/hid2hci.c
+++ tools/hid2hci.c
@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
enum mode mode = HCI;
const char *devpath = NULL;
int err = -1;
- int rc = 1;
+ int rc = 0;
for (;;) {
int option;
@@ -288,13 +288,16 @@ int main(int argc, char *argv[])
}
udev = udev_new();
- if (udev == NULL)
+ if (udev == NULL) {
+ rc = errno;
goto exit;
+ }
snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath);
udev_dev = udev_device_new_from_syspath(udev, syspath);
if (udev_dev == NULL) {
fprintf(stderr, "error: could not find '%s'\n", devpath);
+ rc = errno;
goto exit;
}
@@ -312,6 +315,7 @@ int main(int argc, char *argv[])
dev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device");
if (dev == NULL) {
fprintf(stderr, "error: could not find usb_device for '%s'\n", devpath);
+ rc = errno;
goto exit;
}
}
@@ -320,6 +324,7 @@ int main(int argc, char *argv[])
if (handle == NULL) {
fprintf(stderr, "error: unable to handle '%s'\n",
udev_device_get_syspath(dev));
+ rc = errno;
goto exit;
}
err = usb_switch(handle, mode);
@@ -331,6 +336,7 @@ int main(int argc, char *argv[])
device = udev_device_get_devnode(udev_dev);
if (device == NULL) {
fprintf(stderr, "error: could not find hiddev device node\n");
+ rc = errno;
goto exit;
}
err = hid_switch_logitech(device);
--
1.7.5.4

View file

@ -0,0 +1,20 @@
From: Jesse Sung <jesse.sung@canonical.com>
Subject: Unregister the SAP dummy interface on exit.
This fixes error messages when the rfkill switch is toggled:
bluetoothd[5416]: sap/manager.c:sap_server_probe() path /org/bluez/5416/hci0
bluetoothd[5416]: sap-dummy interface org.bluez.SimAccessTest init failed on path /org/bluez/test
bluetoothd[5416]: Sap driver initialization failed.
bluetoothd[5416]: sap-server: Operation not permitted (1
--- sap/sap-dummy.c 2012-03-16 17:07:43.626644579 +0800
+++ sap/sap-dummy.c 2012-03-16 17:10:32.774636738 +0800
@@ -340,6 +340,7 @@
void sap_exit(void)
{
+ g_dbus_unregister_interface(connection, SAP_DUMMY_PATH, SAP_DUMMY_IFACE);
dbus_connection_unref(connection);
connection = NULL;
}

View file

@ -0,0 +1,17 @@
From: Jesse Sung <jesse.sung@canonical.com>
Subject: Shutdown the IO channel for the HFP server on exit.
When the rfkill switch is toggled, the channel is unref'd before being closed,
which lead to issues with the interfaces properly getting brought back up
when the rfkill switch gets back to a non-blocked state.
--- audio/manager.c 2012-03-21 16:27:23.000000000 +0800
+++ audio/manager.c 2012-03-21 16:29:52.340242119 +0800
@@ -990,6 +990,7 @@
}
if (adp->hfp_hs_server) {
+ g_io_channel_shutdown(adp->hfp_hs_server, TRUE, NULL);
g_io_channel_unref(adp->hfp_hs_server);
adp->hfp_hs_server = NULL;
}

View file

@ -1,7 +1,7 @@
# Template file for 'bluez' # Template file for 'bluez'
pkgname=bluez pkgname=bluez
version=4.99 version=4.99
revision=3 revision=4
distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
build_style=gnu-configure build_style=gnu-configure
configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund