pool/bluez
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 127751 from Base:System

Browse Source 
remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff (forwarded request 127750 from seife)

OBS-URL: https://build.opensuse.org/request/show/127751
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=98
This commit is contained in:
Ismail Dönmez 2012-07-13 09:30:36 +00:00 committed by Git OBS Bridge
commit 45f1016880
10 changed files with 169 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bluetooth.sh
View File

@ -1,9 +0,0 @@
#!/bin/sh
BLUETOOTH_CONFIG=/etc/sysconfig/bluetooth
test -r $BLUETOOTH_CONFIG && . $BLUETOOTH_CONFIG
if [ "$START_BLUETOOTHD" = "no" ]; then
exit 0
fi
exec /usr/sbin/bluetoothd --udev

40
libsbc-make-it-installable → bluez-4.100-libsbc-make-it-installable.diff
View File

@ -12,9 +12,13 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
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 <jeffm@suse.com>
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 <jeffm@suse.com>
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 <jeffm@suse.com>
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 <jeffm@suse.com>
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 @@

3
bluez-4.101.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88f170b52119d576281a20ee98d65319b52cf4fb71aa7a7af1c9e928779baaa0
size 1039976

11
bluez-4.75-udev-use-helperscript.diff
View File

@ -1,11 +0,0 @@
Index: b/scripts/bluetooth.rules.in
===================================================================
--- a/scripts/bluetooth.rules.in
+++ b/scripts/bluetooth.rules.in
@@ -1,4 +1,4 @@
# Run helper every time a Bluetooth device appears
# On remove actions, bluetoothd should go away by itself
-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
+ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
+ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"

3
bluez-4.99.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3636b0a7422fd0b4b2aa972b83c6036571c0dcc1f6236423eef1788a088700d
size 1001874

52
bluez-gstreamer.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Wed Jul 11 14:04:54 UTC 2012 - seife+obs@b1-systems.com
- remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff
-------------------------------------------------------------------
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

22
bluez-gstreamer.spec
View File

@ -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,16 +39,14 @@ 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+
Group: Productivity/Multimedia/Sound/Utilities
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 +70,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 +87,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

52
bluez.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Wed Jul 11 14:04:54 UTC 2012 - seife+obs@b1-systems.com
- remove unused bluetooth.sh, bluez-4.75-udev-use-helperscript.diff
-------------------------------------------------------------------
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

41
bluez.spec
View File

@ -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,23 @@ 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 +232,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 +258,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 +269,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
# bluez-test
cd test
install --mode=0755 \
apitest \
simple-agent \
simple-service \
list-devices \
@ -295,7 +289,6 @@ rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la
install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldplug
install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
# which means to have a fixed "/usr/lib/cups/" directory
@ -393,6 +386,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 +412,6 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/hciemu
%{_bindir}/l2test
%{_bindir}/rctest
%{_bindir}/apitest
%{_bindir}/list-devices
%{_bindir}/simple-agent
%{_bindir}/simple-service

5
org.bluez.service Normal file
View File

@ -0,0 +1,5 @@
[D-BUS Service]
Name=org.bluez
Exec=/bin/false
User=root
SystemdService=dbus-org.bluez.service