Skip to content

Commit

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

:Detailed Notes:
Fixes:
http://gecko.lge.com:80/Builds/Details/1243568
ERROR: Applying patch '0012-Support-enabling-avdtp-delayReport.patch' on target directory 'TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/bluez5/5.66-r0/bluez-5.66'
CmdError('quilt --quiltrc TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/bluez5/5.66-r0/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 128 (offset 8 lines).
Hunk #2 succeeded at 1327 with fuzz 2 (offset 507 lines).
Hunk webosose#3 succeeded at 3066 (offset 623 lines).
patching file profiles/audio/media.h
patching file src/adapter.c
Hunk #2 succeeded at 281 (offset 9 lines).
Hunk webosose#3 succeeded at 361 (offset 27 lines).
Hunk webosose#4 succeeded at 568 (offset 27 lines).
Hunk webosose#5 succeeded at 3487 (offset 164 lines).
Hunk webosose#6 FAILED at 3749.
Hunk webosose#7 succeeded at 5292 (offset 166 lines).
Hunk webosose#8 succeeded at 6826 (offset 169 lines).
Hunk webosose#9 succeeded at 6871 (offset 173 lines).
Hunk webosose#10 FAILED at 6706.
2 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
patching file src/main.conf
Patch 0012-Support-enabling-avdtp-delayReport.patch does not apply (enforce with -f)

stderr: ')

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRO-14883] Create GPVB with Yocto 4.2 Mickedore
  • Loading branch information
shr-project committed Jun 10, 2024
1 parent 8d84b80 commit 82e5603
Show file tree
Hide file tree
Showing 28 changed files with 132 additions and 142 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7f7b3ad0297475f478999bb53c6322017089140b Mon Sep 17 00:00:00 2001
From 3edb60015a4e93e25ac223c657f9477b9f48ece0 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Wed, 11 Apr 2018 11:03:20 +0530
Subject: [PATCH] Fix advertise time out when default is set to zero
Expand Down Expand Up @@ -26,7 +26,7 @@ Upstream-Status: Pending
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/advertising.c b/src/advertising.c
index 1fe371a9f..d857fd96e 100644
index f9748b132..694447057 100644
--- a/src/advertising.c
+++ b/src/advertising.c
@@ -525,13 +525,18 @@ static bool parse_local_name(DBusMessageIter *iter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9b31ce821930ae56ea9dc6138f0b4e76d0536f18 Mon Sep 17 00:00:00 2001
From 67c89b925334a3f41f4b85ce9e1a1dd5d5e2822f Mon Sep 17 00:00:00 2001
From: Vibhanshu Dhote <vibhanshu.dhote@lge.com>
Date: Thu, 17 May 2018 18:15:48 +0530
Subject: [PATCH] Send disconnect signal on remote device disconnect
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7084f0e9638e0c90f50c0cabe6d15ea92cd60298 Mon Sep 17 00:00:00 2001
From a2064617fa5db4c5ad4120133406f8e3de1fdb9c Mon Sep 17 00:00:00 2001
From: "vijaya.sundaram" <vijaya.sundaram@lge.com>
Date: Fri, 1 Jun 2018 11:43:15 +0530
Subject: [PATCH] Fetching device type like BLE, BREDR from bluez
Expand All @@ -25,7 +25,7 @@ Upstream-Status: Pending
1 file changed, 17 insertions(+)

diff --git a/src/device.c b/src/device.c
index 9a4f2ce45..c21fcaa76 100644
index 995d39f2c..b1fe7fd7c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -206,6 +206,7 @@ struct btd_device {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 1c436e8b0c6acc38830f93d7f94686bdd3117cc5 Mon Sep 17 00:00:00 2001
From 9acc3246d1c47383edf4dfee3054734f9adf09ae Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Sun, 22 Jul 2018 18:59:45 +0530
Subject: [PATCH] Fix Gatt connect when device address type is BDADDR_LE_PUBLIC
Expand Down Expand Up @@ -30,7 +30,7 @@ Upstream-Status: Pending
1 file changed, 28 insertions(+)

diff --git a/src/device.c b/src/device.c
index c21fcaa76..a3c51c0f5 100644
index b1fe7fd7c..bda45dfdf 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2366,6 +2366,33 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 46c4e89c27b9a6b434d74ce1e53aa5ad312edf16 Mon Sep 17 00:00:00 2001
From ff6dc50e04ada7f717139cf7b1adb29863e0efb8 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Thu, 15 Nov 2018 11:08:44 +0530
Subject: [PATCH] Use system bus instead of session for obexd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 163333cd51ea3dd9f5f7bd44310b7c4e385865a0 Mon Sep 17 00:00:00 2001
From 87032726d8ab8fdbb172ce098560c1fd80a7e184 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Tue, 22 Jan 2019 23:25:18 +0530
Subject: [PATCH] Implementation to get connected profiles uuids
Expand All @@ -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 a3c51c0f5..fea01d20a 100644
index bda45dfdf..750232410 100644
--- a/src/device.c
+++ b/src/device.c
@@ -215,6 +215,7 @@ struct btd_device {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 76f3a04a8135315944af66b322bb646d66b6366c Mon Sep 17 00:00:00 2001
From 30b1947069401365ed1fe5ff5531e7cca6f15d3b Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Sun, 13 Jan 2019 13:35:55 +0530
Subject: [PATCH] recievePassThrough commad support required for webos
Expand Down Expand Up @@ -56,7 +56,7 @@ index 6f64f162b..b002470f9 100644
break;
}
diff --git a/src/device.c b/src/device.c
index fea01d20a..2eef2a8cf 100644
index 750232410..07dad435b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -170,6 +170,11 @@ enum {
Expand Down Expand Up @@ -168,7 +168,7 @@ index fea01d20a..2eef2a8cf 100644
{ "ServiceData", "a{sv}", dev_property_get_service_data,
NULL, dev_property_service_data_exist },
{ "TxPower", "n", dev_property_get_tx_power, NULL,
@@ -4037,6 +4089,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4040,6 +4092,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
device->adapter = adapter;
device->temporary = true;

Expand All @@ -179,10 +179,10 @@ index fea01d20a..2eef2a8cf 100644
gatt_service_removed, device, NULL);

diff --git a/src/device.h b/src/device.h
index d7f886224..b7a5aaa98 100644
index 9e81fda9e..6297e04c0 100644
--- a/src/device.h
+++ b/src/device.h
@@ -186,3 +186,5 @@ void btd_device_cleanup(void);
@@ -188,3 +188,5 @@ void btd_device_cleanup(void);

void btd_device_set_volume(struct btd_device *dev, int8_t volume);
int8_t btd_device_get_volume(struct btd_device *dev);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 49fb6333df5255cf3b4aba4d26c1b141b08945d7 Mon Sep 17 00:00:00 2001
From a329e8a0fb56137887aa80717c288559093da568 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Wed, 30 Jan 2019 15:17:11 +0530
Subject: [PATCH] Added dbus signal for MediaPlayRequest
Expand Down Expand Up @@ -49,10 +49,10 @@ index 80f34c7a7..1b3e6090a 100644
}

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index c5d8ab14e..97c453021 100644
index c9328ab9b..bea2e6358 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1229,7 +1229,7 @@ static uint32_t media_player_get_position(void *user_data)
@@ -1761,7 +1761,7 @@ static uint32_t media_player_get_position(void *user_data)
sec = (uint32_t) timedelta;
msec = (uint32_t) ((timedelta - sec) * 1000);

Expand All @@ -62,7 +62,7 @@ index c5d8ab14e..97c453021 100644

static uint32_t media_player_get_duration(void *user_data)
diff --git a/src/device.c b/src/device.c
index 2eef2a8cf..275f4a9a6 100644
index 07dad435b..3f9f1190d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2087,6 +2087,22 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
Expand Down Expand Up @@ -101,7 +101,7 @@ index 2eef2a8cf..275f4a9a6 100644
static const GDBusMethodTable device_methods[] = {
{ GDBUS_ASYNC_METHOD("Disconnect", NULL, NULL, dev_disconnect) },
{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL, dev_connect) },
@@ -4078,7 +4100,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4081,7 +4103,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 2eef2a8cf..275f4a9a6 100644
device_free) == FALSE) {
error("Unable to register device interface for %s", address);
diff --git a/src/device.h b/src/device.h
index b7a5aaa98..fe2387fb3 100644
index 6297e04c0..549e53b81 100644
--- a/src/device.h
+++ b/src/device.h
@@ -188,3 +188,6 @@ void btd_device_set_volume(struct btd_device *dev, int8_t volume);
@@ -190,3 +190,6 @@ void btd_device_set_volume(struct btd_device *dev, int8_t volume);
int8_t btd_device_get_volume(struct btd_device *dev);

void recieve_passThrough_commands(struct btd_device *dev, const char* code, const char* state);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 06d8a4416ed5d2c19e4b6d08c1bae8c6ca758d97 Mon Sep 17 00:00:00 2001
From 4564bd613eb15b23f1c8fd9b5aca3a2aaeb179c1 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
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 1b3e6090a..61478e913 100644
}

diff --git a/src/device.c b/src/device.c
index 275f4a9a6..3cad84e37 100644
index 3f9f1190d..efe3a636f 100644
--- a/src/device.c
+++ b/src/device.c
@@ -282,6 +282,8 @@ struct btd_device {
Expand Down Expand Up @@ -176,7 +176,7 @@ index 275f4a9a6..3cad84e37 100644
{ "ServiceData", "a{sv}", dev_property_get_service_data,
NULL, dev_property_service_data_exist },
{ "TxPower", "n", dev_property_get_tx_power, NULL,
@@ -4114,6 +4179,9 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
@@ -4117,6 +4182,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 275f4a9a6..3cad84e37 100644
gatt_service_removed, device, NULL);

diff --git a/src/device.h b/src/device.h
index fe2387fb3..a3ee4279c 100644
index 549e53b81..3fcfd919d 100644
--- a/src/device.h
+++ b/src/device.h
@@ -10,6 +10,10 @@
Expand All @@ -201,7 +201,7 @@ index fe2387fb3..a3ee4279c 100644

struct btd_device;

@@ -191,3 +195,4 @@ void recieve_passThrough_commands(struct btd_device *dev, const char* code, cons
@@ -193,3 +197,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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 762ead4c8d565ada8022e9d544963522fa70de8b Mon Sep 17 00:00:00 2001
From 91af1c0af8c0b0c15c02b577290a60e15cabed1d Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <sameer.mulla@lge.com>
Date: Mon, 21 Jan 2019 12:44:19 +0530
Subject: [PATCH] Fix volume property not able to set
Expand Down 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 5848e4019..19a39af47 100644
index 41339da51..2827ff42d 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -810,7 +810,7 @@ static int media_transport_init_source(struct media_transport *transport)
@@ -1065,7 +1065,7 @@ static int media_transport_init_source(struct media_transport *transport)
transport->data = a2dp;
transport->destroy = destroy_a2dp;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9048d00c3e742f7cfc43a31fb0dce2537ad02956 Mon Sep 17 00:00:00 2001
From 66089ff883a5904898c4e7810422a5035d9f41b7 Mon Sep 17 00:00:00 2001
From: Sameer Mulla <sameer.mulla@lge.com>
Date: Tue, 10 Dec 2019 16:15:43 +0530
Subject: [PATCH] Fix volume level notification not appearing after 127
Expand Down Expand Up @@ -29,10 +29,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 97c453021..7f1ff346b 100644
index bea2e6358..a9c42450c 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1244,8 +1244,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
@@ -1776,8 +1776,8 @@ static void media_player_set_volume(int8_t volume, struct btd_device *dev,
{
struct media_player *mp = user_data;

Expand All @@ -44,10 +44,10 @@ index 97c453021..7f1ff346b 100644
mp->volume = volume;
}
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 19a39af47..769fffdd3 100644
index 2827ff42d..f9c1a4a16 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -656,8 +656,8 @@ static void set_volume(const GDBusPropertyTable *property,
@@ -749,8 +749,8 @@ static void set_volume(const GDBusPropertyTable *property,
g_dbus_pending_property_success(id);

volume = (int8_t)arg;
Expand All @@ -58,7 +58,7 @@ index 19a39af47..769fffdd3 100644

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

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

0 comments on commit 82e5603

Please sign in to comment.