diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-04-15 18:09:52 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-04-15 18:09:52 (GMT) |
| commit | fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0 (patch) | |
| tree | 9b41479aa679f286ba72c516b8a1996b3851fa63 /abs/extra/bluez | |
| parent | c4b1cc7f705de9b4d539e8bba18170607e2c93f9 (diff) | |
| parent | ab2b92bf6743790902c68e764b7e28b4aa0a681a (diff) | |
| download | linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.zip linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.tar.gz linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.tar.bz2 | |
Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing
Conflicts:
abs/core/LinHES-system/PKGBUILD
Diffstat (limited to 'abs/extra/bluez')
| -rw-r--r-- | abs/extra/bluez/PKGBUILD | 11 | ||||
| -rw-r--r-- | abs/extra/bluez/__changelog | 3 | ||||
| -rw-r--r-- | abs/extra/bluez/audio-streaming.patch (renamed from abs/extra/bluez/bluez-4.98_audio-streaming.patch) | 1 | ||||
| -rw-r--r-- | abs/extra/bluez/bluez.install | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index c1f675a..e6837e9 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.99 -pkgrel=2 +pkgrel=3 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -26,11 +26,15 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') install='bluez.install' source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d') + 'bluetooth.conf.d' + 'audio-streaming.patch') build() { cd "${srcdir}/${pkgname}-${pkgver}" +# Add setting that allows audio streaming out-of-the-box + patch -Np1 -i ${srcdir}/audio-streaming.patch || return 1 + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -80,4 +84,5 @@ package() { # rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' - '7412982b440f29fa7f76a41a87fef985') + '7412982b440f29fa7f76a41a87fef985' + 'cc9c86af1ced7ad46fc7be114d32adfb') diff --git a/abs/extra/bluez/__changelog b/abs/extra/bluez/__changelog index 1c3b324..62a2048 100644 --- a/abs/extra/bluez/__changelog +++ b/abs/extra/bluez/__changelog @@ -14,3 +14,6 @@ http://article.gmane.org/gmane.comp.sysutils.supervision.general/1585/ - remove rc.bluetooth as we use runit - disable-cups - comment out removal of udev line + +2012-04-13 +re-add audio-streaming.patch for ootb audio streaming diff --git a/abs/extra/bluez/bluez-4.98_audio-streaming.patch b/abs/extra/bluez/audio-streaming.patch index 085d8ca..83705c5 100644 --- a/abs/extra/bluez/bluez-4.98_audio-streaming.patch +++ b/abs/extra/bluez/audio-streaming.patch @@ -11,4 +11,3 @@ + # Switch to master role for incoming connections (defaults to true) #Master=true - diff --git a/abs/extra/bluez/bluez.install b/abs/extra/bluez/bluez.install index f9b757b..30bd262 100644 --- a/abs/extra/bluez/bluez.install +++ b/abs/extra/bluez/bluez.install @@ -2,12 +2,12 @@ post_install() { add_service.sh bluetoothd echo ">>> Only the bluetoothd daemon is started by default." echo ">>> You can optionally add the following as required:" - echo ">>> hidd dund pand rfcomm" + echo ">>> hidd dund pand sdpd rfcomm hid2hci" echo ">>> $ sudo add_service.sh <service_name>" } pre_remove() { - for d in { bluetoothd,hidd,dund,pand,rfcomm } ; do + for d in { bluetoothd,hidd,dund,pand,sdpd,rfcomm,hid2hci } ; do if [ -d /var/service/${d} ] ; then remove_servcie.sh $d fi |