mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
140
package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch
Normal file
140
package/bluez-alsa/0001-fix-build-issue-with-gcc-10.patch
Normal file
@@ -0,0 +1,140 @@
|
||||
From 72324e9415d2757a5f0f028865f841de70e1d0c4 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
Date: Sun, 12 Jul 2020 14:18:09 +0200
|
||||
Subject: [PATCH] fix build issue with gcc 10
|
||||
|
||||
This patch is created on top of tagged version v2.1.0.
|
||||
An upstream fix commit [1] for this issue is already in upstream master but
|
||||
does not apply on current used version in buildroot.
|
||||
|
||||
[1] https://github.com/Arkq/bluez-alsa/commit/30a23dd7ce9b00c702fa48545f6b03038f9e17c6
|
||||
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
[Fabrice: also update src/ofono-iface.h]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/bluealsa-dbus.c | 4 ++++
|
||||
src/bluealsa-iface.c | 2 ++
|
||||
src/bluealsa-iface.h | 4 ----
|
||||
src/bluealsa.c | 3 +++
|
||||
src/bluez-a2dp.h | 3 ---
|
||||
src/bluez-iface.h | 3 ---
|
||||
src/bluez.c | 3 +++
|
||||
7 files changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/bluealsa-dbus.c b/src/bluealsa-dbus.c
|
||||
index 5e748e3..4c9cd3d 100644
|
||||
--- a/src/bluealsa-dbus.c
|
||||
+++ b/src/bluealsa-dbus.c
|
||||
@@ -33,6 +33,10 @@
|
||||
#include "shared/defs.h"
|
||||
#include "shared/log.h"
|
||||
|
||||
+extern const GDBusInterfaceInfo bluealsa_iface_manager;
|
||||
+extern const GDBusInterfaceInfo bluealsa_iface_pcm;
|
||||
+extern const GDBusInterfaceInfo bluealsa_iface_rfcomm;
|
||||
+
|
||||
static GVariant *ba_variant_new_device_path(const struct ba_device *d) {
|
||||
return g_variant_new_object_path(d->bluez_dbus_path);
|
||||
}
|
||||
diff --git a/src/bluealsa-iface.c b/src/bluealsa-iface.c
|
||||
index 71810c7..55b79c9 100644
|
||||
--- a/src/bluealsa-iface.c
|
||||
+++ b/src/bluealsa-iface.c
|
||||
@@ -10,6 +10,8 @@
|
||||
|
||||
#include "bluealsa-iface.h"
|
||||
|
||||
+#define BLUEALAS_IFACE_C
|
||||
+
|
||||
static const GDBusArgInfo arg_codec = {
|
||||
-1, "codec", "q", NULL
|
||||
};
|
||||
diff --git a/src/bluealsa-iface.h b/src/bluealsa-iface.h
|
||||
index 262fb76..4f3e85b 100644
|
||||
--- a/src/bluealsa-iface.h
|
||||
+++ b/src/bluealsa-iface.h
|
||||
@@ -32,8 +32,4 @@
|
||||
#define BLUEALSA_RFCOMM_MODE_HSP_AG "HSP-AG"
|
||||
#define BLUEALSA_RFCOMM_MODE_HSP_HS "HSP-HS"
|
||||
|
||||
-const GDBusInterfaceInfo bluealsa_iface_manager;
|
||||
-const GDBusInterfaceInfo bluealsa_iface_pcm;
|
||||
-const GDBusInterfaceInfo bluealsa_iface_rfcomm;
|
||||
-
|
||||
#endif
|
||||
diff --git a/src/bluealsa.c b/src/bluealsa.c
|
||||
index 929f9ed..690c407 100644
|
||||
--- a/src/bluealsa.c
|
||||
+++ b/src/bluealsa.c
|
||||
@@ -20,6 +20,9 @@
|
||||
#include "bluez-a2dp.h"
|
||||
#include "hfp.h"
|
||||
|
||||
+/* NULL-terminated list of available A2DP codecs */
|
||||
+extern const struct bluez_a2dp_codec **bluez_a2dp_codecs;
|
||||
+
|
||||
/* Initialize global configuration variable. */
|
||||
struct ba_config config = {
|
||||
|
||||
diff --git a/src/bluez-a2dp.h b/src/bluez-a2dp.h
|
||||
index 7c0e33b..127dbd9 100644
|
||||
--- a/src/bluez-a2dp.h
|
||||
+++ b/src/bluez-a2dp.h
|
||||
@@ -57,7 +57,4 @@ struct bluez_a2dp_codec {
|
||||
size_t samplings_size;
|
||||
};
|
||||
|
||||
-/* NULL-terminated list of available A2DP codecs */
|
||||
-const struct bluez_a2dp_codec **bluez_a2dp_codecs;
|
||||
-
|
||||
#endif
|
||||
diff --git a/src/bluez-iface.h b/src/bluez-iface.h
|
||||
index 34269c5..250267e 100644
|
||||
--- a/src/bluez-iface.h
|
||||
+++ b/src/bluez-iface.h
|
||||
@@ -27,7 +27,4 @@
|
||||
#define BLUEZ_TRANSPORT_STATE_PENDING "pending"
|
||||
#define BLUEZ_TRANSPORT_STATE_ACTIVE "active"
|
||||
|
||||
-const GDBusInterfaceInfo bluez_iface_endpoint;
|
||||
-const GDBusInterfaceInfo bluez_iface_profile;
|
||||
-
|
||||
#endif
|
||||
diff --git a/src/bluez.c b/src/bluez.c
|
||||
index cfdbff8..190101e 100644
|
||||
--- a/src/bluez.c
|
||||
+++ b/src/bluez.c
|
||||
@@ -45,6 +45,9 @@
|
||||
# define G_DBUS_ERROR_UNKNOWN_OBJECT G_DBUS_ERROR_FAILED
|
||||
#endif
|
||||
|
||||
+extern const GDBusInterfaceInfo bluez_iface_endpoint;
|
||||
+extern const GDBusInterfaceInfo bluez_iface_profile;
|
||||
+
|
||||
/**
|
||||
* Structure describing registered D-Bus object. */
|
||||
struct dbus_object_data {
|
||||
diff --git a/src/ofono-iface.h b/src/ofono-iface.h
|
||||
index d5a6715..d5b9065 100644
|
||||
--- a/src/ofono-iface.h
|
||||
+++ b/src/ofono-iface.h
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* BlueALSA - ofono-iface.h
|
||||
- * Copyright (c) 2016-2019 Arkadiusz Bokowy
|
||||
+ * Copyright (c) 2016-2020 Arkadiusz Bokowy
|
||||
* 2018 Thierry Bultel
|
||||
*
|
||||
* This file is a part of bluez-alsa.
|
||||
@@ -27,6 +27,6 @@
|
||||
#define OFONO_AUDIO_CODEC_CVSD 0x01
|
||||
#define OFONO_AUDIO_CODEC_MSBC 0x02
|
||||
|
||||
-const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
|
||||
+extern const GDBusInterfaceInfo ofono_iface_hf_audio_agent;
|
||||
|
||||
#endif
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
config BR2_PACKAGE_BLUEZ_ALSA
|
||||
bool "bluez-alsa"
|
||||
depends on !BR2_STATIC_LIBS # bluez5
|
||||
depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5
|
||||
@@ -39,4 +38,3 @@ comment "bluez-alsa needs a toolchain w/ wchar, NPTL, headers >= 3.4, dynamic li
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_BLUEZ_UTILS
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated:
|
||||
sha256 6287ae6135795a78470068ef9d9ea660d556cefc409905bd9211fda04d1e1f8e bluez-alsa-1.4.0.tar.gz
|
||||
sha256 45fe8648faa0e735d4aaf60c32ddd37fc7f027d34ccedcf0f69d8aa961b63b25 LICENSE
|
||||
sha256 6459f70e47e70b4c04a85acf148381e6c8a2e86bd638aff21870afc6c14b85b0 bluez-alsa-2.1.0.tar.gz
|
||||
sha256 60253922a459245128c34eb379cbda7c76936636d4c10edc576663a0f560dd4d LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BLUEZ_ALSA_VERSION = 1.4.0
|
||||
BLUEZ_ALSA_VERSION = 2.1.0
|
||||
BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION))
|
||||
BLUEZ_ALSA_LICENSE = MIT
|
||||
BLUEZ_ALSA_LICENSE_FILES = LICENSE
|
||||
@@ -13,17 +13,11 @@ BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf
|
||||
# git repo, no configure
|
||||
BLUEZ_ALSA_AUTORECONF = YES
|
||||
|
||||
# Autoreconf requires an existing m4 directory
|
||||
define BLUEZ_ALSA_MKDIR_M4
|
||||
mkdir -p $(@D)/m4
|
||||
endef
|
||||
BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4
|
||||
|
||||
BLUEZ_ALSA_CONF_OPTS = \
|
||||
--enable-aplay \
|
||||
--disable-debug-time \
|
||||
--with-alsaplugindir=/usr/lib/alsa-lib \
|
||||
--with-alsaconfdir=/usr/share/alsa
|
||||
--with-alsaconfdir=/etc/alsa/conf.d
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FDK_AAC),y)
|
||||
BLUEZ_ALSA_DEPENDENCIES += fdk-aac
|
||||
@@ -32,6 +26,20 @@ else
|
||||
BLUEZ_ALSA_CONF_OPTS += --disable-aac
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LAME),y)
|
||||
BLUEZ_ALSA_DEPENDENCIES += lame
|
||||
BLUEZ_ALSA_CONF_OPTS += --enable-mp3lame
|
||||
else
|
||||
BLUEZ_ALSA_CONF_OPTS += --disable-mp3lame
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MPG123),y)
|
||||
BLUEZ_ALSA_DEPENDENCIES += mpg123
|
||||
BLUEZ_ALSA_CONF_OPTS += --enable-mpg123
|
||||
else
|
||||
BLUEZ_ALSA_CONF_OPTS += --disable-mpg123
|
||||
endif
|
||||
|
||||
# no build dependency, disables internal HFP in favor of oFonos HFP profile
|
||||
ifeq ($(BR2_PACKAGE_OFONO),y)
|
||||
BLUEZ_ALSA_CONF_OPTS += --enable-ofono
|
||||
@@ -39,6 +47,13 @@ else
|
||||
BLUEZ_ALSA_CONF_OPTS += --disable-ofono
|
||||
endif
|
||||
|
||||
# no build dependency, enables integration with UPower D-Bus service
|
||||
ifeq ($(BR2_PACKAGE_UPOWER),y)
|
||||
BLUEZ_ALSA_CONF_OPTS += --enable-upower
|
||||
else
|
||||
BLUEZ_ALSA_CONF_OPTS += --disable-upower
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_ALSA_HCITOP),y)
|
||||
BLUEZ_ALSA_DEPENDENCIES += libbsd ncurses
|
||||
BLUEZ_ALSA_CONF_OPTS += --enable-hcitop
|
||||
|
||||
Reference in New Issue
Block a user