iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
package/bluez-tools/0001-fix-gcc-10-compile.patch Normal file
View File

@@ -0,0 +1,46 @@
From 687105d611b38961f390f0a328f9cfa3b93aeb18 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Tue, 28 Jan 2020 22:46:37 +0000
Subject: [PATCH] fix gcc-10 compile
[Retrieved from:
https://github.com/khvzak/bluez-tools/pull/34/commits/687105d611b38961f390f0a328f9cfa3b93aeb18]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/lib/agent-helper.c | 2 ++
src/lib/agent-helper.h | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c
index bf50bcc..2b94100 100644
--- a/src/lib/agent-helper.c
+++ b/src/lib/agent-helper.c
@@ -33,6 +33,8 @@
#include "agent-helper.h"
+gboolean agent_need_unregister;
+
static const gchar *_bt_agent_introspect_xml = "<node name=\"/org/blueztools\">\n\t<interface name=\"org.bluez.Agent1\">\n\t\t<method name=\"Release\">\n\t\t</method>\n\t\t<method name=\"RequestPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"out\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPinCode\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"pincode\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"RequestPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"out\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"DisplayPasskey\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t\t<arg name=\"entered\" direction=\"in\" type=\"q\"/>\n\t\t</method>\n\t\t<method name=\"RequestConfirmation\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"passkey\" direction=\"in\" type=\"u\"/>\n\t\t</method>\n\t\t<method name=\"RequestAuthorization\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t</method>\n\t\t<method name=\"AuthorizeService\">\n\t\t\t<arg name=\"device\" direction=\"in\" type=\"o\"/>\n\t\t\t<arg name=\"uuid\" direction=\"in\" type=\"s\"/>\n\t\t</method>\n\t\t<method name=\"Cancel\">\n\t\t</method>\n\t</interface>\n</node>\n";
static guint _bt_agent_registration_id = 0;
static GHashTable *_pin_hash_table = NULL;
diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h
index 8e1cc85..9a952c4 100644
--- a/src/lib/agent-helper.h
+++ b/src/lib/agent-helper.h
@@ -35,7 +35,7 @@ extern "C" {
#define AGENT_DBUS_INTERFACE "org.bluez.Agent1"
#define AGENT_PATH "/org/blueztools"
-gboolean agent_need_unregister;
+extern gboolean agent_need_unregister;
void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error);
void unregister_agent_callbacks(GError **error);
@@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error);
}
#endif
-#endif /* __AGENT_HELPER_H */
\ No newline at end of file
+#endif /* __AGENT_HELPER_H */

4
package/bluez-tools/Config.in
View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_BLUEZ_TOOLS
bool "bluez-tools"
depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_USE_MMU # dbus, libglib2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
@@ -14,6 +14,6 @@ config BR2_PACKAGE_BLUEZ_TOOLS
https://github.com/khvzak/bluez-tools
comment "bluez-tools needs a toolchain w/ wchar, threads"
depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_PACKAGE_BLUEZ5_UTILS
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

4
package/bluez-tools/bluez-tools.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 56204ddd1cc7890d60f6a47507755f786fa3ee28f1da370a32ca7d7e0795a953 bluez-tools-171181b6ef6c94aefc828dc7fd8de136b9f97532.tar.gz
sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz
sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING

22
package/bluez-tools/bluez-tools.mk
View File

@@ -4,33 +4,13 @@
#
################################################################################
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
# this is the last version compatible with BlueZ 4 API
BLUEZ_TOOLS_VERSION = 171181b6ef6c94aefc828dc7fd8de136b9f97532
else
BLUEZ_TOOLS_VERSION = 97efd293491ad7ec96a655665339908f2478b3d1
endif
BLUEZ_TOOLS_SITE = $(call github,khvzak,bluez-tools,$(BLUEZ_TOOLS_VERSION))
# sources fetched from github, no configure script)
BLUEZ_TOOLS_AUTORECONF = YES
BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib
BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib bluez5_utils readline
BLUEZ_TOOLS_LICENSE = GPL-2.0+
BLUEZ_TOOLS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
BLUEZ_TOOLS_DEPENDENCIES += bluez_utils
# readline is an optional dependency when used with bluez_utils
# obex support depends on readline so enable it optionally
ifeq ($(BR2_PACKAGE_READLINE),y)
BLUEZ_TOOLS_CONF_OPTS += --enable-obex
BLUEZ_TOOLS_DEPENDENCIES += readline
else
BLUEZ_TOOLS_CONF_OPTS += --disable-obex
endif
else
# readline is a hard dependency when used with bluez5_utils
BLUEZ_TOOLS_DEPENDENCIES += bluez5_utils readline
endif
$(eval $(autotools-package))