mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/bluez5_utils: make a single option for avrcp and a2dp

Browse Source 
Build of avrcp without a2dp is broken since commit
fb9fc969d9:

/home/buildroot/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/9.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: profiles/audio/bluetoothd-avrcp.o: in function `avrcp_handle_set_volume':
avrcp.c:(.text+0x9c4): undefined reference to `media_transport_update_device_volume'

However, build of a2dp without avrcp is also broken:

/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv32-buildroot-linux-gnu/10.2.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: profiles/audio/bluetoothd-media.o: in function `.L50':
media.c:(.text+0x508): undefined reference to `avrcp_unregister_player'
/data/buildroot-autobuilder/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/riscv32-buildroot-linux-gnu/10.2.0/../../../../riscv32-buildroot-linux-gnu/bin/ld: profiles/audio/bluetoothd-media.o: in function `match_endpoint_by_path':
media.c:(.text+0x824): undefined reference to `avrcp_register_player'

Fixes:
 - http://autobuild.buildroot.org/results/d54cdfc03212fff772a863d1bc8afd3cfb605831
 - http://autobuild.buildroot.org/results/64d75af986a4d6e9c5a176efb6e22046f4d82350

So make a single audio option for a2dp and avrcp

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2021-07-27 09:25:23 +02:00
committed by Thomas Petazzoni
parent 9850f262fd
commit aedf2c83d0
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/bluez5_utils/Config.in
View File

@@ -58,17 +58,11 @@ config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
"Nokia OBEX PC Suite tool". So, only if OBEX support is "Nokia OBEX PC Suite tool". So, only if OBEX support is
enabled this option has an effect. enabled this option has an effect.
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_A2DP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO
bool "build a2dp plugin" bool "build audio plugins (a2dp and avrcp)"
default y default y
help help
Build plugin for A2DP (audio) profiles. Build plugins for audio profiles (for A2DP and AVRCP).
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AVRCP
bool "build avrcp plugin"
default y
help
Build plugin for AVRCP (audio) profiles.
config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH
bool "build health plugin" bool "build health plugin"

15
package/bluez5_utils/bluez5_utils.mk
View File

@@ -53,18 +53,11 @@ else
BLUEZ5_UTILS_CONF_OPTS += --disable-experimental BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
endif endif
# enable a2dp plugin # enable audio plugins (a2dp and avrcp)
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_A2DP),y) ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-a2dp BLUEZ5_UTILS_CONF_OPTS += --enable-a2dp --enable-avrcp
else else
BLUEZ5_UTILS_CONF_OPTS += --disable-a2dp BLUEZ5_UTILS_CONF_OPTS += --disable-a2dp --disable-avrcp
endif
#enable avrcp plugin
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AVRCP),y)
BLUEZ5_UTILS_CONF_OPTS += --enable-avrcp
else
BLUEZ5_UTILS_CONF_OPTS += --disable-avrcp
endif endif
# enable health plugin # enable health plugin