diff options
Diffstat (limited to 'meta/recipes-connectivity/bluez/bluez4-4.101')
7 files changed, 174 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf new file mode 100644 index 0000000000..ca5e9e4f2f --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf | |||
@@ -0,0 +1,16 @@ | |||
1 | <!-- This configuration file specifies the required security policies | ||
2 | for Bluetooth core daemon to work. --> | ||
3 | |||
4 | <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" | ||
5 | "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> | ||
6 | <busconfig> | ||
7 | |||
8 | <!-- ../system.conf have denied everything, so we just punch some holes --> | ||
9 | |||
10 | <policy context="default"> | ||
11 | <allow own="org.bluez"/> | ||
12 | <allow send_destination="org.bluez"/> | ||
13 | <allow send_interface="org.bluez.Agent"/> | ||
14 | </policy> | ||
15 | |||
16 | </busconfig> | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch new file mode 100644 index 0000000000..80899148ee --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Add udevdir/udevrulesdir options | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
5 | |||
6 | Index: bluez-4.101/Makefile.am | ||
7 | =================================================================== | ||
8 | --- bluez-4.101.orig/Makefile.am | ||
9 | +++ bluez-4.101/Makefile.am | ||
10 | @@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf | ||
11 | include Makefile.tools | ||
12 | |||
13 | if DATAFILES | ||
14 | -rulesdir = @UDEV_DIR@/rules.d | ||
15 | +rulesdir = @UDEV_RULES_DIR@ | ||
16 | |||
17 | udev_files = | ||
18 | |||
19 | Index: bluez-4.101/configure.ac | ||
20 | =================================================================== | ||
21 | --- bluez-4.101.orig/configure.ac | ||
22 | +++ bluez-4.101/configure.ac | ||
23 | @@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then | ||
24 | fi | ||
25 | AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") | ||
26 | |||
27 | +AC_ARG_WITH([udevdir], | ||
28 | + AS_HELP_STRING([--with-udevdir=DIR], [udev directory]), | ||
29 | + [], [with_udevdir=/lib/udev/]) | ||
30 | +AC_SUBST([UDEV_DIR], [$with_udevdir]) | ||
31 | + | ||
32 | +AC_ARG_WITH([udevrulesdir], | ||
33 | + AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]), | ||
34 | + [], [with_udevrulesdir=/lib/udev/rules.d]) | ||
35 | +AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir]) | ||
36 | + | ||
37 | AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc) | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch new file mode 100644 index 0000000000..23f7d999b3 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | Install the bluez's test scripts | ||
4 | |||
5 | Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com> | ||
6 | diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools | ||
7 | --- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800 | ||
8 | +++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800 | ||
9 | @@ -227,6 +227,17 @@ | ||
10 | test/service-spp.xml test/service-opp.xml test/service-ftp.xml \ | ||
11 | test/simple-player test/test-nap | ||
12 | |||
13 | +bluez4_testdir = $(libdir)/bluez4/test/ | ||
14 | +dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \ | ||
15 | + test/monitor-bluetooth test/list-devices \ | ||
16 | + test/test-discovery test/test-manager test/test-adapter \ | ||
17 | + test/test-device test/test-service test/test-serial \ | ||
18 | + test/test-telephony test/test-network test/simple-agent \ | ||
19 | + test/simple-service test/simple-endpoint test/test-audio \ | ||
20 | + test/test-input test/test-sap-server test/test-oob \ | ||
21 | + test/test-attrib test/test-proximity test/test-thermometer \ | ||
22 | + test/test-serial-proxy test/test-health test/test-health-sink \ | ||
23 | + test/simple-player test/test-nap | ||
24 | if HIDD | ||
25 | bin_PROGRAMS += compat/hidd | ||
26 | |||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch new file mode 100644 index 0000000000..37f919926e --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
3 | |||
4 | From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001 | ||
5 | From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> | ||
6 | Date: Sat, 30 Jun 2012 00:39:05 -0300 | ||
7 | Subject: [PATCH] network: fix network Connect() method parameters | ||
8 | |||
9 | --- | ||
10 | network/connection.c | 4 +++- | ||
11 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/network/connection.c b/network/connection.c | ||
14 | index 544ec3a..59423a9 100644 | ||
15 | --- a/network/connection.c | ||
16 | +++ b/network/connection.c | ||
17 | @@ -554,7 +554,9 @@ static void path_unregister(void *data) | ||
18 | |||
19 | static const GDBusMethodTable connection_methods[] = { | ||
20 | { GDBUS_ASYNC_METHOD("Connect", | ||
21 | - NULL, NULL, connection_connect) }, | ||
22 | + GDBUS_ARGS({"uuid", "s"}), | ||
23 | + GDBUS_ARGS({"interface", "s"}), | ||
24 | + connection_connect) }, | ||
25 | { GDBUS_METHOD("Disconnect", | ||
26 | NULL, NULL, connection_disconnect) }, | ||
27 | { GDBUS_METHOD("GetProperties", | ||
28 | -- | ||
29 | 1.7.9.5 | ||
30 | |||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch new file mode 100644 index 0000000000..1068f2482a --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac | ||
5 | --- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300 | ||
6 | +++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200 | ||
7 | @@ -2,7 +2,7 @@ | ||
8 | AC_INIT(bluez, 4.101) | ||
9 | |||
10 | AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch new file mode 100644 index 0000000000..98fab458b0 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | on x86 and x86_64 gcc 4.7 complains | ||
2 | |||
3 | sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx': | ||
4 | sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default] | ||
5 | sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm' | ||
6 | |||
7 | This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871 | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Index: bluez-4.98/sbc/sbc_primitives_mmx.c | ||
13 | =================================================================== | ||
14 | --- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800 | ||
15 | +++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800 | ||
16 | @@ -318,7 +318,7 @@ | ||
17 | "movl %k0, 4(%3)\n" | ||
18 | : "+r" (blk) | ||
19 | : "r" (&sb_sample_f[0][ch][sb]), | ||
20 | - "i" ((char *) &sb_sample_f[1][0][0] - | ||
21 | + "r" ((char *) &sb_sample_f[1][0][0] - | ||
22 | (char *) &sb_sample_f[0][0][0]), | ||
23 | "r" (&scale_factor[ch][sb]), | ||
24 | "r" (&consts), | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch new file mode 100644 index 0000000000..37037f52e3 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | use legacy pygobject instead of gobject-introspection | ||
4 | |||
5 | Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com> | ||
6 | --- | ||
7 | diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent | ||
8 | --- bluez-4.101.orig/test/simple-agent 2013-11-13 17:14:08.138118159 +0800 | ||
9 | +++ bluez-4.101/test/simple-agent 2013-11-13 17:14:29.034118107 +0800 | ||
10 | @@ -2,7 +2,7 @@ | ||
11 | |||
12 | from __future__ import absolute_import, print_function, unicode_literals | ||
13 | |||
14 | -from gi.repository import GObject | ||
15 | +import gobject | ||
16 | |||
17 | import sys | ||
18 | import dbus | ||
19 | @@ -122,7 +122,7 @@ | ||
20 | path = "/test/agent" | ||
21 | agent = Agent(bus, path) | ||
22 | |||
23 | - mainloop = GObject.MainLoop() | ||
24 | + mainloop = gobject.MainLoop() | ||
25 | |||
26 | if len(args) > 1: | ||
27 | if len(args) > 2: | ||