[bluez/f14/master] - Update to 4.71
Bastien Nocera
hadess at fedoraproject.org
Thu Sep 9 23:04:46 UTC 2010
commit 4dd296b3b9a24220b3b443dc4e5249b97874f436
Author: Bastien Nocera <hadess at hadess.net>
Date: Fri Sep 10 00:04:51 2010 +0100
- Update to 4.71
0001-Add-sixaxis-cable-pairing-plugin.patch | 68 ++++++++-------------------
bluez-utils-oui-usage.patch | 33 -------------
bluez.spec | 11 ++--
sources | 2 +-
4 files changed, 27 insertions(+), 87 deletions(-)
---
diff --git a/0001-Add-sixaxis-cable-pairing-plugin.patch b/0001-Add-sixaxis-cable-pairing-plugin.patch
index 72251ff..bc415ce 100644
--- a/0001-Add-sixaxis-cable-pairing-plugin.patch
+++ b/0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -1,4 +1,4 @@
-From 1927d7c37f761236eb9dfc90456444d6b01ad313 Mon Sep 17 00:00:00 2001
+From 930d4ff4c8ce7344cd8c69c149bb695d82fa9548 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 1 Sep 2009 17:32:48 +0100
Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -10,18 +10,18 @@ the device is selected, poked around to set the default Bluetooth
address, and added to the database of the current default adapter.
---
Makefile.am | 9 +-
- acinclude.m4 | 38 ++++++
- configure.ac | 3 +
+ acinclude.m4 | 16 +++
+ configure.ac | 1 +
plugins/cable.c | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 433 insertions(+), 2 deletions(-)
+ 4 files changed, 409 insertions(+), 2 deletions(-)
create mode 100644 plugins/cable.c
diff --git a/Makefile.am b/Makefile.am
-index 65d4312..0c284b9 100644
+index 7895be2..8bf6c88 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -168,6 +168,11 @@ builtin_modules += service
- builtin_sources += plugins/service.c
+@@ -192,6 +192,11 @@ builtin_sources += attrib/main.c \
+ attrib/example.h attrib/example.c
endif
+if CABLE
@@ -32,7 +32,7 @@ index 65d4312..0c284b9 100644
builtin_modules += hciops
builtin_sources += plugins/hciops.c
-@@ -203,7 +208,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+@@ -237,7 +242,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
src/dbus-common.c src/dbus-common.h \
src/dbus-hci.h src/dbus-hci.c
src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
@@ -41,7 +41,7 @@ index 65d4312..0c284b9 100644
src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
-Wl,--version-script=src/bluetooth.ver
src_bluetoothd_DEPENDENCIES = src/bluetooth.ver lib/libbluetooth.la
-@@ -317,7 +322,7 @@ EXTRA_DIST += doc/manager-api.txt \
+@@ -352,7 +357,7 @@ EXTRA_DIST += doc/manager-api.txt \
AM_YFLAGS = -d
@@ -51,10 +51,10 @@ index 65d4312..0c284b9 100644
INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
diff --git a/acinclude.m4 b/acinclude.m4
-index f5fdd66..0a25e7a 100644
+index a4e5e2f..eb0936a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -146,6 +146,24 @@ AC_DEFUN([AC_PATH_USB], [
+@@ -146,6 +146,12 @@ AC_DEFUN([AC_PATH_USB], [
[Define to 1 if you need the usb_interrupt_read() function.]))
])
@@ -64,35 +64,18 @@ index f5fdd66..0a25e7a 100644
+ AC_SUBST(CABLE_LIBS)
+])
+
-+AC_DEFUN([AC_PATH_NETLINK], [
-+ PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
-+ AC_SUBST(NETLINK_CFLAGS)
-+ AC_SUBST(NETLINK_LIBS)
-+])
-+
-+AC_DEFUN([AC_PATH_CAPNG], [
-+ PKG_CHECK_MODULES(CAPNG, libcap-ng, capng_found=yes, capng_found=no)
-+ AC_SUBST(CAPNG_CFLAGS)
-+ AC_SUBST(CAPNG_LIBS)
-+])
-+
AC_DEFUN([AC_PATH_SNDFILE], [
PKG_CHECK_MODULES(SNDFILE, sndfile, sndfile_found=yes, sndfile_found=no)
AC_SUBST(SNDFILE_CFLAGS)
-@@ -157,9 +175,12 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- optimization_enable=yes
- fortify_enable=yes
- pie_enable=yes
-+ capng_enable=${capng_found}
+@@ -168,6 +174,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
sndfile_enable=${sndfile_found}
-+ netlink_enable=no
- hal_enable=${hal_found}
+ hal_enable=no
usb_enable=${usb_found}
+ cable_enable=${cable_found}
alsa_enable=${alsa_found}
gstreamer_enable=${gstreamer_found}
audio_enable=yes
-@@ -232,6 +253,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -250,6 +257,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
usb_enable=${enableval}
])
@@ -100,21 +83,13 @@ index f5fdd66..0a25e7a 100644
+ cable_enable=${enableval}
+ ])
+
-+ AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
-+ netlink_enable=${enableval}
-+ ])
-+
AC_ARG_ENABLE(tracer, AC_HELP_STRING([--enable-tracer], [install Tracing daemon]), [
tracer_enable=${enableval}
])
-@@ -319,6 +348,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -341,6 +352,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
fi
-+ if (test "${capng_enable}" = "yes" && test "${capng_found}" = "yes"); then
-+ AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
-+ fi
-+
+ if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
+ AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
+ fi
@@ -122,26 +97,23 @@ index f5fdd66..0a25e7a 100644
AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
-@@ -346,4 +383,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -371,4 +386,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes")
+ AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
])
diff --git a/configure.ac b/configure.ac
-index b004f6e..f997c5a 100644
+index 6fda7fe..0ef9d4c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -40,7 +40,10 @@ AC_PATH_GLIB
+@@ -40,6 +40,7 @@ AC_PATH_GLIB
AC_PATH_ALSA
AC_PATH_GSTREAMER
AC_PATH_USB
+AC_PATH_CABLE
-+AC_PATH_NETLINK
AC_PATH_SNDFILE
-+AC_PATH_CAPNG
-
- AC_ARG_BLUEZ
+ AC_PATH_OUI
diff --git a/plugins/cable.c b/plugins/cable.c
new file mode 100644
@@ -535,5 +507,5 @@ index 0000000..d74c771
+BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
--
-1.7.0.1
+1.7.2.3
diff --git a/bluez.spec b/bluez.spec
index 427b041..1fca416 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
Summary: Bluetooth utilities
Name: bluez
-Version: 4.69
-Release: 4%{?dist}
+Version: 4.71
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -13,7 +13,6 @@ Source6: pand.conf
Source7: rfcomm.init
Source8: bluez-uinput.modules
-Patch1: bluez-utils-oui-usage.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=450081
# http://thread.gmane.org/gmane.linux.bluez.kernel/1687
Patch2: bluez-try-utf8-harder.patch
@@ -129,7 +128,6 @@ This includes hidd, dund and pand.
%prep
%setup -q
-%patch1 -p0 -b .oui
%patch2 -p1 -b .non-utf8-name
%patch4 -p1 -b .socket-mobile
%patch5 -p1 -b .cable-pairing
@@ -137,7 +135,7 @@ This includes hidd, dund and pand.
%build
libtoolize -f -c
autoreconf
-%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
+%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund --with-ouifile=/usr/share/hwdata/oui.txt
make
%install
@@ -280,6 +278,9 @@ fi
%{_mandir}/man1/pand.1.gz
%changelog
+* Fri Sep 10 2010 Bastien Nocera <bnocera at redhat.com> 4.71-1
+- Update to 4.71
+
* Sat Jul 31 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> 4.69-4
- Re-add Requires: dbus-bluez-pin-helper, since blueman is now in
diff --git a/sources b/sources
index 41610a1..9153f2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-986a08fb5c94ebd7d1a4d702e45ee34e bluez-4.69.tar.gz
+d54c99e1aa554b623bf4eaad9ae9aa0a bluez-4.71.tar.gz
More information about the scm-commits
mailing list