rpms/bluez/F-12 0001-Add-sixaxis-cable-pairing-plugin.patch, 1.5, 1.6

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16783

Modified Files:
	0001-Add-sixaxis-cable-pairing-plugin.patch 
Log Message:
update cable pairing patch

0001-Add-sixaxis-cable-pairing-plugin.patch:
 Makefile.am     |    9 +
 acinclude.m4    |   15 ++
 configure.ac    |    1 
 plugins/cable.c |  363 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 387 insertions(+), 1 deletion(-)

Index: 0001-Add-sixaxis-cable-pairing-plugin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez/F-12/0001-Add-sixaxis-cable-pairing-plugin.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- 0001-Add-sixaxis-cable-pairing-plugin.patch	16 Sep 2009 10:07:26 -0000	1.5
+++ 0001-Add-sixaxis-cable-pairing-plugin.patch	5 Oct 2009 09:38:20 -0000	1.6
@@ -1,4 +1,4 @@
-From 0cb2225079979cc3c85c02a981ebad7742c1ff72 Mon Sep 17 00:00:00 2001
+From 3727fcbf09a33550698cdda2a2d0a7afa31e594a 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
@@ -11,14 +11,14 @@ the device is selected, poked around to 
 address, and added to the database of the current default adapter.
 ---
  Makefile.am     |    9 ++
- acinclude.m4    |   16 +++
+ acinclude.m4    |   15 +++
  configure.ac    |    1 +
  plugins/cable.c |  362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 388 insertions(+), 0 deletions(-)
+ 4 files changed, 387 insertions(+), 0 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 09eb7ec..ad6fe25 100644
+index c8337d6..0bdf694 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -162,6 +162,15 @@ builtin_modules += service
@@ -38,7 +38,7 @@ index 09eb7ec..ad6fe25 100644
  builtin_sources += plugins/hciops.c
  
 diff --git a/acinclude.m4 b/acinclude.m4
-index 44f7c72..465fb67 100644
+index e7d1c32..54802be 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -142,6 +142,12 @@ AC_DEFUN([AC_PATH_USB], [
@@ -54,7 +54,7 @@ index 44f7c72..465fb67 100644
  AC_DEFUN([AC_PATH_NETLINK], [
  	PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no)
  	AC_SUBST(NETLINK_CFLAGS)
-@@ -163,6 +169,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -170,6 +176,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	netlink_enable=no
  	hal_enable=${hal_found}
  	usb_enable=${usb_found}
@@ -62,7 +62,7 @@ index 44f7c72..465fb67 100644
  	alsa_enable=${alsa_found}
  	gstreamer_enable=${gstreamer_found}
  	audio_enable=yes
-@@ -228,6 +235,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -239,6 +246,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		usb_enable=${enableval}
  	])
  
@@ -73,25 +73,24 @@ index 44f7c72..465fb67 100644
  	AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [
  		netlink_enable=${enableval}
  	])
-@@ -311,6 +322,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
- 	fi
+@@ -324,6 +335,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  
+ 	if (test "${capng_enable}" = "yes" && test "${capng_found}" = "yes"); then
+ 		AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
++
 +	if (test "${cable_enable}" = "yes" && test "${cable_found}" = "yes"); then
 +		AC_DEFINE(HAVE_CABLE, 1, [Define to 1 if you have libcable.])
-+	fi
-+
+ 	fi
+ 
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
- 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
-@@ -335,4 +350,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -350,4 +364,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
 +	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
  ])
 diff --git a/configure.ac b/configure.ac
-index 9e5279d..8b17659 100644
+index b93cca0..5df134f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,6 +40,7 @@ AC_PATH_GLIB
@@ -101,7 +100,7 @@ index 9e5279d..8b17659 100644
 +AC_PATH_CABLE
  AC_PATH_NETLINK
  AC_PATH_SNDFILE
- 
+ AC_PATH_CAPNG
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
 index 0000000..6e81ba0
@@ -471,5 +470,5 @@ index 0000000..6e81ba0
 +BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
 +			BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
 -- 
-1.6.2.5
+1.6.4.4