diff options
Diffstat (limited to 'meta/recipes-connectivity/bluez')
10 files changed, 282 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch new file mode 100644 index 0000000000..0c77f1a20d --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Upstream-Status: Pending [package obsolete/not maintained by upstream] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac | ||
5 | --- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200 | ||
6 | +++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200 | ||
7 | @@ -2,7 +2,7 @@ | ||
8 | AC_INIT(bluez-hcidump, 2.5) | ||
9 | |||
10 | AM_INIT_AUTOMAKE([foreign subdir-objects]) | ||
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/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb new file mode 100644 index 0000000000..6bddcbacc3 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool." | ||
2 | DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \ | ||
3 | and displays the commands, events and data in a human-readable form." | ||
4 | |||
5 | SECTION = "console" | ||
6 | DEPENDS = "bluez4" | ||
7 | LICENSE = "GPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | ||
9 | file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf" | ||
10 | PR = "r1" | ||
11 | |||
12 | SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \ | ||
13 | file://obsolete_automake_macros.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18" | ||
17 | SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881" | ||
18 | S = "${WORKDIR}/bluez-hcidump-${PV}" | ||
19 | |||
20 | EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" | ||
21 | |||
22 | inherit autotools | ||
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/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.inc b/meta/recipes-connectivity/bluez/bluez4.inc new file mode 100644 index 0000000000..e4f6834d42 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4.inc | |||
@@ -0,0 +1,46 @@ | |||
1 | SUMMARY = "Linux Bluetooth Stack Userland V4" | ||
2 | DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries." | ||
3 | HOMEPAGE = "http://www.bluez.org" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "GPLv2+ & LGPLv2.1+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | ||
7 | file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ | ||
8 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ | ||
9 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" | ||
10 | DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" | ||
11 | RDEPENDS_${PN}-dev = "bluez-hcidump" | ||
12 | |||
13 | PACKAGECONFIG ??= "\ | ||
14 | ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ | ||
15 | ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ | ||
16 | " | ||
17 | PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" | ||
18 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," | ||
19 | |||
20 | ASNEEDED = "" | ||
21 | |||
22 | SRC_URI = "\ | ||
23 | ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ | ||
24 | " | ||
25 | S = "${WORKDIR}/bluez-${PV}" | ||
26 | |||
27 | inherit autotools | ||
28 | |||
29 | EXTRA_OECONF = "\ | ||
30 | --disable-gstreamer \ | ||
31 | --enable-usb \ | ||
32 | --enable-tools \ | ||
33 | --enable-bccmd \ | ||
34 | --enable-hid2hci \ | ||
35 | --enable-dfutool \ | ||
36 | --disable-hidd \ | ||
37 | --disable-pand \ | ||
38 | --disable-dund \ | ||
39 | --disable-cups \ | ||
40 | --enable-test \ | ||
41 | --enable-datafiles \ | ||
42 | --with-udevdir=`pkg-config --variable=udevdir udev` \ | ||
43 | --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ | ||
44 | " | ||
45 | |||
46 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb new file mode 100644 index 0000000000..d6c3e261f6 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb | |||
@@ -0,0 +1,41 @@ | |||
1 | require bluez4.inc | ||
2 | |||
3 | PR = "r5" | ||
4 | |||
5 | SRC_URI += "file://bluetooth.conf \ | ||
6 | file://sbc_mmx.patch \ | ||
7 | file://fix-udev-paths.patch \ | ||
8 | file://obsolete_automake_macros.patch \ | ||
9 | file://network-fix-network-Connect-method-parameters.patch \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" | ||
13 | SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487" | ||
14 | |||
15 | RCONFLICTS_${PN} = "bluez5" | ||
16 | |||
17 | do_install_append() { | ||
18 | install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ | ||
19 | install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ | ||
20 | install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ | ||
21 | # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT | ||
22 | install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ | ||
23 | } | ||
24 | |||
25 | RDEPENDS_${PN}-dev = "bluez-hcidump" | ||
26 | |||
27 | ALLOW_EMPTY_libasound-module-bluez = "1" | ||
28 | PACKAGES =+ "libasound-module-bluez" | ||
29 | |||
30 | FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" | ||
31 | FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" | ||
32 | FILES_${PN}-dev += "\ | ||
33 | ${libdir}/bluetooth/plugins/*.la \ | ||
34 | ${libdir}/alsa-lib/*.la \ | ||
35 | " | ||
36 | |||
37 | FILES_${PN}-dbg += "\ | ||
38 | ${libdir}/bluetooth/plugins/.debug \ | ||
39 | ${libdir}/*/.debug \ | ||
40 | */udev/.debug \ | ||
41 | " | ||
diff --git a/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb new file mode 100644 index 0000000000..f2dc0da06c --- /dev/null +++ b/meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | require bluez4.inc | ||
2 | require recipes-multimedia/gstreamer/gst-plugins-package.inc | ||
3 | |||
4 | PR = "r1" | ||
5 | |||
6 | SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" | ||
7 | SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487" | ||
8 | |||
9 | DEPENDS = "bluez4 gst-plugins-base" | ||
10 | |||
11 | EXTRA_OECONF = "\ | ||
12 | --enable-gstreamer \ | ||
13 | " | ||
14 | |||
15 | # clean unwanted files | ||
16 | do_install_append() { | ||
17 | rm -rf ${D}${bindir} | ||
18 | rm -rf ${D}${sbindir} | ||
19 | rm -f ${D}${libdir}/lib* | ||
20 | rm -rf ${D}${libdir}/pkgconfig | ||
21 | rm -rf ${D}${sysconfdir} | ||
22 | rm -rf ${D}${base_libdir} | ||
23 | rm -rf ${D}${libdir}/bluetooth | ||
24 | rm -rf ${D}${localstatedir} | ||
25 | rm -rf ${D}${libdir}/alsa-lib | ||
26 | rm -rf ${D}${datadir} | ||
27 | rm -rf ${D}${includedir} | ||
28 | } | ||
29 | |||
30 | FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so" | ||
31 | FILES_${PN}-dev += "\ | ||
32 | ${libdir}/gstreamer-0.10/*.la \ | ||
33 | " | ||
34 | |||
35 | FILES_${PN}-dbg += "\ | ||
36 | ${libdir}/*/.debug \ | ||
37 | " | ||
38 | |||