Skip to content

Commit

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

:Detailed Notes:
Fix following error occured that when appling patch files to bluez5 version 5.54.

ERROR: bluez5-5.54-r0 do_patch: Fuzz detected:
Applying patch 0016-Support-enabling-avdtp-delayReport.patch
patching file profiles/audio/a2dp.c
Hunk #1 succeeded at 2127 (offset 689 lines).
patching file profiles/audio/a2dp.h
Hunk #1 succeeded at 93 with fuzz 2 (offset 2 lines).
patching file profiles/audio/avdtp.c
Hunk #1 succeeded at 477 (offset 2 lines).
patching file profiles/audio/avdtp.h
Hunk #1 succeeded at 310 (offset 10 lines).
patching file profiles/audio/media.c
Hunk #1 succeeded at 132 (offset 15 lines).
Hunk #2 succeeded at 445 (offset 16 lines).
Hunk #3 succeeded at 766 (offset 25 lines).
Hunk #4 succeeded at 784 (offset 25 lines).
Hunk #5 succeeded at 2416 (offset 489 lines).
patching file profiles/audio/media.h
patching file src/adapter.c
Hunk #1 succeeded at 78 (offset 1 line).
patching file src/adapter.h
patching file src/hcid.h
Hunk #1 succeeded at 53 (offset 7 lines).
patching file src/main.c
Hunk #1 succeeded at 92 with fuzz 2 (offset 3 lines).
Hunk #2 succeeded at 442 with fuzz 1 (offset 42 lines).
patching file src/main.conf

ERROR: bluez5-5.54-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

:Testing Performed:
Only build tested.

:QA Notes:
None.

:Issues Addressed:
[PLAT-111903] Create GPVB with Yocto 3.1 dunfell
[PLAT-115145] CCC: Upgrade to Yocto 3.1 Dunfell

Change-Id: I07e862b3c8ff131eab0e7eb0dfe46790e1d680b9
  • Loading branch information
Minjae Kim authored and Hyunjae Shin committed Sep 26, 2020
1 parent 7b51308 commit ed9d7fd
Show file tree
Hide file tree
Showing 10 changed files with 293 additions and 344 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b534c8c2113eb8dbbeadaa77caaa0064caebd617 Mon Sep 17 00:00:00 2001
From 8c76e6fd74ae6094f8130f02e3f08d8b3b041243 Mon Sep 17 00:00:00 2001
From: "sameer.mulla" <[email protected]>
Date: Mon, 21 Jan 2019 12:44:19 +0530
Subject: [PATCH] Fix volume property not able to set
Expand All @@ -21,15 +21,16 @@ Built and tested
Upstream-status: Pending

Change-Id: I183357a5de4b95a6e02d39d9d51c4af715bf0a54

---
profiles/audio/transport.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index b9d357e..47747d0 100644
index 48fabba..0b8f4fd 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -802,7 +802,7 @@ static int media_transport_init_source(struct media_transport *transport)
@@ -824,7 +824,7 @@ static int media_transport_init_source(struct media_transport *transport)
transport->data = a2dp;
transport->destroy = destroy_a2dp;

Expand All @@ -38,5 +39,3 @@ index b9d357e..47747d0 100644
transport->sink_watch = sink_add_state_cb(service, sink_state_changed,
transport);

--
2.7.4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From f115349ff6634726eaf40e5160a403fc0b60732e Mon Sep 17 00:00:00 2001
From 1a4cd9bae96ef1bb057b3d98e3cd2562c0ceeef4 Mon Sep 17 00:00:00 2001
From: Sameer Mulla <[email protected]>
Date: Tue, 10 Dec 2019 16:15:43 +0530
Subject: [PATCH] Fix volume level notification not appearing after 127
Expand All @@ -22,16 +22,17 @@ Builded and Tested
does not return.

Upstream-Status: Inappropriate[webos specific]

---
profiles/audio/media.c | 4 ++--
profiles/audio/transport.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 1859bc1..90a2719 100644
index 19d9427..20a1a22 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1177,8 +1177,8 @@ static void set_volume(uint8_t volume, struct btd_device *dev, void *user_data)
@@ -1204,8 +1204,8 @@ static void set_volume(uint8_t volume, struct btd_device *dev, void *user_data)
struct media_player *mp = user_data;
GSList *l;

Expand All @@ -43,10 +44,10 @@ index 1859bc1..90a2719 100644
mp->volume = volume;

diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 47747d0..5c744ca 100644
index 0b8f4fd..69fe45b 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -673,8 +673,8 @@ static void set_volume(const GDBusPropertyTable *property,
@@ -675,8 +675,8 @@ static void set_volume(const GDBusPropertyTable *property,

g_dbus_pending_property_success(id);

Expand All @@ -57,7 +58,7 @@ index 47747d0..5c744ca 100644

a2dp->volume = volume;

@@ -918,8 +918,8 @@ void media_transport_update_volume(struct media_transport *transport,
@@ -943,8 +943,8 @@ void media_transport_update_volume(struct media_transport *transport,
struct a2dp_transport *a2dp = transport->data;

/* Check if volume really changed */
Expand All @@ -68,6 +69,3 @@ index 47747d0..5c744ca 100644

a2dp->volume = volume;

--
2.17.1

Loading

0 comments on commit ed9d7fd

Please sign in to comment.