summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-10-19 17:33:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-23 17:42:25 +0100
commit100c1ca849fa4bc3f4b542afcc484368f1a72b0f (patch)
treed26434a38ad17bd6213f90fd5e3d57cebc8215bc
parent50a9e1e306e9b44b78eebc062487bbc64baf80c5 (diff)
downloadpoky-100c1ca849fa4bc3f4b542afcc484368f1a72b0f.tar.gz
bluez5: update 5.61 -> 5.62
Drop the patch as issue is addressed upstream. (From OE-Core rev: e3cb95cd185c44fd82f1507114e2b75b87035b50) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch48
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.62.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.61.bb)2
3 files changed, 1 insertions, 50 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 68f3b586b8..0a5fc9d4b8 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -53,7 +53,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
53 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ 53 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
54 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ 54 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
55 file://0001-test-gatt-Fix-hung-issue.patch \ 55 file://0001-test-gatt-Fix-hung-issue.patch \
56 file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \
57 " 56 "
58S = "${WORKDIR}/bluez-${PV}" 57S = "${WORKDIR}/bluez-${PV}"
59 58
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch
deleted file mode 100644
index d9067df02d..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 8adab7f1e04948e78854953f9373cac741445a0f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 30 Apr 2021 21:09:33 -0700
4Subject: [PATCH] audio: Rename pause funciton to avoid shadowing glibc
5 defintions
6
7Fixes
8profiles/audio/media.c:1284:13: error: static declaration of 'pause' follows non-static declaration
9static bool pause(void *user_data)
10 ^
11/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/bluez5/5.56-r0/recipe-sysroot/usr/include/unistd.h:478:12: note: previous declaration is here
12extern int pause (void);
13 ^
14../bluez-5.56/profiles/audio/media.c:1334:11: warning: incompatible function pointer types initializing 'bool (*)(void *)' with an expression of type 'int (void)' [-Wincompatible-function-pointer-types]
15 .pause = pause,
16 ^~~~~
17
18Upstream-Status: Pending
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 profiles/audio/media.c | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/profiles/audio/media.c b/profiles/audio/media.c
25index c84bbe2..7110089 100644
26--- a/profiles/audio/media.c
27+++ b/profiles/audio/media.c
28@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
29 return media_player_send(mp, "Stop");
30 }
31
32-static bool pause(void *user_data)
33+static bool apause(void *user_data)
34 {
35 struct media_player *mp = user_data;
36
37@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
38 .set_volume = set_volume,
39 .play = play,
40 .stop = stop,
41- .pause = pause,
42+ .pause = apause,
43 .next = next,
44 .previous = previous,
45 };
46--
472.31.1
48
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.61.bb b/meta/recipes-connectivity/bluez5/bluez5_5.62.bb
index b2e5dd66a9..411ac8b5a3 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.61.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.62.bb
@@ -1,6 +1,6 @@
1require bluez5.inc 1require bluez5.inc
2 2
3SRC_URI[sha256sum] = "83afd6c52179554bfeabbcb538fec2eb6be90a8ac3c40871b49d7ad8b49c423b" 3SRC_URI[sha256sum] = "38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2"
4 4
5# These issues have kernel fixes rather than bluez fixes so exclude here 5# These issues have kernel fixes rather than bluez fixes so exclude here
6CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490" 6CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490"