From 26ac33748c79106817ed62b86e438b299ae7d694e9349a1c38bcaa5980d9b61b Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 11 Jul 2012 06:36:38 +0000 Subject: [PATCH] Accepting request 127567 from home:seife:testing update to bluez version 4.101 OBS-URL: https://build.opensuse.org/request/show/127567 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=121 --- ...luez-4.100-libsbc-make-it-installable.diff | 40 ++++++++++++---- bluez-4.101.tar.bz2 | 3 ++ bluez-4.99.tar.bz2 | 3 -- bluez-gstreamer.changes | 47 +++++++++++++++++++ bluez-gstreamer.spec | 21 ++++----- bluez.changes | 47 +++++++++++++++++++ bluez.spec | 39 +++++++-------- org.bluez.service | 5 ++ 8 files changed, 159 insertions(+), 46 deletions(-) rename libsbc-make-it-installable => bluez-4.100-libsbc-make-it-installable.diff (56%) create mode 100644 bluez-4.101.tar.bz2 delete mode 100644 bluez-4.99.tar.bz2 create mode 100644 org.bluez.service diff --git a/libsbc-make-it-installable b/bluez-4.100-libsbc-make-it-installable.diff similarity index 56% rename from libsbc-make-it-installable rename to bluez-4.100-libsbc-make-it-installable.diff index b6a5d3c..d072503 100644 --- a/libsbc-make-it-installable +++ b/bluez-4.100-libsbc-make-it-installable.diff @@ -12,9 +12,13 @@ Signed-off-by: Jeff Mahoney libsbc.pc.in | 10 ++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) +Index: b/Makefile.am +=================================================================== --- a/Makefile.am +++ b/Makefile.am -@@ -64,7 +64,7 @@ local_headers = $(foreach file,$(lib_hea +@@ -67,11 +67,11 @@ lib_headers = lib/bluetooth.h lib/hci.h + lib/rfcomm.h lib/bnep.h lib/cmtp.h lib/hidp.h lib/a2mp.h + local_headers = $(foreach file,$(lib_headers), lib/bluetooth/$(notdir $(file))) BUILT_SOURCES = $(local_headers) src/builtin.h @@ -23,7 +27,11 @@ Signed-off-by: Jeff Mahoney lib_LTLIBRARIES += lib/libbluetooth.la -@@ -78,7 +78,7 @@ noinst_LTLIBRARIES += lib/libbluetooth-p + lib_libbluetooth_la_SOURCES = $(lib_headers) \ + lib/bluetooth.c lib/hci.c lib/sdp.c lib/uuid.c +@@ -81,11 +81,11 @@ lib_libbluetooth_la_DEPENDENCIES = $(loc + noinst_LTLIBRARIES += lib/libbluetooth-private.la + lib_libbluetooth_private_la_SOURCES = $(lib_libbluetooth_la_SOURCES) if SBC @@ -32,7 +40,11 @@ Signed-off-by: Jeff Mahoney sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sbc.c sbc/sbc_math.h sbc/sbc_tables.h \ sbc/sbc_primitives.h sbc/sbc_primitives.c \ -@@ -90,7 +90,7 @@ sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sb + sbc/sbc_primitives_mmx.h sbc/sbc_primitives_mmx.c \ + sbc/sbc_primitives_iwmmxt.h sbc/sbc_primitives_iwmmxt.c \ +@@ -93,11 +93,11 @@ sbc_libsbc_la_SOURCES = sbc/sbc.h sbc/sb + sbc/sbc_primitives_armv6.h sbc/sbc_primitives_armv6.c + sbc_libsbc_la_CFLAGS = $(AM_CFLAGS) -finline-functions -fgcse-after-reload \ -funswitch-loops -funroll-loops @@ -41,7 +53,11 @@ Signed-off-by: Jeff Mahoney sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h sbc_sbcdec_LDADD = sbc/libsbc.la -@@ -462,7 +462,7 @@ TESTS = $(unit_tests) + + sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h +@@ -456,11 +456,11 @@ endif + + TESTS = $(unit_tests) pkgconfigdir = $(libdir)/pkgconfig @@ -50,15 +66,23 @@ Signed-off-by: Jeff Mahoney DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles + DISTCLEANFILES = $(pkgconfig_DATA) + +Index: b/configure.ac +=================================================================== --- a/configure.ac +++ b/configure.ac -@@ -72,4 +72,5 @@ fi +@@ -59,6 +59,7 @@ if (test -n "${path_systemdunit}"); then + SYSTEMD_UNITDIR="${path_systemdunit}" + AC_SUBST(SYSTEMD_UNITDIR) + fi AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") - AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml -- src/bluetoothd.8 src/bluetooth.service bluez.pc) -+ src/bluetoothd.8 src/bluetooth.service bluez.pc +-AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc) ++AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc + libsbc.pc) +Index: b/libsbc.pc.in +=================================================================== --- /dev/null +++ b/libsbc.pc.in @@ -0,0 +1,10 @@ diff --git a/bluez-4.101.tar.bz2 b/bluez-4.101.tar.bz2 new file mode 100644 index 0000000..c464d98 --- /dev/null +++ b/bluez-4.101.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88f170b52119d576281a20ee98d65319b52cf4fb71aa7a7af1c9e928779baaa0 +size 1039976 diff --git a/bluez-4.99.tar.bz2 b/bluez-4.99.tar.bz2 deleted file mode 100644 index e33e35f..0000000 --- a/bluez-4.99.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3636b0a7422fd0b4b2aa972b83c6036571c0dcc1f6236423eef1788a088700d -size 1001874 diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index b99f374..e0cb9d2 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Jun 27 20:39:52 UTC 2012 - seife+obs@b1-systems.com + +- ver 4.101: + - Fix issue with missing BlueZ service file. + - Fix issue with aborting A2DP setup during AVDTP start. + - Fix issue with handling of multiple A2DP indication. + - Fix issue with handling AVDTP abort with invalid SEID. + - Fix issue with rejecting AVDTP abort commands. + - Add support for handling AVDTP command collision. +- our bluez-4.100 patches are applied upstream +- apitest was removed and is thus no longer in bluez-test + +------------------------------------------------------------------- +Thu Jun 21 08:57:47 UTC 2012 - seife+obs@b1-systems.com + +- remove obsolete configure options +- fix LDFLAGS / "-pie" acinclude.m4 bug + +------------------------------------------------------------------- +Wed Jun 20 11:17:53 UTC 2012 - seife+obs@b1-systems.com + +- update to bluez-4.100: + * Fix issue with crashing when SCO connection fails. + * Fix issue with HFP gateway failing on first GSM connection. + * Fix issue with AVRCP and handling of vendor commands. + * Fix issue with handling AVRCP subunit info command. + * Fix issue with missing capability for AVRCP track reached end. + * Fix issue with AVDTP signaling and GStreamer SBC NULL check. + * Fix issue with AVDTP Reconfigure Reject message. + * Fix issue with incorrect EIR length parsing. + * Fix issue with SDP disconnect for HIDSDPDisable. + * Fix issue with SDP interoperability with Mac OS X Lion. + * Fix issue with reverse SDP discovery with some devices. + * Fix issue with discovering state during power off operation. + * Add support for AVRCP Volume Changed notifications. + * Add support for AVRCP Set Absolute Volume handling. + * Add support for display legacy PIN code agent method. + * Add support for multiple media transports per endpoint. + * Add support for discovering device information characteristics. + * Add support for vendor source for Device ID setting. + * Add support for immediate alert server. + * Add support for link loss server. +- Notes: + * This version requires D-Bus 1.4 or later. + * This version requires GLib 2.28 or later. + ------------------------------------------------------------------- Thu Apr 26 15:04:58 UTC 2012 - seife+obs@b1-systems.com diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec index eb2aca4..ffe8531 100644 --- a/bluez-gstreamer.spec +++ b/bluez-gstreamer.spec @@ -18,21 +18,20 @@ Name: bluez-gstreamer -BuildRequires: dbus-1-devel +BuildRequires: dbus-1-devel >= 1.4 BuildRequires: flex -%if 0%{?suse_version} > 1120 BuildRequires: libcap-ng-devel -%define with_libcapng --enable-capng -%endif %if 0%{?suse_version} > 1130 BuildRequires: pkgconfig(systemd) %endif BuildRequires: alsa-devel +BuildRequires: automake BuildRequires: check-devel -BuildRequires: glib2-devel >= 2.16 +BuildRequires: glib2-devel >= 2.28 BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libsndfile-devel +BuildRequires: libtool BuildRequires: libudev-devel BuildRequires: libusb-devel BuildRequires: pkg-config @@ -40,7 +39,7 @@ BuildRequires: readline-devel BuildRequires: udev BuildRequires: pkgconfig(libnl-1) Url: http://www.bluez.org -Version: 4.99 +Version: 4.101 Release: 0 Summary: Bluetooth Sound Support License: GPL-2.0+ @@ -49,7 +48,6 @@ Source: bluez-%{version}.tar.bz2 Source3: bluetooth.sysconfig Source4: bluetooth.sh Source6: README.SUSE -Patch1: bluez-4.75-udev-use-helperscript.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libbluetooth3 = %{version} Provides: bluez-audio:%_libdir/gstreamer-0.10/libgstbluetooth.so @@ -73,12 +71,11 @@ Authors: %prep %setup -n bluez-%{version} -q -%patch1 -p1 cp %{S:6} . %build +autoreconf -fiv %configure --with-pic \ - --libdir=%{_libdir} \ --libexecdir=/lib \ --enable-gstreamer \ --enable-alsa \ @@ -91,12 +88,10 @@ cp %{S:6} . --enable-test \ --enable-pand \ --enable-dund \ - --enable-proximity \ --enable-wiimote \ - --enable-thermometer \ --enable-datafiles \ - --enable-pcmcia \ - %{?with_libcapng} + --enable-pcmcia + make %{?_smp_mflags} all V=1 %install diff --git a/bluez.changes b/bluez.changes index b99f374..e0cb9d2 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Wed Jun 27 20:39:52 UTC 2012 - seife+obs@b1-systems.com + +- ver 4.101: + - Fix issue with missing BlueZ service file. + - Fix issue with aborting A2DP setup during AVDTP start. + - Fix issue with handling of multiple A2DP indication. + - Fix issue with handling AVDTP abort with invalid SEID. + - Fix issue with rejecting AVDTP abort commands. + - Add support for handling AVDTP command collision. +- our bluez-4.100 patches are applied upstream +- apitest was removed and is thus no longer in bluez-test + +------------------------------------------------------------------- +Thu Jun 21 08:57:47 UTC 2012 - seife+obs@b1-systems.com + +- remove obsolete configure options +- fix LDFLAGS / "-pie" acinclude.m4 bug + +------------------------------------------------------------------- +Wed Jun 20 11:17:53 UTC 2012 - seife+obs@b1-systems.com + +- update to bluez-4.100: + * Fix issue with crashing when SCO connection fails. + * Fix issue with HFP gateway failing on first GSM connection. + * Fix issue with AVRCP and handling of vendor commands. + * Fix issue with handling AVRCP subunit info command. + * Fix issue with missing capability for AVRCP track reached end. + * Fix issue with AVDTP signaling and GStreamer SBC NULL check. + * Fix issue with AVDTP Reconfigure Reject message. + * Fix issue with incorrect EIR length parsing. + * Fix issue with SDP disconnect for HIDSDPDisable. + * Fix issue with SDP interoperability with Mac OS X Lion. + * Fix issue with reverse SDP discovery with some devices. + * Fix issue with discovering state during power off operation. + * Add support for AVRCP Volume Changed notifications. + * Add support for AVRCP Set Absolute Volume handling. + * Add support for display legacy PIN code agent method. + * Add support for multiple media transports per endpoint. + * Add support for discovering device information characteristics. + * Add support for vendor source for Device ID setting. + * Add support for immediate alert server. + * Add support for link loss server. +- Notes: + * This version requires D-Bus 1.4 or later. + * This version requires GLib 2.28 or later. + ------------------------------------------------------------------- Thu Apr 26 15:04:58 UTC 2012 - seife+obs@b1-systems.com diff --git a/bluez.spec b/bluez.spec index 5587daa..46744cc 100644 --- a/bluez.spec +++ b/bluez.spec @@ -18,12 +18,9 @@ Name: bluez -BuildRequires: dbus-1-devel +BuildRequires: dbus-1-devel >= 1.4 BuildRequires: flex -%if 0%{?suse_version} > 1120 BuildRequires: libcap-ng-devel -%define with_libcapng --enable-capng -%endif %if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} @@ -32,7 +29,7 @@ BuildRequires: systemd BuildRequires: alsa-devel BuildRequires: automake BuildRequires: check-devel -BuildRequires: glib2-devel >= 2.16 +BuildRequires: glib2-devel >= 2.28 BuildRequires: libsndfile-devel BuildRequires: libtool BuildRequires: libudev-devel @@ -42,22 +39,24 @@ BuildRequires: readline-devel BuildRequires: udev BuildRequires: pkgconfig(libnl-1) Url: http://www.bluez.org -Version: 4.99 +Version: 4.101 Release: 0 Summary: Bluetooth Stack for Linux License: GPL-2.0+ Group: Hardware/Mobile Source: bluez-%{version}.tar.bz2 +# bug in the 4.100 tarball: missing file... +Source1: org.bluez.service Source2: bluez-coldplug.init Source3: bluetooth.sysconfig Source4: bluetooth.sh Source5: baselibs.conf Source6: README.SUSE Source7: bluetooth.modprobe -Patch1: bluez-4.75-udev-use-helperscript.diff -Patch2: 001-remove-rule-dell-mouse.patch -# needed until next upstream release --seife -Patch3: libsbc-make-it-installable +# TODO: push upstream (jeffm?) -- seife +Patch3: bluez-4.100-libsbc-make-it-installable.diff +# TODO: check for obsoletion +Patch9: 001-remove-rule-dell-mouse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: bluez-utils = 3.36 Obsoletes: bluez-utils <= 3.36 @@ -234,18 +233,20 @@ Authors: %prep %setup -q -%patch1 -p1 %patch3 -p1 # disabled the patch because it does no longer cleanly apply and the rule has # changed significantly anyway. I'll keep it until i get confirmation in bugzilla. -##%%patch2 -p1 +##%%patch9 -p1 cp %{S:6} . mkdir dbus-apis cp -a doc/*.txt dbus-apis/ %build autoreconf -fiv -%configure --with-pic \ +%configure --with-pic \ +%if 0%{?has_systemd} + --with-systemdunitdir=%{_unitdir} \ +%endif --libexecdir=/lib \ --enable-gstreamer \ --enable-alsa \ @@ -258,15 +259,10 @@ autoreconf -fiv --enable-test \ --enable-pand \ --enable-dund \ - --enable-proximity \ --enable-wiimote \ - --enable-thermometer \ --enable-datafiles \ - --enable-pcmcia \ - %if 0%{?has_systemd} - --with-systemdunitdir=%{_unitdir} \ - %endif - %{?with_libcapng} + --enable-pcmcia + make %{?_smp_mflags} all V=1 %install @@ -274,7 +270,6 @@ make DESTDIR=$RPM_BUILD_ROOT install # bluez-test cd test install --mode=0755 \ - apitest \ simple-agent \ simple-service \ list-devices \ @@ -393,6 +388,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?has_systemd} %{_unitdir}/bluetooth.service %endif +%{_datadir}/dbus-1/system-services/org.bluez.service %files devel %defattr(-, root, root) @@ -418,7 +414,6 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/hciemu %{_bindir}/l2test %{_bindir}/rctest -%{_bindir}/apitest %{_bindir}/list-devices %{_bindir}/simple-agent %{_bindir}/simple-service diff --git a/org.bluez.service b/org.bluez.service new file mode 100644 index 0000000..5b65b0a --- /dev/null +++ b/org.bluez.service @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=org.bluez +Exec=/bin/false +User=root +SystemdService=dbus-org.bluez.service