Skip to content

Commit

Permalink
webos: bluez5 (refresh patches to apply on 5.71 version)
Browse files Browse the repository at this point in the history 
:Release Notes:

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/748755

ERROR: Applying patch '0012-Support-enabling-avdtp-delayReport.patch' on target directory 'TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/bluez5/5.71/bluez-5.71'
CmdError('quilt --quiltrc TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/bluez5/5.71/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0012-Support-enabling-avdtp-delayReport.patch
patching file profiles/audio/a2dp.c
patching file profiles/audio/a2dp.h
patching file profiles/audio/avdtp.c
patching file profiles/audio/avdtp.h
patching file profiles/audio/media.c
Hunk #1 succeeded at 133 (offset 1 line).
Hunk #2 succeeded at 1494 (offset 44 lines).
Hunk webosose#3 succeeded at 3321 (offset 78 lines).
patching file profiles/audio/media.h
Hunk #2 succeeded at 25 with fuzz 2 (offset -1 lines).
patching file src/adapter.c
Hunk #2 succeeded at 288 (offset 2 lines).
Hunk webosose#3 succeeded at 369 (offset 2 lines).
Hunk webosose#4 succeeded at 576 (offset 2 lines).
Hunk webosose#5 succeeded at 3516 (offset 8 lines).
Hunk webosose#6 FAILED at 3933.
Hunk webosose#7 succeeded at 5352 (offset 41 lines).
Hunk webosose#8 succeeded at 6898 (offset 41 lines).
Hunk webosose#9 succeeded at 6943 (offset 41 lines).
Hunk webosose#10 succeeded at 6954 (offset 41 lines).
1 out of 10 hunks FAILED -- rejects in file src/adapter.c
patching file src/adapter.h
patching file src/btd.h
patching file src/main.c
Hunk #2 succeeded at 1037 (offset 4 lines).
patching file src/main.conf
Patch 0012-Support-enabling-avdtp-delayReport.patch does not apply (enforce with -f)

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-504] Create GPVB with Yocto 5.0 Scarthgap

Change-Id: If1e2b507096a953d3803c6e4edf22996a9ff4340
  • Loading branch information
@shr-project
shr-project committed Dec 3, 2024
1 parent d677772 commit 78248c9
Show file tree
Hide file tree
Showing 19 changed files with 119 additions and 109 deletions.
4 changes: 2 additions & 2 deletions ...ipes-connectivity/bluez5/bluez5/0003-Fetching-device-type-like-BLE-BREDR-from-bluez.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ index 9b58e0c4e..021bd29ae 100644
uint16_t vendor_src;
uint16_t vendor;
uint16_t product;
@@ -1020,6 +1021,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
@@ -1013,6 +1014,21 @@ static gboolean dev_property_get_class(const GDBusPropertyTable *property,
return TRUE;
}

Expand All @@ -57,7 +57,7 @@ index 9b58e0c4e..021bd29ae 100644
static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
uint16_t *appearance)
{
@@ -3168,6 +3184,7 @@ static const GDBusMethodTable device_methods[] = {
@@ -3178,6 +3194,7 @@ static const GDBusMethodTable device_methods[] = {
static const GDBusPropertyTable device_properties[] = {
{ "Address", "s", dev_property_get_address },
{ "AddressType", "s", property_get_address_type },
Expand Down
6 changes: 3 additions & 3 deletions ...onnectivity/bluez5/bluez5/0004-Fix-Gatt-connect-when-device-address-type-is-BDADDR_.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Upstream-Status: Pending
1 file changed, 28 insertions(+)

diff --git a/src/device.c b/src/device.c
index 021bd29ae..60515b262 100644
index ccc9b41fc..41d271e04 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2573,6 +2573,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
@@ -2583,6 +2583,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
return connect_profiles(dev, bdaddr_type, msg, NULL);
}

Expand Down Expand Up @@ -67,7 +67,7 @@ index 021bd29ae..60515b262 100644
static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
void *user_data)
{
@@ -3172,6 +3199,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
@@ -3182,6 +3209,7 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
static const GDBusMethodTable device_methods[] = {
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
Expand Down
4 changes: 2 additions & 2 deletions ...recipes-connectivity/bluez5/bluez5/0005-Use-system-bus-instead-of-session-for-obexd.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ index 90d0c0c8e..369e9e91c 100644
return -EIO;

diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index 1ed8c68ec..3af55440b 100644
index 2d2aa9508..d3821b80a 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -1302,7 +1302,7 @@ int pbap_init(void)
@@ -1303,7 +1303,7 @@ int pbap_init(void)

DBG("");

Expand Down
12 changes: 6 additions & 6 deletions ...ipes-connectivity/bluez5/bluez5/0006-Implementation-to-get-connected-profiles-uuids.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [webos specific]
1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/device.c b/src/device.c
index 60515b262..43642d4f8 100644
index 41d271e04..bc92fe74c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -230,6 +230,7 @@ struct btd_device {
Expand All @@ -36,7 +36,7 @@ index 60515b262..43642d4f8 100644
GSList *primaries; /* List of primary services */
GSList *services; /* List of btd_service */
GSList *pending; /* Pending services */
@@ -1052,6 +1053,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
@@ -1045,6 +1046,28 @@ static gboolean get_appearance(const GDBusPropertyTable *property, void *data,
return FALSE;
}

Expand Down Expand Up @@ -65,7 +65,7 @@ index 60515b262..43642d4f8 100644
static gboolean dev_property_exists_appearance(
const GDBusPropertyTable *property, void *data)
{
@@ -2097,8 +2120,14 @@ static void device_profile_connected(struct btd_device *dev,
@@ -2107,8 +2130,14 @@ static void device_profile_connected(struct btd_device *dev,

DBG("%s %s (%d)", profile->name, strerror(-err), -err);

Expand All @@ -81,7 +81,7 @@ index 60515b262..43642d4f8 100644

if (dev->pending == NULL)
goto done;
@@ -2624,6 +2653,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
@@ -2634,6 +2663,14 @@ static DBusMessage *connect_profile(DBusConnection *conn, DBusMessage *msg,
static void device_profile_disconnected(struct btd_device *dev,
struct btd_profile *profile, int err)
{
Expand All @@ -96,15 +96,15 @@ index 60515b262..43642d4f8 100644
if (!dev->disconnect)
return;

@@ -3229,6 +3266,7 @@ static const GDBusPropertyTable device_properties[] = {
@@ -3239,6 +3276,7 @@ static const GDBusPropertyTable device_properties[] = {
{ "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi },
{ "Connected", "b", dev_property_get_connected },
{ "UUIDs", "as", dev_property_get_uuids },
+ { "ConnectedUUIDS", "as", dev_property_get_connected_uuids },
{ "Modalias", "s", dev_property_get_modalias, NULL,
dev_property_exists_modalias },
{ "Adapter", "o", dev_property_get_adapter },
@@ -3338,8 +3376,18 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
@@ -3350,8 +3388,18 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
if (!state->connected)
return;

Expand Down
18 changes: 9 additions & 9 deletions ...onnectivity/bluez5/bluez5/0007-recievePassThrough-commad-support-required-for-webos.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ index 6f64f162b..b002470f9 100644
break;
}
diff --git a/src/device.c b/src/device.c
index 43642d4f8..ec407a808 100644
index bc92fe74c..41c6a7987 100644
--- a/src/device.c
+++ b/src/device.c
@@ -185,6 +185,11 @@ enum {
Expand All @@ -80,7 +80,7 @@ index 43642d4f8..ec407a808 100644
};

static const uint16_t uuid_list[] = {
@@ -1463,6 +1470,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
@@ -1456,6 +1463,18 @@ dev_property_manufacturer_data_exist(const GDBusPropertyTable *property,
return bt_ad_has_manufacturer_data(device->ad, NULL);
}

Expand All @@ -99,7 +99,7 @@ index 43642d4f8..ec407a808 100644
static void append_service_data(void *data, void *user_data)
{
struct bt_ad_service_data *sd = data;
@@ -1481,13 +1500,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
@@ -1474,13 +1493,13 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
struct btd_device *device = data;
DBusMessageIter dict;

Expand All @@ -114,7 +114,7 @@ index 43642d4f8..ec407a808 100644
bt_ad_foreach_service_data(device->ad, append_service_data, &dict);

dbus_message_iter_close_container(iter, &dict);
@@ -1495,6 +1514,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
@@ -1488,6 +1507,28 @@ dev_property_get_service_data(const GDBusPropertyTable *property,
return TRUE;
}

Expand Down Expand Up @@ -143,7 +143,7 @@ index 43642d4f8..ec407a808 100644
static gboolean
dev_property_service_data_exist(const GDBusPropertyTable *property,
void *data)
@@ -2239,6 +2280,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
@@ -2249,6 +2290,15 @@ void device_set_manufacturer_data(struct btd_device *dev, GSList *list,
g_slist_foreach(list, add_manufacturer_data, dev);
}

Expand All @@ -159,7 +159,7 @@ index 43642d4f8..ec407a808 100644
static void add_service_data(void *data, void *user_data)
{
struct eir_sd *sd = data;
@@ -3272,6 +3322,8 @@ static const GDBusPropertyTable device_properties[] = {
@@ -3282,6 +3332,8 @@ static const GDBusPropertyTable device_properties[] = {
{ "Adapter", "o", dev_property_get_adapter },
{ "ManufacturerData", "a{qv}", dev_property_get_manufacturer_data,
NULL, dev_property_manufacturer_data_exist },
Expand All @@ -168,7 +168,7 @@ index 43642d4f8..ec407a808 100644
{ "ServiceData", "a{sv}", dev_property_get_service_data,
NULL, dev_property_service_data_exist },
{ "TxPower", "n", dev_property_get_tx_power, NULL,
@@ -4311,6 +4363,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4323,6 +4375,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
device->sirks = queue_new();
device->temporary = true;

Expand All @@ -179,10 +179,10 @@ index 43642d4f8..ec407a808 100644
gatt_service_removed, device, NULL);

diff --git a/src/device.h b/src/device.h
index 3252e14ef..9dcb3c140 100644
index 8bb38669d..2c9a84a41 100644
--- a/src/device.h
+++ b/src/device.h
@@ -196,3 +196,5 @@ typedef void (*bt_device_ad_func_t)(void *data, void *user_data);
@@ -199,3 +199,5 @@ typedef void (*bt_device_ad_func_t)(void *data, void *user_data);

void btd_device_foreach_ad(struct btd_device *dev, bt_device_ad_func_t func,
void *data);
Expand Down
16 changes: 8 additions & 8 deletions ...ebos/recipes-connectivity/bluez5/bluez5/0008-Added-dbus-signal-for-MediaPlayRequest.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ index dda9a303f..4063650c7 100644
}

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 66f512e00..3e3a1013a 100644
index 62f53defa..1ce2792cb 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1913,7 +1913,7 @@ static uint32_t media_player_get_position(void *user_data)
@@ -1970,7 +1970,7 @@ static uint32_t media_player_get_position(void *user_data)
sec = (uint32_t) timedelta;
msec = (uint32_t) ((timedelta - sec) * 1000);

Expand All @@ -62,10 +62,10 @@ index 66f512e00..3e3a1013a 100644

static uint32_t media_player_get_duration(void *user_data)
diff --git a/src/device.c b/src/device.c
index ec407a808..caa8c55ca 100644
index 41c6a7987..7e98da6ba 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2289,6 +2289,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
@@ -2299,6 +2299,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
DEVICE_INTERFACE, "KeyCode");
}

Expand All @@ -88,7 +88,7 @@ index ec407a808..caa8c55ca 100644
static void add_service_data(void *data, void *user_data)
{
struct eir_sd *sd = data;
@@ -3283,6 +3299,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
@@ -3293,6 +3309,12 @@ static DBusMessage *cancel_pairing(DBusConnection *conn, DBusMessage *msg,
return dbus_message_new_method_return(msg);
}

Expand All @@ -101,7 +101,7 @@ index ec407a808..caa8c55ca 100644
static const GDBusMethodTable device_methods[] = {
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
@@ -4351,7 +4373,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4363,7 +4385,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,

if (g_dbus_register_interface(dbus_conn,
device->path, DEVICE_INTERFACE,
Expand All @@ -111,10 +111,10 @@ index ec407a808..caa8c55ca 100644
device_free) == FALSE) {
error("Unable to register device interface for %s", address);
diff --git a/src/device.h b/src/device.h
index 9dcb3c140..ae54e71cf 100644
index 2c9a84a41..d2ff12306 100644
--- a/src/device.h
+++ b/src/device.h
@@ -198,3 +198,6 @@ void btd_device_foreach_ad(struct btd_device *dev, bt_device_ad_func_t func,
@@ -201,3 +201,6 @@ void btd_device_foreach_ad(struct btd_device *dev, bt_device_ad_func_t func,
void *data);

void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state);
Expand Down
16 changes: 8 additions & 8 deletions ...s/recipes-connectivity/bluez5/bluez5/0009-avrcp-getting-remote-device-features-list.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dcc06f3359fd20877f9b420044042a752ed14c24 Mon Sep 17 00:00:00 2001
From 4b83704a797e531deb5256c189e961d760ae0d91 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <[email protected]>
Date: Tue, 5 Feb 2019 18:10:55 +0530
Subject: [PATCH] avrcp getting remote device features list
Expand Down Expand Up @@ -80,7 +80,7 @@ index 4063650c7..f3f2009f4 100644
}

diff --git a/src/device.c b/src/device.c
index caa8c55ca..fd26b6057 100644
index 7e98da6ba..d4f67eb03 100644
--- a/src/device.c
+++ b/src/device.c
@@ -298,6 +298,8 @@ struct btd_device {
Expand All @@ -92,7 +92,7 @@ index caa8c55ca..fd26b6057 100644
};

static const uint16_t uuid_list[] = {
@@ -1536,6 +1538,46 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
@@ -1529,6 +1531,46 @@ static gboolean dev_property_get_key_code(const GDBusPropertyTable *property,
return TRUE;
}

Expand Down Expand Up @@ -139,7 +139,7 @@ index caa8c55ca..fd26b6057 100644
static gboolean
dev_property_service_data_exist(const GDBusPropertyTable *property,
void *data)
@@ -2305,6 +2347,25 @@ void media_metadata_request(struct btd_device *dev)
@@ -2315,6 +2357,25 @@ void media_metadata_request(struct btd_device *dev)
DBUS_TYPE_INVALID);
}

Expand All @@ -165,7 +165,7 @@ index caa8c55ca..fd26b6057 100644
static void add_service_data(void *data, void *user_data)
{
struct eir_sd *sd = data;
@@ -3346,6 +3407,10 @@ static const GDBusPropertyTable device_properties[] = {
@@ -3356,6 +3417,10 @@ static const GDBusPropertyTable device_properties[] = {
NULL, dev_property_manufacturer_data_exist },
{ "KeyCode", "a{sv}", dev_property_get_key_code,
NULL, dev_property_key_code_exist},
Expand All @@ -176,7 +176,7 @@ index caa8c55ca..fd26b6057 100644
{ "ServiceData", "a{sv}", dev_property_get_service_data,
NULL, dev_property_service_data_exist },
{ "TxPower", "n", dev_property_get_tx_power, NULL,
@@ -4388,6 +4453,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4400,6 +4465,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
device->passththough_key.state = NULL;
device->passththough_key.key = NULL;

Expand All @@ -187,7 +187,7 @@ index caa8c55ca..fd26b6057 100644
gatt_service_removed, device, NULL);

diff --git a/src/device.h b/src/device.h
index ae54e71cf..6856177d6 100644
index d2ff12306..19e49717a 100644
--- a/src/device.h
+++ b/src/device.h
@@ -10,6 +10,10 @@
Expand All @@ -201,7 +201,7 @@ index ae54e71cf..6856177d6 100644

struct btd_device;

@@ -201,3 +205,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
@@ -204,3 +208,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons

void media_play_request(struct btd_device *dev);
void media_metadata_request(struct btd_device *dev);
Expand Down
4 changes: 2 additions & 2 deletions meta-webos/recipes-connectivity/bluez5/bluez5/0010-Fix-volume-property-not-able-to-set.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Upstream-Status: Pending
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index dd923b03e..96fa29e7c 100644
index 23ea267f6..83dec8f0d 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -1333,7 +1333,7 @@ static int media_transport_init_source(struct media_transport *transport)
@@ -1176,7 +1176,7 @@ static int media_transport_init_source(struct media_transport *transport)
transport->data = a2dp;
transport->destroy = destroy_a2dp;

Expand Down
10 changes: 5 additions & 5 deletions ...onnectivity/bluez5/bluez5/0011-Fix-volume-level-notification-not-appearing-after-12.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Upstream-Status: Inappropriate [webos specific]
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 3e3a1013a..d24329dcd 100644
index 1ce2792cb..50b7b7edd 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1928,8 +1928,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
@@ -1985,8 +1985,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
{
struct media_player *mp = user_data;

Expand All @@ -43,10 +43,10 @@ index 3e3a1013a..d24329dcd 100644
mp->volume = volume;
}
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 96fa29e7c..f2ad172ef 100644
index 83dec8f0d..155695b1a 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -779,8 +779,8 @@ static void set_volume(const GDBusPropertyTable *property,
@@ -811,8 +811,8 @@ static void set_volume(const GDBusPropertyTable *property,
}

volume = (int8_t)arg;
Expand All @@ -57,7 +57,7 @@ index 96fa29e7c..f2ad172ef 100644

notify = transport->source_watch ? true : false;
if (notify) {
@@ -1967,8 +1967,8 @@ void media_transport_update_volume(struct media_transport *transport,
@@ -1717,8 +1717,8 @@ void media_transport_update_volume(struct media_transport *transport,
return;

/* Check if volume really changed */
Expand Down
Loading

0 comments on commit 78248c9

Please sign in to comment.