Revert "bluez: remove audio and alsa support"

This reverts commit 14a82dffa2bd0a846e8fcc464ff074fe098010f1.
This commit is contained in:
Stephan Raue 2013-06-09 16:47:33 +02:00
parent 350012acd4
commit 97ce065cc5
3 changed files with 26 additions and 2 deletions

View File

@ -22,6 +22,12 @@
. config/options . config/options
if [ "$ALSA_SUPPORT" = "yes" ]; then
BLUEZ_ALSA="--enable-audio --enable-alsa"
else
BLUEZ_ALSA="--disable-audio --disable-alsa"
fi
if [ "$DEBUG" = "yes" ]; then if [ "$DEBUG" = "yes" ]; then
DEBUG_CONFIG="--enable-debug" DEBUG_CONFIG="--enable-debug"
else else
@ -56,8 +62,7 @@ cd $PKG_BUILD
--enable-health \ --enable-health \
--disable-pnat \ --disable-pnat \
--disable-gstreamer \ --disable-gstreamer \
--disable-audio \ $BLUEZ_ALSA \
--disable-alsa \
--enable-usb \ --enable-usb \
--enable-datafiles \ --enable-datafiles \
--enable-pcmcia \ --enable-pcmcia \

View File

@ -30,6 +30,10 @@ mkdir -p $INSTALL/etc/bluetooth
cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth
cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth
if [ "$ALSA_SUPPORT" = yes ]; then
cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
fi
mkdir -p $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
@ -43,9 +47,19 @@ mkdir -p $INSTALL/lib/udev/rules.d
# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d # todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d # not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
if [ "$ALSA_SUPPORT" = yes ]; then
mkdir -p $INSTALL/usr/lib/alsa
cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
fi
mkdir -p $INSTALL/usr/lib/bluetooth/plugins
mkdir -p $INSTALL/usr/sbin mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/sbin cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/share/alsa
cp $PKG_BUILD/audio/bluetooth.conf $INSTALL/usr/share/alsa
if [ "$DEVTOOLS" = "yes" ]; then if [ "$DEVTOOLS" = "yes" ]; then
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin

View File

@ -34,3 +34,8 @@ PKG_LONGDESC="Bluetooth Tools and System Daemons for Linux."
PKG_IS_ADDON="no" PKG_IS_ADDON="no"
PKG_AUTORECONF="yes" PKG_AUTORECONF="yes"
if [ "$ALSA_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS alsa-lib"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS alsa-lib"
fi