[Pkg-bluetooth-commits] r1040 - in /packages/bluez-hcidump/trunk/debian: changelog patches/ patches/0001-Fix-compilation-against-latest-BlueZ.patch patches/series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Apr 20 02:55:58 2011
New Revision: 1040

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1040
Log:
Add patches dir and 0001-Fix-compilation-against-latest-BlueZ.patch

Added:
    packages/bluez-hcidump/trunk/debian/patches/
    packages/bluez-hcidump/trunk/debian/patches/0001-Fix-compilation-against-latest-BlueZ.patch
    packages/bluez-hcidump/trunk/debian/patches/series
Modified:
    packages/bluez-hcidump/trunk/debian/changelog

Modified: packages/bluez-hcidump/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-hcidump/trunk/debian/changelog?rev=1040&op=diff
==============================================================================
--- packages/bluez-hcidump/trunk/debian/changelog (original)
+++ packages/bluez-hcidump/trunk/debian/changelog Wed Apr 20 02:55:58 2011
@@ -1,3 +1,9 @@
+bluez-hcidump (2.0-3) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 10 Feb 2011 18:51:03 +0900
+
 bluez-hcidump (2.0-2) unstable; urgency=low
 
   * Upload to unstable. 

Added: packages/bluez-hcidump/trunk/debian/patches/0001-Fix-compilation-against-latest-BlueZ.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-hcidump/trunk/debian/patches/0001-Fix-compilation-against-latest-BlueZ.patch?rev=1040&op=file
==============================================================================
--- packages/bluez-hcidump/trunk/debian/patches/0001-Fix-compilation-against-latest-BlueZ.patch (added)
+++ packages/bluez-hcidump/trunk/debian/patches/0001-Fix-compilation-against-latest-BlueZ.patch Wed Apr 20 02:55:58 2011
@@ -1,0 +1,53 @@
+From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001
+From: Anderson Lizardo <anderson.lizardo at openbossa.org>
+Date: Fri, 18 Mar 2011 15:10:19 -0400
+Subject: [PATCH] Fix compilation against latest BlueZ
+
+BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
+hcidump local copy is not necessary.
+
+Origin: upstream, http://git.kernel.org/?p=bluetooth/bluez-hcidump.git;a=commit;h=95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8
+Bug: http://marc.info/?l=linux-bluetooth&m=130047543724039&w=2
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623420
+
+From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001
+From: Anderson Lizardo <anderson.lizardo at openbossa.org>
+Date: Fri, 18 Mar 2011 15:10:19 -0400
+Subject: [PATCH] Fix compilation against latest BlueZ
+
+BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
+hcidump local copy is not necessary.
+---
+ src/hcidump.c |   16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+diff --git a/src/hcidump.c b/src/hcidump.c
+index af086c7..2023130 100644
+--- a/src/hcidump.c
++++ b/src/hcidump.c
+@@ -50,22 +50,6 @@
+ #include "parser/parser.h"
+ #include "parser/sdp.h"
+ 
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
+-static inline uint64_t ntoh64(uint64_t n)
+-{
+-	uint64_t h;
+-	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
+-	h = ntohl(n >> 32);
+-	h |= tmp << 32;
+-	return h;
+-}
+-#elif __BYTE_ORDER == __BIG_ENDIAN
+-#define ntoh64(x) (x)
+-#else
+-#error "Unknown byte order"
+-#endif
+-#define hton64(x) ntoh64(x)
+-
+ #define SNAP_LEN 	HCI_MAX_FRAME_SIZE
+ #define DEFAULT_PORT	"10839";
+ 
+-- 
+1.7.4.1
+

Added: packages/bluez-hcidump/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-hcidump/trunk/debian/patches/series?rev=1040&op=file
==============================================================================
--- packages/bluez-hcidump/trunk/debian/patches/series (added)
+++ packages/bluez-hcidump/trunk/debian/patches/series Wed Apr 20 02:55:58 2011
@@ -1,0 +1,1 @@
+0001-Fix-compilation-against-latest-BlueZ.patch