diff options
Diffstat (limited to 'source/n/bluez-hcidump')
| -rwxr-xr-x | source/n/bluez-hcidump/bluez-hcidump.SlackBuild | 11 | ||||
| -rw-r--r-- | source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch | 21 |
2 files changed, 4 insertions, 28 deletions
diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild index ac2a8442c..e03037ab4 100755 --- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild +++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006-2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ PKGNAM=bluez-hcidump -VERSION=${VERSION:-1.42} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.0} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,7 +59,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Make sure ownerships and permissions are sane: @@ -70,9 +70,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch to build with bluez+>4.61 -zcat $CWD/hci.c_for_bluez-4.61.patch.gz | patch -p1 || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch b/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch deleted file mode 100644 index bcd6b4a0a..000000000 --- a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur bluez-hcidump-1.42.orig//parser/hci.c bluez-hcidump-1.42/parser/hci.c ---- bluez-hcidump-1.42.orig//parser/hci.c 2008-06-15 07:46:13.000000000 -0500 -+++ bluez-hcidump-1.42/parser/hci.c 2010-03-02 23:15:35.171713301 -0600 -@@ -1973,7 +1973,7 @@ - - static inline void read_inquiry_transmit_power_level_dump(int level, struct frame *frm) - { -- read_inquiry_transmit_power_level_rp *rp = frm->ptr; -+ read_inq_response_tx_power_level_rp *rp = frm->ptr; - - p_indent(level, frm); - printf("status 0x%2.2x level %d\n", rp->status, rp->level); -@@ -2325,7 +2325,7 @@ - case OCF_READ_EXT_INQUIRY_RESPONSE: - read_ext_inquiry_response_dump(level, frm); - return; -- case OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL: -+ case OCF_READ_INQ_RESPONSE_TX_POWER_LEVEL: - read_inquiry_transmit_power_level_dump(level, frm); - return; - case OCF_READ_DEFAULT_ERROR_DATA_REPORTING: |