mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-06 16:58:24 +00:00
bluez4: merge .inc file to .bb file itself
* .inc file are not so usefull with one version per package rule * remove unsupported configure options * fix --enable-pand option, there is not extra 'd' * remove update-rc.d inherit as init.d script is not created anymore * enable udevrules by default (distros can override it from their layer) * use FILESPATH from oe-core layer for patches instead of duplicating them here * netlink option removed in http://git.kernel.org/?p=bluetooth/bluez.git;a=blobdiff;f=configure.ac;h=63a0fd89f5836ab6d114bb52c49f73adba26369a;hp=eee4c01bd1dd72b53f121c7820b6b93ba3d48032;hb=ecb835fca7e7134f38a3d061d186eb38d83bcb8b;hpb=c681fac492394bb95f164296056068dad1254921 * sbc-thumb.patch was applied upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
@@ -1,71 +0,0 @@
|
||||
DESCRIPTION = "Linux Bluetooth Stack Userland V4"
|
||||
HOMEPAGE = "http://www.bluez.org"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "GPLv2/LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
|
||||
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
|
||||
"
|
||||
DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
|
||||
INC_PR = "r8"
|
||||
|
||||
# temporary solution until bug 5176 is properly fixed
|
||||
PROVIDES += "bluez-utils bluez-libs bluez-utils-dbus"
|
||||
RPROVIDES_bluez4 += "bluez-utils bluez-libs bluez-utils-dbus"
|
||||
RPROVIDES_bluez4-dev = "bluez-libs-dev"
|
||||
|
||||
SRC_URI = "\
|
||||
http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
|
||||
file://fix-dfutool-usb-declaration-mismatch.patch \
|
||||
file://bluetooth.conf \
|
||||
"
|
||||
S = "${WORKDIR}/bluez-${PV}"
|
||||
|
||||
inherit autotools update-rc.d
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--enable-gstreamer \
|
||||
--enable-alsa \
|
||||
--enable-usb \
|
||||
--enable-netlink \
|
||||
--enable-tools \
|
||||
--enable-bccmd \
|
||||
--enable-hid2hci \
|
||||
--enable-dfutool \
|
||||
--enable-hidd \
|
||||
--enable-pand \
|
||||
--enable-dund \
|
||||
--disable-cups \
|
||||
--enable-test \
|
||||
--enable-manpages \
|
||||
--enable-configfiles \
|
||||
--enable-initscripts \
|
||||
--disable-pcmciarules \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
|
||||
install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
|
||||
install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
|
||||
# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
|
||||
install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
|
||||
}
|
||||
|
||||
INITSCRIPT_NAME = "bluetooth"
|
||||
INITSCRIPT_PARAMS = "defaults 23 19"
|
||||
|
||||
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
|
||||
|
||||
FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
|
||||
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa/bluetooth.conf"
|
||||
FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev"
|
||||
FILES_${PN}-dev += "\
|
||||
${libdir}/bluetooth/plugins/*.la \
|
||||
${libdir}/alsa-lib/*.la \
|
||||
${libdir}/gstreamer-0.10/*.la \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += "\
|
||||
${libdir}/bluetooth/plugins/.debug \
|
||||
${libdir}/*/.debug \
|
||||
"
|
||||
@@ -1,16 +0,0 @@
|
||||
<!-- This configuration file specifies the required security policies
|
||||
for Bluetooth core daemon to work. -->
|
||||
|
||||
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
|
||||
<busconfig>
|
||||
|
||||
<!-- ../system.conf have denied everything, so we just punch some holes -->
|
||||
|
||||
<policy context="default">
|
||||
<allow own="org.bluez"/>
|
||||
<allow send_destination="org.bluez"/>
|
||||
<allow send_interface="org.bluez.Agent"/>
|
||||
</policy>
|
||||
|
||||
</busconfig>
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: bluez-4.27/tools/dfutool.c
|
||||
===================================================================
|
||||
--- bluez-4.27.orig/tools/dfutool.c
|
||||
+++ bluez-4.27/tools/dfutool.c
|
||||
@@ -59,7 +59,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef NEED_USB_GET_BUSSES
|
||||
-static inline struct usb_bus *usb_get_busses(void)
|
||||
+inline struct usb_bus *usb_get_busses(void)
|
||||
{
|
||||
return usb_busses;
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
# Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
#
|
||||
# Use the new usb1 API for usb_init() and check for fails from
|
||||
# usb_init (). Currently we see a crash on a system which does
|
||||
# not have USB because usb_init() fails and it cleans up all initialized
|
||||
# data (e.g. ctx) which is used in subsequent calls to libusb
|
||||
# We return immediately if usb_init() fails for some reason.
|
||||
|
||||
Index: bluez-4.24/tools/hid2hci.c
|
||||
===================================================================
|
||||
--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
|
||||
+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
|
||||
@@ -337,7 +337,7 @@
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
struct device_info dev[16];
|
||||
- int i, opt, num, quiet = 0, mode = HCI;
|
||||
+ int i, ret, opt, num, quiet = 0, mode = HCI;
|
||||
|
||||
while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
|
||||
switch (opt) {
|
||||
@@ -361,8 +361,9 @@
|
||||
argc -= optind;
|
||||
argv += optind;
|
||||
optind = 0;
|
||||
-
|
||||
- usb_init();
|
||||
+ ret = libusb_init();
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
|
||||
num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
|
||||
if (num <= 0) {
|
||||
@@ -1,11 +0,0 @@
|
||||
--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
|
||||
+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
#define SBC_FIXED_0(val) { val = 0; }
|
||||
#define MUL(a, b) ((a) * (b))
|
||||
-#ifdef __arm__
|
||||
+#if defined(__arm__) && !defined(__thumb__)
|
||||
#define MULA(a, b, res) ({ \
|
||||
int tmp = res; \
|
||||
__asm__( \
|
||||
@@ -1,15 +1,70 @@
|
||||
require bluez4.inc
|
||||
SUMMARY = "Linux Bluetooth Stack Userland V4"
|
||||
DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
|
||||
HOMEPAGE = "http://www.bluez.org"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "GPLv2+ & LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
|
||||
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
|
||||
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
|
||||
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
|
||||
DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
|
||||
RDEPENDS_${PN}-dev = "bluez-hcidump"
|
||||
|
||||
ASNEEDED = ""
|
||||
|
||||
PR = "r9"
|
||||
|
||||
# to find bluez patches from oe-core
|
||||
FILESPATH =. "${POKYBASE}/meta/recipes-connectivity/bluez/bluez4-4.82/:"
|
||||
SRC_URI = "\
|
||||
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
|
||||
file://fix-dfutool-usb-declaration-mismatch.patch \
|
||||
file://bluetooth.conf \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "3059b7ef5168c84cd0c6a67034ce79f9"
|
||||
SRC_URI[sha256sum] = "11e9279e2669db996afd464b96d2c68f41f157f6eb9b8842a0bbcad8a4eac18d"
|
||||
S = "${WORKDIR}/bluez-${PV}"
|
||||
|
||||
DEPENDS += "libsndfile1"
|
||||
inherit autotools
|
||||
|
||||
PR = "${INC_PR}.0"
|
||||
EXTRA_OECONF = "\
|
||||
--enable-gstreamer \
|
||||
--enable-alsa \
|
||||
--enable-usb \
|
||||
--enable-tools \
|
||||
--enable-bccmd \
|
||||
--enable-hid2hci \
|
||||
--enable-dfutool \
|
||||
--enable-hidd \
|
||||
--enable-pand \
|
||||
--enable-dund \
|
||||
--disable-cups \
|
||||
--enable-test \
|
||||
--enable-configfiles \
|
||||
"
|
||||
|
||||
# Not all distros have a recent enough udev
|
||||
BTUDEV = " --disable-udevrules"
|
||||
BTUDEV_angstrom = " --enable-udevrules"
|
||||
BTUDEV_shr = " --enable-udevrules"
|
||||
do_install_append() {
|
||||
install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
|
||||
install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
|
||||
install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
|
||||
# at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
|
||||
install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
|
||||
}
|
||||
|
||||
EXTRA_OECONF += "${BTUDEV}"
|
||||
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
|
||||
|
||||
FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
|
||||
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
|
||||
FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
|
||||
FILES_${PN}-dev += "\
|
||||
${libdir}/bluetooth/plugins/*.la \
|
||||
${libdir}/alsa-lib/*.la \
|
||||
${libdir}/gstreamer-0.10/*.la \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += "\
|
||||
${libdir}/bluetooth/plugins/.debug \
|
||||
${libdir}/*/.debug \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user