main/bluez: fix musl build

1 files changed, 59 insertions, 59 deletions

diff --git a/main/bluez/fix-includes.patch b/main/bluez/fix-includes.patch
index a8962b0b7a..cfb73ffd6b 100644
--- a/main/bluez/fix-includes.patch
+++ b/main/bluez/fix-includes.patch
@@ -1,55 +1,6 @@
---- bluez-4.101.orig/audio/ipc.c
-+++ bluez-4.101/audio/ipc.c
-@@ -22,6 +22,7 @@
-  */
- 
- #include "ipc.h"
-+#include <string.h>
- 
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
- 
---- bluez-4.101.orig/compat/bnep.c
-+++ bluez-4.101/compat/bnep.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- 
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/bnep.h>
---- bluez-4.101.orig/compat/dund.c
-+++ bluez-4.101/compat/dund.c
-@@ -67,7 +67,7 @@
- static int  persist;
- static int  use_sdp = 1;
- static int  auth;
--static int  encrypt;
-+static int  do_encrypt;
- static int  secure;
- static int  master;
- static int  type = LANACCESS;
-@@ -146,7 +146,7 @@
- 		lm |= RFCOMM_LM_MASTER;
- 	if (auth)
- 		lm |= RFCOMM_LM_AUTH;
--	if (encrypt)
-+	if (do_encrypt)
- 		lm |= RFCOMM_LM_ENCRYPT;
- 	if (secure)
- 		lm |= RFCOMM_LM_SECURE;
-@@ -492,7 +492,7 @@
- 			break;
- 
- 		case 'E':
--			encrypt = 1;
-+			do_encrypt = 1;
- 			break;
- 
- 		case 'S':
---- bluez-4.101.orig/network/common.c
-+++ bluez-4.101/network/common.c
-@@ -29,6 +29,7 @@
+--- bluez-5.11.orig/profiles/network/common.c
++++ bluez-5.11/profiles/network/common.c
+@@ -29,10 +29,12 @@
  #include <errno.h>
  #include <unistd.h>
  #include <stdlib.h>
@@ -57,24 +8,73 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
  #include <sys/socket.h>
---- bluez-4.101.orig/network/connection.c
-+++ bluez-4.101/network/connection.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
+ #include <sys/wait.h>
++#include <sys/time.h>
+ #include <net/if.h>
+ #include <linux/sockios.h>
+ 
+--- bluez-5.11.orig/profiles/network/connection.c
++++ bluez-5.11/profiles/network/connection.c
+@@ -29,6 +29,7 @@
+ #include <stdbool.h>
  #include <errno.h>
  #include <unistd.h>
 +#include <sys/time.h>
  #include <netinet/in.h>
  
  #include <bluetooth/bluetooth.h>
---- bluez-4.101.orig/src/textfile.h
-+++ bluez-4.101/src/textfile.h
+--- bluez-5.11.orig/src/textfile.h
++++ bluez-5.11/src/textfile.h
 @@ -24,6 +24,8 @@
  #ifndef __TEXTFILE_H
  #define __TEXTFILE_H
  
 +#include <sys/types.h>
 +
- int create_dirs(const char *filename, const mode_t mode);
  int create_file(const char *filename, const mode_t mode);
  int create_name(char *buf, size_t size, const char *path,
+ 				const char *address, const char *name);
+--- bluez-5.11.orig/tools/csr_usb.c
++++ bluez-5.11/tools/csr_usb.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- bluez-5.11.orig/tools/hid2hci.c
++++ bluez-5.11/tools/hid2hci.c
+@@ -35,6 +35,8 @@
+ #include <string.h>
+ #include <dirent.h>
+ #include <getopt.h>
++#include <limits.h>
++#include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <linux/types.h>
+ #include <linux/hiddev.h>
+--- bluez-5.11.orig/unit/test-sdp.c
++++ bluez-5.11/unit/test-sdp.c
+@@ -134,6 +134,10 @@
+ {
+ }
+ 
++void error(const char *format, ...)
++{
++}
++
+ static void context_quit(struct context *context)
+ {
+ 	g_main_loop_quit(context->main_loop);
+--- bluez-5.11.orig/src/systemd.c
++++ bluez-5.11/src/systemd.c
+@@ -30,6 +30,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+