Merge branch 'bluez5' into 'master'

Add support for droid Bluetooth HSP audio. See merge request !11
sailfishos · Jun 15, 2017 · 33b28a7 · 33b28a7
2 parents a8779a6 + b58744c
commit 33b28a7
Show file tree

Hide file tree

Showing 8 changed files with 932 additions and 200 deletions.
diff --git a/rpm/pulseaudio.spec b/rpm/pulseaudio.spec
@@ -45,6 +45,7 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  fdupes
 BuildRequires:  systemd-libs
 BuildRequires:  systemd-devel
+BuildRequires:  pkgconfig(bluez) >= 4.101
 
 %description
 PulseAudio is a layer between audio devices and applications. It removes

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -2303,7 +2303,9 @@ libbluez5_util_la_SOURCES += \
 		modules/bluetooth/backend-native.c
 endif
 libbluez5_util_la_SOURCES += \
-		modules/bluetooth/backend-droid.c
+		modules/bluetooth/backend-droid.c \
+		modules/bluetooth/backend-droid-native.c \
+		modules/bluetooth/backend-droid-volume.c
 
 libbluez5_util_la_LDFLAGS = -avoid-version
 libbluez5_util_la_LIBADD = $(MODULE_LIBADD) $(DBUS_LIBS)