diff --git a/bluez-4.100-libsbc-make-it-installable.diff b/bluez-4.100-libsbc-make-it-installable.diff deleted file mode 100644 index d072503..0000000 --- a/bluez-4.100-libsbc-make-it-installable.diff +++ /dev/null @@ -1,98 +0,0 @@ -From: Jeff Mahoney -Subject: libsbc: Make it installable - - While rebuilding Opal, I found that the SBC plugin no longer ships with - the SBC code. This patch allows other projects to use the SBC code - without having to duplicate it. - -Signed-off-by: Jeff Mahoney ---- - Makefile.am | 8 ++++---- - configure.ac | 3 ++- - libsbc.pc.in | 10 ++++++++++ - 3 files changed, 16 insertions(+), 5 deletions(-) - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -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 - --include_HEADERS += $(lib_headers) -+include_HEADERS += $(lib_headers) sbc/sbc.h - - lib_LTLIBRARIES += lib/libbluetooth.la - - 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 --noinst_LTLIBRARIES += sbc/libsbc.la -+lib_LTLIBRARIES += sbc/libsbc.la - - 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 \ - 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 - --noinst_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc -+bin_PROGRAMS += sbc/sbcinfo sbc/sbcdec sbc/sbcenc - - sbc_sbcdec_SOURCES = sbc/sbcdec.c sbc/formats.h - sbc_sbcdec_LDADD = sbc/libsbc.la - - sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h -@@ -456,11 +456,11 @@ endif - - TESTS = $(unit_tests) - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = bluez.pc -+pkgconfig_DATA = bluez.pc libsbc.pc - - DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles - - DISTCLEANFILES = $(pkgconfig_DATA) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -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 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 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: BlueZ libsbc -+Description: Bluetooth low-complexity SubBand Codec -+Version: @VERSION@ -+Libs: -L${libdir} -lsbc -+Cflags: -I${includedir} diff --git a/bluez.spec b/bluez.spec index e9acc27..3d69cd7 100644 --- a/bluez.spec +++ b/bluez.spec @@ -54,8 +54,6 @@ Source6: README.SUSE Source7: bluetooth.modprobe # already fixed upstream Patch0: 0001-network-fix-network-Connect-method-parameters.patch -# 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 @@ -64,6 +62,7 @@ Obsoletes: bluez-utils <= 3.36 Provides: bluez-audio = 3.36 Obsoletes: bluez-audio <= 3.36 Requires: libbluetooth3 = %{version} +Recommends: sbc %if %( echo `rpm -q --queryformat %%{version} udev` ) < 144 %define OLD_UDEV 1 %else @@ -159,43 +158,6 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. -Authors: --------- - Marcel Holtmann - and others, see AUTHORS in the documentation of the "bluez" package. - -%package sbc -Summary: Bluetooth Low-Complexity, Sub-Band Codec Utilities -License: GPL-2.0+ -Group: Hardware/Mobile -Requires: libbluetooth3 = %{version} -Requires: libsbc0 = %{version} - -%description sbc -The package contains utilities for using the SBC codec. - -The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - - -Authors: --------- - Marcel Holtmann - and others, see AUTHORS in the documentation of the "bluez" package. - -%package -n libsbc0 -Summary: Bluetooth Low-Complexity, Sub-Band Codec Library -License: GPL-2.0+ -Group: Hardware/Mobile -Requires: libbluetooth3 = %{version} - -%description -n libsbc0 -The package contains libraries for using the SBC codec. - -The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - - Authors: -------- Marcel Holtmann @@ -240,7 +202,6 @@ Authors: %prep %setup -q %patch0 -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. ##%%patch9 -p1 @@ -346,10 +307,6 @@ rm -rf $RPM_BUILD_ROOT %{insserv_cleanup} %endif -%post -n libsbc0 -p /sbin/ldconfig - -%postun -n libsbc0 -p /sbin/ldconfig - %post -n libbluetooth3 -p /sbin/ldconfig %postun -n libbluetooth3 -p /sbin/ldconfig @@ -413,8 +370,6 @@ rm -rf $RPM_BUILD_ROOT /usr/include/bluetooth %{_libdir}/libbluetooth.so %{_libdir}/pkgconfig/bluez.pc -%{_libdir}/libsbc.so -%{_libdir}/pkgconfig/libsbc.pc %files -n libbluetooth3 %defattr(-, root, root) @@ -452,16 +407,6 @@ rm -rf $RPM_BUILD_ROOT %config /usr/share/alsa/bluetooth.conf %{_libdir}/alsa-lib/*.so -%files sbc -%defattr(-, root, root) -%{_bindir}/sbcdec -%{_bindir}/sbcenc -%{_bindir}/sbcinfo - -%files -n libsbc0 -%defattr(-,root,root) -%{_libdir}/libsbc.so.* - %files compat %defattr(-,root,root) %{_bindir}/dund