Hello community, here is the log from the commit of package bluez-hcidump for openSUSE:Factory checked in at Wed Apr 27 11:14:59 CEST 2011.
-------- --- bluez-hcidump/bluez-hcidump.changes 2011-01-28 14:58:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez-hcidump/bluez-hcidump.changes 2011-04-22 11:31:17.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Apr 22 09:26:52 UTC 2011 - seife+...@b1-systems.com + +- fix build against latest bluez by cherry-picking b888b106a9 from + git, but still retaining compatibility with opensuse 11.4 +- buildrequire bluez-devel >= 4.70, when d13ea8a6 in bluez.git + addes several constants which are needed by bluez-hcidump + probably even a newer version is needed... + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Fix-compilation-against-latest-BlueZ.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-hcidump.spec ++++++ --- /var/tmp/diff_new_pack.klpyuc/_old 2011-04-27 11:13:43.000000000 +0200 +++ /var/tmp/diff_new_pack.klpyuc/_new 2011-04-27 11:13:43.000000000 +0200 @@ -20,16 +20,18 @@ Name: bluez-hcidump -BuildRequires: bluez bluez-devel pkgconfig +BuildRequires: bluez pkgconfig +BuildRequires: bluez-devel >= 4.70 Url: http://www.bluez.org Version: 2.0 -Release: 1 +Release: 6 Summary: HCI Dumper for Debugging Bluetooth Connections License: GPLv2+ PreReq: %insserv_prereq Group: Development/Tools/Debuggers AutoReqProv: on Source: http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-2.0.tar.bz2 +Patch: 0001-Fix-compilation-against-latest-BlueZ.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # not sure if we really need a specific bluez version, or if we need bluez at all # maybe libbluetooth is enough @@ -48,6 +50,10 @@ %prep %setup +%if 0%{?suse_version} > 1140 +# actually it's 'bluez-devel > 4.90' +%patch -p1 +%endif %build CFLAGS="$RPM_OPT_FLAGS" ./configure \ ++++++ 0001-Fix-compilation-against-latest-BlueZ.patch ++++++ >From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001 From: Anderson Lizardo <anderson.liza...@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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
