From ba98be0356215dd3fdfb0cd40d7bf4cde4d7359a Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 21 Oct 2024 16:30:48 -0400 Subject: [PATCH] build: Fix make distcheck This fixes the following error: make[2]: *** No rule to make target 'doct/hci.7', needed by 'distdir-am'. --- Makefile.am | 2 +- src/btd.h | 1 + src/main.c | 5 +++++ src/main.conf | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3ced4f87a..f639f7f8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -386,7 +386,7 @@ man_MANS += doc/org.bluez.obex.Client.5 doc/org.bluez.obex.Session.5 \ doc/org.bluez.obex.Image.5 endif manual_pages += src/bluetoothd.8 -manual_pages += doct/hci.7 doc/l2cap.7 doc/rfcomm.7 +manual_pages += doc/hci.7 doc/l2cap.7 doc/rfcomm.7 manual_pages += doc/org.bluez.Adapter.5 doc/org.bluez.Device.5 \ doc/org.bluez.DeviceSet.5 doc/org.bluez.AgentManager.5 \ doc/org.bluez.Agent.5 doc/org.bluez.ProfileManager.5 \ diff --git a/src/btd.h b/src/btd.h index 147b61f12..07205aa69 100644 --- a/src/btd.h +++ b/src/btd.h @@ -106,6 +106,7 @@ struct btd_avdtp_opts { struct btd_avrcp_opts { bool volume_without_target; + bool volume_category; }; struct btd_advmon_opts { diff --git a/src/main.c b/src/main.c index 5bd3a035d..89ee6897c 100644 --- a/src/main.c +++ b/src/main.c @@ -167,6 +167,7 @@ static const char *avdtp_options[] = { static const char *avrcp_options[] = { "VolumeWithoutTarget", + "VolumeCategory", NULL }; @@ -1151,6 +1152,9 @@ static void parse_avrcp(GKeyFile *config) parse_config_bool(config, "AVRCP", "VolumeWithoutTarget", &btd_opts.avrcp.volume_without_target); + parse_config_bool(config, "AVRCP", + "VolumeCategory", + &btd_opts.avrcp.volume_category); } static void parse_advmon(GKeyFile *config) @@ -1220,6 +1224,7 @@ static void init_defaults(void) btd_opts.avdtp.stream_mode = BT_IO_MODE_BASIC; btd_opts.avrcp.volume_without_target = false; + btd_opts.avrcp.volume_category = true; btd_opts.advmon.rssi_sampling_period = 0xFF; btd_opts.csis.encrypt = true; diff --git a/src/main.conf b/src/main.conf index 5d206b9ec..fff13ed2f 100644 --- a/src/main.conf +++ b/src/main.conf @@ -311,6 +311,11 @@ # version is ignored. #VolumeWithoutTarget = false +# Validate that remote AVRCP profiles advertise the category-2 bit before +# allowing SetAbsoluteVolume calls or registering for EVENT_VOLUME_CHANGED +# notifications. +#VolumeCategory = true + [Policy] # # The ReconnectUUIDs defines the set of remote services that should try -- 2.47.3