Hello community,
here is the log from the commit of package bluez for openSUSE:Factory
checked in at Tue Dec 29 19:03:31 CET 2009.
--------
--- bluez/bluez-gstreamer.changes 2009-11-16 09:09:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/bluez/bluez-gstreamer.changes 2009-12-29 11:46:02.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Dec 29 10:14:59 UTC 2009 - seife@opensuse.org
+
+- update to bluez-4.59:
+ - Add values for Bluetooth 4.0 specification.
+ - Add SDP functions for HDP support.
+ - Add test scripts for input and audio.
+ - Fix missing close on BtIO create_io function.
+ - Fix sending incorrect AVDTP commands after timeout occurs.
+ - Fix timer removal when device disconnects unexpectedly.
+ - Fix Extended Inquiry Response record for Device ID.
+- silence rpmlint warning on bluez-coldplug init script
+
+-------------------------------------------------------------------
bluez.changes: same change
calling whatdependson for head-i586
Old:
----
bluez-4.58.tar.bz2
New:
----
bluez-4.59.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.wvGoyj/_old 2009-12-29 19:03:15.000000000 +0100
+++ /var/tmp/diff_new_pack.wvGoyj/_new 2009-12-29 19:03:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bluez-gstreamer (Version 4.58)
+# spec file for package bluez-gstreamer (Version 4.59)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
BuildRequires: alsa-devel libsndfile-devel pkg-config udev
BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
Url: http://www.bluez.org
-Version: 4.58
+Version: 4.59
Release: 1
Summary: Bluetooth Sound Support
Group: Productivity/Multimedia/Sound/Utilities
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.wvGoyj/_old 2009-12-29 19:03:15.000000000 +0100
+++ /var/tmp/diff_new_pack.wvGoyj/_new 2009-12-29 19:03:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bluez (Version 4.58)
+# spec file for package bluez (Version 4.59)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
BuildRequires: glib2-devel libnl-devel libusb-devel
BuildRequires: alsa-devel libsndfile-devel pkg-config udev
Url: http://www.bluez.org
-Version: 4.58
+Version: 4.59
Release: 1
Summary: Bluetooth Stack for Linux
Group: Hardware/Mobile
@@ -208,9 +208,11 @@
simple-agent \
simple-service \
list-devices \
+ test-audio \
test-adapter \
test-device \
test-discovery \
+ test-input \
test-manager \
test-network \
test-serial \
@@ -320,8 +322,10 @@
%{_bindir}/simple-agent
%{_bindir}/simple-service
%{_bindir}/test-adapter
+%{_bindir}/test-audio
%{_bindir}/test-device
%{_bindir}/test-discovery
+%{_bindir}/test-input
%{_bindir}/test-manager
%{_bindir}/test-network
%{_bindir}/test-serial
++++++ bluez-4.58.tar.bz2 -> bluez-4.59.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/ChangeLog new/bluez-4.59/ChangeLog
--- old/bluez-4.58/ChangeLog 2009-11-15 03:04:13.000000000 +0100
+++ new/bluez-4.59/ChangeLog 2009-12-24 17:42:21.000000000 +0100
@@ -1,3 +1,12 @@
+ver 4.59:
+ Add values for Bluetooth 4.0 specification.
+ Add SDP functions for HDP support.
+ Add test scripts for input and audio.
+ Fix missing close on BtIO create_io function.
+ Fix sending incorrect AVDTP commands after timeout occurs.
+ Fix timer removal when device disconnects unexpectedly.
+ Fix Extended Inquiry Response record for Device ID.
+
ver 4.58:
Fix crash when adapter agent exists during authentication.
Fix CK-20W quirks for play and pause events.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/Makefile.am new/bluez-4.59/Makefile.am
--- old/bluez-4.58/Makefile.am 2009-11-15 03:04:13.000000000 +0100
+++ new/bluez-4.59/Makefile.am 2009-12-24 17:42:21.000000000 +0100
@@ -53,7 +53,7 @@
lib_libbluetooth_la_SOURCES = $(lib_headers) \
lib/bluetooth.c lib/hci.c lib/sdp.c
-lib_libbluetooth_la_LDFLAGS = -version-info 7:2:4
+lib_libbluetooth_la_LDFLAGS = -version-info 8:0:5
lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
CLEANFILES += $(local_headers)
@@ -316,7 +316,7 @@
pkgconfig_DATA = bluez.pc
-DISTCHECK_CONFIGURE_FLAGS =
+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules
DISTCLEANFILES = $(pkgconfig_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/Makefile.in new/bluez-4.59/Makefile.in
--- old/bluez-4.58/Makefile.in 2009-11-15 03:04:42.000000000 +0100
+++ new/bluez-4.59/Makefile.in 2009-12-24 17:42:48.000000000 +0100
@@ -42,7 +42,8 @@
bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
sbin_PROGRAMS = src/bluetoothd$(EXEEXT) $(am__EXEEXT_12) \
- $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15)
+ $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
+ $(am__EXEEXT_16)
noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
$(am__EXEEXT_10) $(am__EXEEXT_11)
@SBC_TRUE@am__append_1 = sbc/libsbc.la
@@ -117,40 +118,41 @@
@TOOLS_FALSE@ tools/hciattach.8 tools/hciconfig.8 \
@TOOLS_FALSE@ tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
-@BCCMD_TRUE@am__append_24 = tools/bccmd
-@BCCMD_TRUE@@USB_TRUE@am__append_25 = tools/csr_usb.c
-@BCCMD_TRUE@@USB_TRUE@am__append_26 = @USB_LIBS@
-@BCCMD_TRUE@am__append_27 = tools/bccmd.8
-@BCCMD_FALSE@am__append_28 = tools/bccmd.8
-@HID2HCI_TRUE@am__append_29 = tools/hid2hci
-@HID2HCI_TRUE@am__append_30 = tools/hid2hci.8
-@HID2HCI_FALSE@am__append_31 = tools/hid2hci.8
-@DFUTOOL_TRUE@am__append_32 = tools/dfutool
-@DFUTOOL_TRUE@am__append_33 = tools/dfutool.1
-@DFUTOOL_FALSE@am__append_34 = tools/dfutool.1
-@USB_TRUE@am__append_35 = tools/dfubabel tools/avctrl
+@TRACER_TRUE@am__append_24 = tracer/hcitrace
+@BCCMD_TRUE@am__append_25 = tools/bccmd
+@BCCMD_TRUE@@USB_TRUE@am__append_26 = tools/csr_usb.c
+@BCCMD_TRUE@@USB_TRUE@am__append_27 = @USB_LIBS@
+@BCCMD_TRUE@am__append_28 = tools/bccmd.8
+@BCCMD_FALSE@am__append_29 = tools/bccmd.8
+@HID2HCI_TRUE@am__append_30 = tools/hid2hci
+@HID2HCI_TRUE@am__append_31 = tools/hid2hci.8
+@HID2HCI_FALSE@am__append_32 = tools/hid2hci.8
+@DFUTOOL_TRUE@am__append_33 = tools/dfutool
+@DFUTOOL_TRUE@am__append_34 = tools/dfutool.1
+@DFUTOOL_FALSE@am__append_35 = tools/dfutool.1
+@USB_TRUE@am__append_36 = tools/dfubabel tools/avctrl
@CUPS_TRUE@cups_PROGRAMS = cups/bluetooth$(EXEEXT)
-@TEST_TRUE@am__append_36 = test/hciemu
-@TEST_TRUE@am__append_37 = test/l2test test/rctest
-@TEST_TRUE@am__append_38 = test/gaptest test/sdptest test/scotest \
+@TEST_TRUE@am__append_37 = test/hciemu
+@TEST_TRUE@am__append_38 = test/l2test test/rctest
+@TEST_TRUE@am__append_39 = test/gaptest test/sdptest test/scotest \
@TEST_TRUE@ test/attest test/hstest test/avtest test/ipctest \
@TEST_TRUE@ test/lmptest test/bdaddr test/agent \
@TEST_TRUE@ test/btiotest test/test-textfile
-@TEST_TRUE@am__append_39 = test/rctest.1 test/hciemu.1
-@TEST_TRUE@am__append_40 = test/bdaddr.8
-@TEST_FALSE@am__append_41 = test/rctest.1 test/hciemu.1 test/bdaddr.8
-@HIDD_TRUE@am__append_42 = compat/hidd
-@HIDD_TRUE@am__append_43 = compat/hidd.1
-@HIDD_FALSE@am__append_44 = compat/hidd.1
-@PAND_TRUE@am__append_45 = compat/pand
-@PAND_TRUE@am__append_46 = compat/pand.1
-@PAND_FALSE@am__append_47 = compat/pand.1
-@DUND_TRUE@am__append_48 = compat/dund
-@DUND_TRUE@am__append_49 = compat/dund.1
-@DUND_FALSE@am__append_50 = compat/dund.1
-@HID2HCI_TRUE@@UDEVRULES_TRUE@am__append_51 = scripts/bluetooth-hid2hci.rules
-@PCMCIA_TRUE@@UDEVRULES_TRUE@am__append_52 = scripts/bluetooth-serial.rules
+@TEST_TRUE@am__append_40 = test/rctest.1 test/hciemu.1
+@TEST_TRUE@am__append_41 = test/bdaddr.8
+@TEST_FALSE@am__append_42 = test/rctest.1 test/hciemu.1 test/bdaddr.8
+@HIDD_TRUE@am__append_43 = compat/hidd
+@HIDD_TRUE@am__append_44 = compat/hidd.1
+@HIDD_FALSE@am__append_45 = compat/hidd.1
+@PAND_TRUE@am__append_46 = compat/pand
+@PAND_TRUE@am__append_47 = compat/pand.1
+@PAND_FALSE@am__append_48 = compat/pand.1
+@DUND_TRUE@am__append_49 = compat/dund
+@DUND_TRUE@am__append_50 = compat/dund.1
+@DUND_FALSE@am__append_51 = compat/dund.1
+@HID2HCI_TRUE@@UDEVRULES_TRUE@am__append_52 = scripts/bluetooth-hid2hci.rules
+@PCMCIA_TRUE@@UDEVRULES_TRUE@am__append_53 = scripts/bluetooth-serial.rules
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -330,9 +332,10 @@
@TEST_TRUE@ test/btiotest$(EXEEXT) test/test-textfile$(EXEEXT)
@TOOLS_TRUE@am__EXEEXT_12 = tools/hciattach$(EXEEXT) \
@TOOLS_TRUE@ tools/hciconfig$(EXEEXT)
-@BCCMD_TRUE@am__EXEEXT_13 = tools/bccmd$(EXEEXT)
-@HID2HCI_TRUE@am__EXEEXT_14 = tools/hid2hci$(EXEEXT)
-@TEST_TRUE@am__EXEEXT_15 = test/hciemu$(EXEEXT)
+@TRACER_TRUE@am__EXEEXT_13 = tracer/hcitrace$(EXEEXT)
+@BCCMD_TRUE@am__EXEEXT_14 = tools/bccmd$(EXEEXT)
+@HID2HCI_TRUE@am__EXEEXT_15 = tools/hid2hci$(EXEEXT)
+@TEST_TRUE@am__EXEEXT_16 = test/hciemu$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(cups_PROGRAMS) $(noinst_PROGRAMS) \
$(sbin_PROGRAMS)
am__compat_dund_SOURCES_DIST = compat/dund.c compat/dund.h \
@@ -598,6 +601,11 @@
@TOOLS_TRUE@ src/sdp-xml.$(OBJEXT)
tools_sdptool_OBJECTS = $(am_tools_sdptool_OBJECTS)
@TOOLS_TRUE@tools_sdptool_DEPENDENCIES = lib/libbluetooth.la
+am__tracer_hcitrace_SOURCES_DIST = tracer/main.c src/logging.h \
+ src/logging.c
+@TRACER_TRUE@am_tracer_hcitrace_OBJECTS = tracer/main.$(OBJEXT) \
+@TRACER_TRUE@ src/logging.$(OBJEXT)
+tracer_hcitrace_OBJECTS = $(am_tracer_hcitrace_OBJECTS)
am__dist_udev_SCRIPTS_DIST = scripts/bluetooth_serial
SCRIPTS = $(dist_udev_SCRIPTS)
DEFAULT_INCLUDES = -I.@am__isrc@
@@ -659,7 +667,8 @@
tools/hcieventmask.c tools/hcisecfilter.c \
$(tools_hcitool_SOURCES) tools/hid2hci.c tools/l2ping.c \
tools/ppporc.c $(tools_rfcomm_SOURCES) \
- $(EXTRA_tools_rfcomm_SOURCES) $(tools_sdptool_SOURCES)
+ $(EXTRA_tools_rfcomm_SOURCES) $(tools_sdptool_SOURCES) \
+ $(tracer_hcitrace_SOURCES)
DIST_SOURCES = $(am__audio_libtelephony_a_SOURCES_DIST) \
$(am__audio_libasound_module_ctl_bluetooth_la_SOURCES_DIST) \
$(am__audio_libasound_module_pcm_bluetooth_la_SOURCES_DIST) \
@@ -686,7 +695,8 @@
tools/hid2hci.c tools/l2ping.c tools/ppporc.c \
$(am__tools_rfcomm_SOURCES_DIST) \
$(am__EXTRA_tools_rfcomm_SOURCES_DIST) \
- $(am__tools_sdptool_SOURCES_DIST)
+ $(am__tools_sdptool_SOURCES_DIST) \
+ $(am__tracer_hcitrace_SOURCES_DIST)
man1dir = $(mandir)/man1
man8dir = $(mandir)/man8
NROFF = nroff
@@ -849,9 +859,9 @@
AM_MAKEFLAGS = --no-print-directory
lib_LTLIBRARIES = lib/libbluetooth.la
noinst_LTLIBRARIES = $(am__append_1)
-dist_man_MANS = $(am__append_22) $(am__append_27) $(am__append_30) \
- $(am__append_33) $(am__append_39) $(am__append_43) \
- $(am__append_46) $(am__append_49)
+dist_man_MANS = $(am__append_22) $(am__append_28) $(am__append_31) \
+ $(am__append_34) $(am__append_40) $(am__append_44) \
+ $(am__append_47) $(am__append_50)
dist_noinst_MANS =
CLEANFILES = $(local_headers) src/bluetooth.ver src/bluetooth.exp \
$(builtin_files) tools/lexer.c tools/parser.c tools/parser.h \
@@ -861,22 +871,22 @@
audio/audio.conf audio/telephony-dummy.c \
audio/telephony-maemo.c audio/telephony-ofono.c \
audio/bluetooth.conf $(am__append_23) tools/rfcomm.conf \
- $(am__append_28) $(am__append_31) $(am__append_34) \
- tools/dfubabel.1 tools/avctrl.8 $(am__append_40) \
- $(am__append_41) test/apitest test/hsplay test/hsmicro \
+ $(am__append_29) $(am__append_32) $(am__append_35) \
+ tools/dfubabel.1 tools/avctrl.8 $(am__append_41) \
+ $(am__append_42) test/apitest test/hsplay test/hsmicro \
test/dbusdef.py test/monitor-bluetooth test/list-devices \
test/test-discovery test/test-manager test/test-adapter \
test/test-device test/test-service test/test-serial \
test/test-telephony test/test-network test/simple-agent \
- test/simple-service test/service-record.dtd \
- test/service-did.xml test/service-spp.xml test/service-opp.xml \
- test/service-ftp.xml $(am__append_44) $(am__append_47) \
- $(am__append_50) scripts/bluetooth.rules \
- scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
- doc/manager-api.txt doc/adapter-api.txt doc/device-api.txt \
- doc/service-api.txt doc/agent-api.txt doc/serial-api.txt \
- doc/network-api.txt doc/input-api.txt doc/audio-api.txt \
- doc/control-api.txt
+ test/simple-service test/test-audio test/test-input \
+ test/service-record.dtd test/service-did.xml \
+ test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
+ $(am__append_45) $(am__append_48) $(am__append_51) \
+ scripts/bluetooth.rules scripts/bluetooth-hid2hci.rules \
+ scripts/bluetooth-serial.rules doc/manager-api.txt \
+ doc/adapter-api.txt doc/device-api.txt doc/service-api.txt \
+ doc/agent-api.txt doc/serial-api.txt doc/network-api.txt \
+ doc/input-api.txt doc/audio-api.txt doc/control-api.txt
include_HEADERS = $(lib_headers)
@CONFIGFILES_TRUE@dbusdir = $(sysconfdir)/dbus-1/system.d
@CONFIGFILES_TRUE@dbus_DATA = src/bluetooth.conf
@@ -894,7 +904,7 @@
lib_libbluetooth_la_SOURCES = $(lib_headers) \
lib/bluetooth.c lib/hci.c lib/sdp.c
-lib_libbluetooth_la_LDFLAGS = -version-info 7:2:4
+lib_libbluetooth_la_LDFLAGS = -version-info 8:0:5
lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
@SBC_TRUE@sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \
@SBC_TRUE@ sbc/sbc_primitives.h sbc/sbc_primitives.c \
@@ -1023,11 +1033,18 @@
@TOOLS_TRUE@tools_avinfo_LDADD = lib/libbluetooth.la
@TOOLS_TRUE@tools_ppporc_LDADD = lib/libbluetooth.la
@TOOLS_TRUE@tools_hcieventmask_LDADD = lib/libbluetooth.la
+@TRACER_TRUE@tracer_hcitrace_SOURCES = tracer/main.c \
+@TRACER_TRUE@ src/logging.h src/logging.c
+
+@TRACER_TRUE@tracer_hcitrace_LDADD = lib/libbluetooth.la \
+@TRACER_TRUE@ @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@
+
+@TRACER_TRUE@tracer_hcitrace_DEPENDENCIES = lib/libbluetooth.la
@BCCMD_TRUE@tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h \
@BCCMD_TRUE@ tools/csr.c tools/csr_hci.c tools/csr_h4.c \
@BCCMD_TRUE@ tools/csr_3wire.c tools/csr_bcsp.c tools/ubcsp.h \
-@BCCMD_TRUE@ tools/ubcsp.c $(am__append_25)
-@BCCMD_TRUE@tools_bccmd_LDADD = lib/libbluetooth.la $(am__append_26)
+@BCCMD_TRUE@ tools/ubcsp.c $(am__append_26)
+@BCCMD_TRUE@tools_bccmd_LDADD = lib/libbluetooth.la $(am__append_27)
@HID2HCI_TRUE@tools_hid2hci_LDADD = @USB_LIBS@
@DFUTOOL_TRUE@tools_dfutool_SOURCES = tools/dfutool.c tools/dfu.h tools/dfu.c
@DFUTOOL_TRUE@tools_dfutool_LDADD = @USB_LIBS@
@@ -1072,8 +1089,8 @@
@DUND_TRUE@compat_dund_LDADD = lib/libbluetooth.la
@UDEVRULES_TRUE@rulesdir = @UDEV_DATADIR@
-@UDEVRULES_TRUE@udev_files = scripts/bluetooth.rules $(am__append_51) \
-@UDEVRULES_TRUE@ $(am__append_52)
+@UDEVRULES_TRUE@udev_files = scripts/bluetooth.rules $(am__append_52) \
+@UDEVRULES_TRUE@ $(am__append_53)
@UDEVRULES_TRUE@rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
@PCMCIA_TRUE@udevdir = $(libexecdir)/udev
@PCMCIA_TRUE@dist_udev_SCRIPTS = scripts/bluetooth_serial
@@ -1086,7 +1103,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = bluez.pc
-DISTCHECK_CONFIGURE_FLAGS =
+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules
DISTCLEANFILES = $(pkgconfig_DATA)
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \
@@ -1927,6 +1944,17 @@
tools/sdptool$(EXEEXT): $(tools_sdptool_OBJECTS) $(tools_sdptool_DEPENDENCIES) tools/$(am__dirstamp)
@rm -f tools/sdptool$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(tools_sdptool_OBJECTS) $(tools_sdptool_LDADD) $(LIBS)
+tracer/$(am__dirstamp):
+ @$(MKDIR_P) tracer
+ @: > tracer/$(am__dirstamp)
+tracer/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) tracer/$(DEPDIR)
+ @: > tracer/$(DEPDIR)/$(am__dirstamp)
+tracer/main.$(OBJEXT): tracer/$(am__dirstamp) \
+ tracer/$(DEPDIR)/$(am__dirstamp)
+tracer/hcitrace$(EXEEXT): $(tracer_hcitrace_OBJECTS) $(tracer_hcitrace_DEPENDENCIES) tracer/$(am__dirstamp)
+ @rm -f tracer/hcitrace$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(tracer_hcitrace_OBJECTS) $(tracer_hcitrace_LDADD) $(LIBS)
install-dist_udevSCRIPTS: $(dist_udev_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(udevdir)" || $(MKDIR_P) "$(DESTDIR)$(udevdir)"
@@ -2128,6 +2156,7 @@
-rm -f tools/ppporc.$(OBJEXT)
-rm -f tools/sdptool.$(OBJEXT)
-rm -f tools/ubcsp.$(OBJEXT)
+ -rm -f tracer/main.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -2275,6 +2304,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ppporc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/sdptool.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ubcsp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tracer/$(DEPDIR)/main.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -2467,6 +2497,7 @@
-rm -rf src/.libs src/_libs
-rm -rf test/.libs test/_libs
-rm -rf tools/.libs tools/_libs
+ -rm -rf tracer/.libs tracer/_libs
distclean-libtool:
-rm -f libtool config.lt
@@ -2956,6 +2987,8 @@
-rm -f test/$(am__dirstamp)
-rm -f tools/$(DEPDIR)/$(am__dirstamp)
-rm -f tools/$(am__dirstamp)
+ -rm -f tracer/$(DEPDIR)/$(am__dirstamp)
+ -rm -f tracer/$(am__dirstamp)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -2975,7 +3008,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf audio/$(DEPDIR) compat/$(DEPDIR) cups/$(DEPDIR) gdbus/$(DEPDIR) input/$(DEPDIR) lib/$(DEPDIR) network/$(DEPDIR) plugins/$(DEPDIR) sbc/$(DEPDIR) serial/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) tools/$(DEPDIR)
+ -rm -rf audio/$(DEPDIR) compat/$(DEPDIR) cups/$(DEPDIR) gdbus/$(DEPDIR) input/$(DEPDIR) lib/$(DEPDIR) network/$(DEPDIR) plugins/$(DEPDIR) sbc/$(DEPDIR) serial/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) tools/$(DEPDIR) tracer/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -3028,7 +3061,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf audio/$(DEPDIR) compat/$(DEPDIR) cups/$(DEPDIR) gdbus/$(DEPDIR) input/$(DEPDIR) lib/$(DEPDIR) network/$(DEPDIR) plugins/$(DEPDIR) sbc/$(DEPDIR) serial/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) tools/$(DEPDIR)
+ -rm -rf audio/$(DEPDIR) compat/$(DEPDIR) cups/$(DEPDIR) gdbus/$(DEPDIR) input/$(DEPDIR) lib/$(DEPDIR) network/$(DEPDIR) plugins/$(DEPDIR) sbc/$(DEPDIR) serial/$(DEPDIR) src/$(DEPDIR) test/$(DEPDIR) tools/$(DEPDIR) tracer/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/Makefile.tools new/bluez-4.59/Makefile.tools
--- old/bluez-4.58/Makefile.tools 2009-09-03 05:58:36.000000000 +0200
+++ new/bluez-4.59/Makefile.tools 2009-12-24 17:42:21.000000000 +0100
@@ -58,6 +58,15 @@
EXTRA_DIST += tools/rfcomm.conf
+if TRACER
+sbin_PROGRAMS += tracer/hcitrace
+
+tracer_hcitrace_SOURCES = tracer/main.c \
+ src/logging.h src/logging.c
+tracer_hcitrace_LDADD = lib/libbluetooth.la \
+ @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@
+tracer_hcitrace_DEPENDENCIES = lib/libbluetooth.la
+endif
if BCCMD
sbin_PROGRAMS += tools/bccmd
@@ -177,6 +186,7 @@
test/test-manager test/test-adapter test/test-device \
test/test-service test/test-serial test/test-telephony \
test/test-network test/simple-agent test/simple-service \
+ test/test-audio test/test-input \
test/service-record.dtd test/service-did.xml \
test/service-spp.xml test/service-opp.xml test/service-ftp.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/acinclude.m4 new/bluez-4.59/acinclude.m4
--- old/bluez-4.58/acinclude.m4 2009-10-04 05:56:37.000000000 +0200
+++ new/bluez-4.59/acinclude.m4 2009-12-24 17:42:21.000000000 +0100
@@ -177,6 +177,7 @@
serial_enable=yes
network_enable=yes
service_enable=yes
+ tracer_enable=no
tools_enable=yes
hidd_enable=no
pand_enable=no
@@ -243,6 +244,10 @@
netlink_enable=${enableval}
])
+ AC_ARG_ENABLE(tracer, AC_HELP_STRING([--enable-tracer], [install Tracing daemon]), [
+ tracer_enable=${enableval}
+ ])
+
AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [
tools_enable=${enableval}
])
@@ -338,6 +343,7 @@
AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes")
AM_CONDITIONAL(ECHOPLUGIN, test "no" = "yes")
+ AM_CONDITIONAL(TRACER, test "${tracer_enable}" = "yes")
AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes")
AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/audio/avdtp.c new/bluez-4.59/audio/avdtp.c
--- old/bluez-4.58/audio/avdtp.c 2009-10-10 06:17:28.000000000 +0200
+++ new/bluez-4.59/audio/avdtp.c 2009-12-24 17:42:21.000000000 +0100
@@ -2375,9 +2375,10 @@
else
stream = NULL;
- if (stream)
+ if (stream) {
+ stream->abort_int = TRUE;
lsep = stream->lsep;
- else
+ } else
lsep = NULL;
switch (req->signal_id) {
@@ -2443,8 +2444,6 @@
goto failed;
}
- stream->abort_int = TRUE;
-
goto done;
failed:
@@ -2504,6 +2503,9 @@
{
struct pending_req *req;
+ if (stream && stream->abort_int && signal_id != AVDTP_ABORT)
+ return -EINVAL;
+
req = g_new0(struct pending_req, 1);
req->signal_id = signal_id;
req->data = g_malloc(size);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/configure new/bluez-4.59/configure
--- old/bluez-4.58/configure 2009-11-15 03:04:44.000000000 +0100
+++ new/bluez-4.59/configure 2009-12-24 17:42:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for bluez 4.58.
+# Generated by GNU Autoconf 2.63 for bluez 4.59.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
# Identity of this package.
PACKAGE_NAME='bluez'
PACKAGE_TARNAME='bluez'
-PACKAGE_VERSION='4.58'
-PACKAGE_STRING='bluez 4.58'
+PACKAGE_VERSION='4.59'
+PACKAGE_STRING='bluez 4.59'
PACKAGE_BUGREPORT=''
ac_default_prefix=/usr/local
@@ -812,6 +812,8 @@
PAND_TRUE
HIDD_FALSE
HIDD_TRUE
+TRACER_FALSE
+TRACER_TRUE
ECHOPLUGIN_FALSE
ECHOPLUGIN_TRUE
SERVICEPLUGIN_FALSE
@@ -997,6 +999,7 @@
enable_alsa
enable_usb
enable_netlink
+enable_tracer
enable_tools
enable_bccmd
enable_pcmcia
@@ -1592,7 +1595,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures bluez 4.58 to adapt to many kinds of systems.
+\`configure' configures bluez 4.59 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1662,7 +1665,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of bluez 4.58:";;
+ short | recursive ) echo "Configuration of bluez 4.59:";;
esac
cat <<\_ACEOF
@@ -1694,6 +1697,7 @@
--enable-alsa enable ALSA support
--enable-usb enable USB support
--enable-netlink enable NETLINK support
+ --enable-tracer install Tracing daemon
--enable-tools install Bluetooth utilities
--enable-bccmd install BCCMD interface utility
--enable-pcmcia install PCMCIA serial script
@@ -1820,7 +1824,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-bluez configure 4.58
+bluez configure 4.59
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1834,7 +1838,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by bluez $as_me 4.58, which was
+It was created by bluez $as_me 4.59, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2684,7 +2688,7 @@
# Define the identity of the package.
PACKAGE='bluez'
- VERSION='4.58'
+ VERSION='4.59'
cat >>confdefs.h <<_ACEOF
@@ -5342,13 +5346,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5345: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5349: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5348: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5352: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5351: output\"" >&5)
+ (eval echo "\"\$as_me:5355: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6553,7 +6557,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6556 "configure"' > conftest.$ac_ext
+ echo '#line 6560 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8376,11 +8380,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8379: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8383: \$? = $ac_status" >&5
+ echo "$as_me:8387: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8715,11 +8719,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8718: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8722: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8722: \$? = $ac_status" >&5
+ echo "$as_me:8726: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8820,11 +8824,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8827: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8827: \$? = $ac_status" >&5
+ echo "$as_me:8831: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8875,11 +8879,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8878: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8882: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8882: \$? = $ac_status" >&5
+ echo "$as_me:8886: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11678,7 +11682,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11681 "configure"
+#line 11685 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11774,7 +11778,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11777 "configure"
+#line 11781 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13066,6 +13070,7 @@
serial_enable=yes
network_enable=yes
service_enable=yes
+ tracer_enable=no
tools_enable=yes
hidd_enable=no
pand_enable=no
@@ -13184,6 +13189,14 @@
fi
+ # Check whether --enable-tracer was given.
+if test "${enable_tracer+set}" = set; then
+ enableval=$enable_tracer;
+ tracer_enable=${enableval}
+
+fi
+
+
# Check whether --enable-tools was given.
if test "${enable_tools+set}" = set; then
enableval=$enable_tools;
@@ -13429,6 +13442,14 @@
ECHOPLUGIN_FALSE=
fi
+ if test "${tracer_enable}" = "yes"; then
+ TRACER_TRUE=
+ TRACER_FALSE='#'
+else
+ TRACER_TRUE='#'
+ TRACER_FALSE=
+fi
+
if test "${hidd_enable}" = "yes"; then
HIDD_TRUE=
HIDD_FALSE='#'
@@ -13739,6 +13760,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${TRACER_TRUE}" && test -z "${TRACER_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"TRACER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"TRACER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HIDD_TRUE}" && test -z "${HIDD_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"HIDD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -14145,7 +14173,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by bluez $as_me 4.58, which was
+This file was extended by bluez $as_me 4.59, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14208,7 +14236,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-bluez config.status 4.58
+bluez config.status 4.59
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/configure.ac new/bluez-4.59/configure.ac
--- old/bluez-4.58/configure.ac 2009-11-15 03:04:13.000000000 +0100
+++ new/bluez-4.59/configure.ac 2009-12-24 17:42:21.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT(bluez, 4.58)
+AC_INIT(bluez, 4.59)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_CONFIG_HEADER(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/gdbus/mainloop.c new/bluez-4.59/gdbus/mainloop.c
--- old/bluez-4.58/gdbus/mainloop.c 2009-10-31 08:18:09.000000000 +0100
+++ new/bluez-4.59/gdbus/mainloop.c 2009-12-24 17:42:21.000000000 +0100
@@ -183,7 +183,11 @@
if (!handler)
return;
- g_source_remove(handler->id);
+ if (handler->id > 0) {
+ g_source_remove(handler->id);
+ handler->id = 0;
+ }
+
g_free(handler);
}
@@ -207,6 +211,17 @@
static void remove_timeout(DBusTimeout *timeout, void *data)
{
+ timeout_handler_t *handler;
+
+ handler = dbus_timeout_get_data(timeout);
+
+ if (!handler)
+ return;
+
+ if (handler->id > 0) {
+ g_source_remove(handler->id);
+ handler->id = 0;
+ }
}
static void timeout_toggled(DBusTimeout *timeout, void *data)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/lib/bluetooth.c new/bluez-4.59/lib/bluetooth.c
--- old/bluez-4.58/lib/bluetooth.c 2009-09-03 05:58:36.000000000 +0200
+++ new/bluez-4.59/lib/bluetooth.c 2009-12-24 17:42:21.000000000 +0100
@@ -464,6 +464,10 @@
return "Harman International Industries, Inc.";
case 88:
return "Vizio, Inc.";
+ case 89:
+ return "Nordic Semiconductor ASA";
+ case 90:
+ return "EM Microelectronic-Marin SA";
case 65535:
return "internal use";
default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluez-4.58/lib/hci.c new/bluez-4.59/lib/hci.c
--- old/bluez-4.58/lib/hci.c 2009-10-10 06:17:28.000000000 +0200
+++ new/bluez-4.59/lib/hci.c 2009-12-24 17:42:21.000000000 +0100
@@ -494,7 +494,7 @@
{ "Reserved", 160 },
{ "Reserved", 161 },
{ "Send Keypress Notification", 162 },
- { "IO Capabilities Response Negative Reply", 163 },
+ { "IO Capability Request Negative Reply", 163 },
{ "Read Encryption Key Size", 164 },
{ "Reserved", 165 },
{ "Reserved", 166 },
@@ -532,9 +532,45 @@
{ "Read Best Effort Flush Timeout", 194 },
{ "Write Best Effort Flush Timeout", 195 },
{ "Short Range Mode", 196 },
- { "Reserved", 197 },
- { "Reserved", 198 },
- { "Reserved", 200 },
+ { "Read LE Host Support", 197 },
+ { "Write LE Host Support", 198 },
+ { "Reserved", 199 },
+
+ { "LE Set Event Mask", 200 },
+ { "LE Read Buffer Size", 201 },
+ { "LE Read Local Supported Features", 202 },
+ { "Reserved", 203 },
+ { "LE Set Random Address", 204 },
+ { "LE Set Advertising Parameters", 205 },
+ { "LE Read Advertising Channel TX Power", 206 },
+ { "LE Set Advertising Data", 207 },
+
+ { "LE Set Scan Response Data", 208 },
+ { "LE Set Advertise Enable", 209 },
+ { "LE Set Scan Parameters", 210 },
+ { "LE Set Scan Enable", 211 },
+ { "LE Create Connection", 212 },
+ { "LE Create Connection Cancel", 213 },
+ { "LE Read White List Size", 214 },
+ { "LE Clear White List", 215 },
+
+ { "LE Add Device To White List", 216 },
+ { "LE Remove Device From White List", 217 },
+ { "LE Connection Update", 218 },
+ { "LE Set Host Channel Classification", 219 },
+ { "LE Read Channel Map", 220 },
+ { "LE Read Remote Used Features", 221 },
+ { "LE Encrypt", 222 },
+ { "LE Rand", 223 },
+
+ { "LE Start Encryption", 224 },
+ { "LE Long Term Key Request Reply", 225 },
+ { "LE Long Term Key Request Negative Reply", 226 },
+ { "LE Read Supported States", 227 },
+ { "LE Receiver Test", 228 },
+ { "LE Transmitter Test", 229 },
+ { "LE Test End", 230 },
+ { "Reserved", 231 },
{ NULL }
};
@@ -594,6 +630,7 @@
{ "2.0", 0x03 },
{ "2.1", 0x04 },
{ "3.0", 0x05 },
+ { "4.0", 0x06 },
{ NULL }
};
@@ -666,8 +703,8 @@
{ "
", LMP_NO_BREDR }, /* Bit 5 */
+ { "<LE support>", LMP_LE }, /* Bit 6 */
{ "<3-slot EDR ACL>", LMP_EDR_3SLOT }, /* Bit 7 */
{ NULL }
},
@@ -684,7 +721,7 @@
},
{ /* Byte 6 */
{ "<extended inquiry>", LMP_EXT_INQ }, /* Bit 0 */
- { "