26ac33748c
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
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From: Jeff Mahoney <jeffm@suse.com>
|
|
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 <jeffm@suse.com>
|
|
---
|
|
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}
|