bluez: refresh for bluez5

bluez is craply documented

contains changes needed for bluetooth audio playback
bluetooth playback tested successfully with
android mobile (source) to TI omap BeagleBoard (A2DP sink)

- install .conf files according to source code
- package bluetoothd
- new package examples for python commandline tools that might provide
  functionality without dbus
- other changes are needed (pulseaudio,sbc,uinput)

Signed-off-by: Dirk Neukirchen <[email protected]>

diff --git a/utils/bluez/Makefile b/utils/bluez/Makefile
index 8e394e351aaaa14656f95e0f2596dc1e9e7771d6..e3c0924c53f66cea72d140df1ab0df4e85b2d70d 100644 (file)
--- a/utils/bluez/Makefile
+++ b/utils/bluez/Makefile
@@ -29,6 +29,18 @@ define Package/bluez/Default
   URL:=http://www.bluez.org/
 endef
 
+define Package/bluez-examples
+$(call Package/bluez/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE+= python example apps
+  DEPENDS:=+python
+endef
+
+define Package/bluez-examples/description
+  contains many examples apps for bluetooth, requiring python
+endef
+
 define Package/bluez-libs
 $(call Package/bluez/Default)
   SECTION:=libs
@@ -42,10 +54,14 @@ $(call Package/bluez/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE+= utilities
-  DEPENDS:=+bluez-libs +libpthread +dbus +glib2 +libical +libncurses +libreadline $(INTL_DEPENDS) $(ICONV_DEPENDS)
+  DEPENDS:=+bluez-libs +libpthread +librt +dbus +glib2 +libical +libncurses +libreadline $(INTL_DEPENDS) $(ICONV_DEPENDS)
 endef
 
 define Package/bluez-utils/conffiles
+/etc/bluetooth/main.conf
+/etc/bluetooth/network.conf
+/etc/bluetooth/input.conf
+/etc/bluetooth/proximity.conf
 /etc/config/bluetooth
 endef
 
@@ -80,6 +96,11 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/
 endef
 
+define Package/bluez-examples/install
+       $(INSTALL_DIR) $(1)/usr/bin/bluez/
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/test/* $(1)/usr/bin/bluez/
+endef
+
 define Package/bluez-libs/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
@@ -88,13 +109,21 @@ endef
 define Package/bluez-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/bluetooth/bluetoothd $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/bluetooth/obexd $(1)/usr/bin
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DATA) ./files/bluetooth.config $(1)/etc/config/bluetooth
        $(INSTALL_DIR) $(1)/etc/dbus-1/system.d/
        $(INSTALL_DATA) ./files/bluetooth.dbus $(1)/etc/dbus-1/system.d/bluetooth.conf
+       $(INSTALL_DIR) $(1)/etc/bluetooth
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/main.conf $(1)/etc/bluetooth/main.conf
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/network/network.conf $(1)/etc/bluetooth/network.conf
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/input/input.conf $(1)/etc/bluetooth/input.conf
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/profiles/proximity/proximity.conf $(1)/etc/bluetooth/proximity.conf
        $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/bluez-utils.init $(1)/etc/init.d/bluez-utils
+       $(INSTALL_BIN) ./files/bluetoothd.init $(1)/etc/init.d/bluetoothd
 endef
 
+$(eval $(call BuildPackage,bluez-examples))
 $(eval $(call BuildPackage,bluez-libs))
 $(eval $(call BuildPackage,bluez-utils))