[bluez] Remove obsolete patches
Bastien Nocera
hadess at fedoraproject.org
Thu Jun 14 10:14:46 UTC 2012
commit 6bfa1dbc3c8e02602f86e47aff783438b327f71f
Author: Bastien Nocera <hadess at hadess.net>
Date: Thu Jun 14 11:14:44 2012 +0100
Remove obsolete patches
0001-Add-sixaxis-cable-pairing-plugin.patch | 46 +++++-----
0001-systemd-install-systemd-unit-files.patch | 121 -------------------------
bluez-udev-deprecated.patch | 26 ------
bluez.spec | 5 -
4 files changed, 23 insertions(+), 175 deletions(-)
---
diff --git a/0001-Add-sixaxis-cable-pairing-plugin.patch b/0001-Add-sixaxis-cable-pairing-plugin.patch
index 498d23f..b822a7e 100644
--- a/0001-Add-sixaxis-cable-pairing-plugin.patch
+++ b/0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -1,4 +1,4 @@
-From 2977a39aad96cb3f2be90c6291169a25c9965fc9 Mon Sep 17 00:00:00 2001
+From 78030d9dae0ab1e06b408c6f8e12df4a1dddbca8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 30 Dec 2011 12:34:29 +0100
Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -19,13 +19,13 @@ address, and added to the database of the current default adapter.
create mode 100644 plugins/cable.c
diff --git a/Makefile.am b/Makefile.am
-index cafb4cc..4ccf4f0 100644
+index 53fcbe9..9cbafbc 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -244,6 +244,11 @@ builtin_sources += thermometer/main.c \
- thermometer/thermometer.h thermometer/thermometer.c
+@@ -238,6 +238,11 @@ builtin_sources += thermometer/main.c \
endif
+
+if CABLE
+builtin_modules += cable
+builtin_sources += plugins/cable.c
@@ -34,29 +34,29 @@ index cafb4cc..4ccf4f0 100644
builtin_modules += hciops mgmtops
builtin_sources += plugins/hciops.c plugins/mgmtops.c
-@@ -311,7 +316,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+@@ -306,7 +311,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
src/event.h src/event.c \
src/oob.h src/oob.c src/eir.h src/eir.c
src_bluetoothd_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @DBUS_LIBS@ \
-- @CAPNG_LIBS@ -ldl -lrt
-+ @CAPNG_LIBS@ @CABLE_LIBS@ -ldl -lrt
- src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
+- -ldl -lrt
++ - at CABLE_LIBS@ ldl -lrt
+ src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \
-Wl,--version-script=$(srcdir)/src/bluetooth.ver
-@@ -447,7 +452,7 @@ EXTRA_DIST += doc/manager-api.txt \
+@@ -428,7 +433,7 @@ EXTRA_DIST += doc/manager-api.txt \
AM_YFLAGS = -d
--AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@
-+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @CABLE_CFLAGS@
+-AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@
++AM_CFLAGS += @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CABLE_CFLAGS@
INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
-I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \
diff --git a/acinclude.m4 b/acinclude.m4
-index b0f790c..20a930c 100644
+index 6505ad3..3f59989 100644
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -152,6 +152,12 @@ AC_DEFUN([AC_PATH_UDEV], [
+@@ -139,6 +139,12 @@ AC_DEFUN([AC_PATH_UDEV], [
AC_SUBST(UDEV_LIBS)
])
@@ -69,7 +69,7 @@ index b0f790c..20a930c 100644
AC_DEFUN([AC_PATH_SNDFILE], [
PKG_CHECK_MODULES(SNDFILE, sndfile, sndfile_found=yes, sndfile_found=no)
AC_SUBST(SNDFILE_CFLAGS)
-@@ -189,6 +195,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -176,6 +182,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
sndfile_enable=${sndfile_found}
hal_enable=no
usb_enable=${usb_found}
@@ -77,7 +77,7 @@ index b0f790c..20a930c 100644
alsa_enable=${alsa_found}
gstreamer_enable=${gstreamer_found}
audio_enable=yes
-@@ -298,6 +305,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -265,6 +272,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
usb_enable=${enableval}
])
@@ -88,7 +88,7 @@ index b0f790c..20a930c 100644
AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools], [install Bluetooth utilities]), [
tools_enable=${enableval}
])
-@@ -393,6 +404,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -366,6 +377,10 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
fi
@@ -99,14 +99,14 @@ index b0f790c..20a930c 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" ||
-@@ -429,4 +444,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -398,4 +413,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
- AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes")
+ AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
+ AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
])
diff --git a/configure.ac b/configure.ac
-index cd0f1cf..c61f230 100644
+index 48b181e..45a4b15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_PATH_GSTREAMER
@@ -506,7 +506,7 @@ index 0000000..b974b4c
+BLUETOOTH_PLUGIN_DEFINE(cable, VERSION,
+ BLUETOOTH_PLUGIN_PRIORITY_DEFAULT, cable_init, cable_exit)
diff --git a/src/adapter.c b/src/adapter.c
-index acb845e..478a8fb 100644
+index 6e04faf..0488891 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -952,6 +952,25 @@ static struct btd_device *adapter_create_device(DBusConnection *conn,
@@ -536,10 +536,10 @@ index acb845e..478a8fb 100644
struct btd_device *device,
gboolean remove_storage)
diff --git a/src/adapter.h b/src/adapter.h
-index ceebb97..b0a0461 100644
+index b7ea62b..ac0aa2e 100644
--- a/src/adapter.h
+++ b/src/adapter.h
-@@ -123,6 +123,9 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
+@@ -114,6 +114,9 @@ void adapter_update_found_devices(struct btd_adapter *adapter,
uint8_t *data, uint8_t data_len);
void adapter_emit_device_found(struct btd_adapter *adapter,
struct remote_dev_info *dev);
@@ -550,5 +550,5 @@ index ceebb97..b0a0461 100644
int adapter_set_name(struct btd_adapter *adapter, const char *name);
void adapter_name_changed(struct btd_adapter *adapter, const char *name);
--
-1.7.7.6
+1.7.10.2
diff --git a/bluez.spec b/bluez.spec
index 2ec7792..8e76a17 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -18,9 +18,6 @@ Source8: bluez-uinput.modules
Patch4: bluez-socket-mobile-cf-connection-kit.patch
# http://thread.gmane.org/gmane.linux.bluez.kernel/2396
Patch5: 0001-Add-sixaxis-cable-pairing-plugin.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/8645
-Patch6: 0001-systemd-install-systemd-unit-files.patch
-Patch7: bluez-udev-deprecated.patch
BuildRequires: flex
BuildRequires: dbus-devel >= 0.90
@@ -144,8 +141,6 @@ and mouse.
%setup -q
%patch4 -p1 -b .socket-mobile
%patch5 -p1 -b .cable-pairing
-%patch6 -p1 -b .systemd
-%patch7 -p1 -b .udev
%build
libtoolize -f -c
More information about the scm-commits
mailing list