jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6920 from heitbaum/bluez

Browse Source 
bluez: update to 5.65 and drop upstream patch
This commit is contained in:
CvH 2022-09-24 16:07:11 +02:00 committed by GitHub
commit 13bf97c5fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/network/bluez/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bluez"
PKG_VERSION="5.64"
PKG_SHA256="ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
PKG_VERSION="5.65"
PKG_SHA256="2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4"
PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/"
PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"

36
packages/network/bluez/patches/bluez-22-Fix-gatt-db-attribute-get-index.patch
View File

@ -1,36 +0,0 @@
From 403cfc553e65318c547840516007f4cd4e872aa7 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 1 Apr 2022 14:38:57 -0700
Subject: [PATCH] shared/gatt-db: Fix gatt_db_attribute_get_index
gatt_db_attribute_get_index was calculating the index based on
attrib->handle - service->attributes[0]->handle which doesn't work when
there are gaps in between handles.
Fixes: https://github.com/bluez/bluez/issues/326
---
src/shared/gatt-db.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index be07cdbe4..4f5d10b57 100644
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -1537,12 +1537,12 @@ static int gatt_db_attribute_get_index(struct gatt_db_attribute *attrib)
return -1;
service = attrib->service;
- index = attrib->handle - service->attributes[0]->handle;
-
- if (index > (service->num_handles - 1))
- return -1;
+ for (index = 0; index < service->num_handles; index++) {
+ if (service->attributes[index] == attrib)
+ return index;
+ }
- return index;
+ return -1;
}
static struct gatt_db_attribute *