Drop the patch as issue is addressed upstream. Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 - ...se-funciton-to-avoid-shadowing-glibc.patch | 48 ------------------- .../bluez5/{bluez5_5.61.bb => bluez5_5.62.bb} | 2 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch rename meta/recipes-connectivity/bluez5/{bluez5_5.61.bb => bluez5_5.62.bb} (95%)
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 \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ - file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \ " S = "${WORKDIR}/bluez-${PV}" 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 @@ -From 8adab7f1e04948e78854953f9373cac741445a0f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 30 Apr 2021 21:09:33 -0700 -Subject: [PATCH] audio: Rename pause funciton to avoid shadowing glibc - defintions - -Fixes -profiles/audio/media.c:1284:13: error: static declaration of 'pause' follows non-static declaration -static bool pause(void *user_data) - ^ -/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 -extern int pause (void); - ^ -../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] - .pause = pause, - ^~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.k...@gmail.com> ---- - profiles/audio/media.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/profiles/audio/media.c b/profiles/audio/media.c -index c84bbe2..7110089 100644 ---- a/profiles/audio/media.c -+++ b/profiles/audio/media.c -@@ -1281,7 +1281,7 @@ static bool stop(void *user_data) - return media_player_send(mp, "Stop"); - } - --static bool pause(void *user_data) -+static bool apause(void *user_data) - { - struct media_player *mp = user_data; - -@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = { - .set_volume = set_volume, - .play = play, - .stop = stop, -- .pause = pause, -+ .pause = apause, - .next = next, - .previous = previous, - }; --- -2.31.1 - diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.61.bb b/meta/recipes-connectivity/bluez5/bluez5_5.62.bb similarity index 95% rename from meta/recipes-connectivity/bluez5/bluez5_5.61.bb rename to 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 @@ require bluez5.inc -SRC_URI[sha256sum] = "83afd6c52179554bfeabbcb538fec2eb6be90a8ac3c40871b49d7ad8b49c423b" +SRC_URI[sha256sum] = "38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490" -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#157125): https://lists.openembedded.org/g/openembedded-core/message/157125 Mute This Topic: https://lists.openembedded.org/mt/86442645/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-