From 2c35ddce70a0347eecf20933ffd7c101a3be2f97 Mon Sep 17 00:00:00 2001
From: Nick Hainke <vincent@systemli.org>
Date: Thu, 5 Dec 2019 12:46:01 +0100
Subject: [PATCH] libuwifi: update to latest version

Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 libs/libuwifi/Makefile                        |  11 +-
 libs/libuwifi/patches/500-ccan-includes.patch | 100 ------------------
 2 files changed, 4 insertions(+), 107 deletions(-)
 delete mode 100644 libs/libuwifi/patches/500-ccan-includes.patch

diff --git a/libs/libuwifi/Makefile b/libs/libuwifi/Makefile
index 4cb4391104..bc76867376 100644
--- a/libs/libuwifi/Makefile
+++ b/libs/libuwifi/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libuwifi
-PKG_VERSION:=2019-05-27
-PKG_RELEASE:=2
+PKG_VERSION:=2019-12-05
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/br101/libuwifi.git
-PKG_SOURCE_VERSION:=bb92bc9b041a077488f2fa5a1716902c7bb23e5b
-PKG_MIRROR_HASH:=c6dc795ef6c2cc87d411d3f907974f634a132c3e732db2597f96ff25a05faa05
+PKG_SOURCE_VERSION:=089bfebd3a8da6e39fd93e33c44368b044c23dde
+PKG_MIRROR_HASH:=a99801ad1dfcf459b00adc582d5e6a31dae9ed10529d114e1e26f5760c6a74f8
 
 PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>, Nick Hainke <vincent@systemli.org>
 PKG_LICENSE:=LGPL-3.0-only
@@ -41,9 +41,6 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/include/uwifi/*.h $(1)/usr/include/uwifi
 	$(CP) $(PKG_BUILD_DIR)/linux/*.h $(1)/usr/include/uwifi
 
-	$(CP) $(PKG_BUILD_DIR)/ccan $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/config.h $(1)/usr/include/ccan/
-
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/build/libuwifi.{a,so*} $(1)/usr/lib/
 endef
diff --git a/libs/libuwifi/patches/500-ccan-includes.patch b/libs/libuwifi/patches/500-ccan-includes.patch
deleted file mode 100644
index 7a1e6af01b..0000000000
--- a/libs/libuwifi/patches/500-ccan-includes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: libuwifi-2019-05-27/ccan/build_assert/_info
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/build_assert/_info
-+++ libuwifi-2019-05-27/ccan/build_assert/_info
-@@ -1,4 +1,4 @@
--#include "config.h"
-+#include "../config.h"
- #include <stdio.h>
- #include <string.h>
- 
-Index: libuwifi-2019-05-27/ccan/check_type/_info
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/check_type/_info
-+++ libuwifi-2019-05-27/ccan/check_type/_info
-@@ -1,4 +1,4 @@
--#include "config.h"
-+#include "../config.h"
- #include <stdio.h>
- #include <string.h>
- 
-Index: libuwifi-2019-05-27/ccan/check_type/check_type.h
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/check_type/check_type.h
-+++ libuwifi-2019-05-27/ccan/check_type/check_type.h
-@@ -1,7 +1,7 @@
- /* CC0 (Public domain) - see LICENSE file for details */
- #ifndef CCAN_CHECK_TYPE_H
- #define CCAN_CHECK_TYPE_H
--#include "config.h"
-+#include "../config.h"
- 
- /**
-  * check_type - issue a warning or build failure if type is not correct.
-Index: libuwifi-2019-05-27/ccan/container_of/_info
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/container_of/_info
-+++ libuwifi-2019-05-27/ccan/container_of/_info
-@@ -1,4 +1,4 @@
--#include "config.h"
-+#include "../config.h"
- #include <stdio.h>
- #include <string.h>
- 
-Index: libuwifi-2019-05-27/ccan/container_of/container_of.h
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/container_of/container_of.h
-+++ libuwifi-2019-05-27/ccan/container_of/container_of.h
-@@ -3,7 +3,7 @@
- #define CCAN_CONTAINER_OF_H
- #include <stddef.h>
- 
--#include "config.h"
-+#include "../config.h"
- #include <ccan/check_type/check_type.h>
- 
- /**
-Index: libuwifi-2019-05-27/ccan/list/_info
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/list/_info
-+++ libuwifi-2019-05-27/ccan/list/_info
-@@ -1,4 +1,4 @@
--#include "config.h"
-+#include "../config.h"
- #include <stdio.h>
- #include <string.h>
- 
-Index: libuwifi-2019-05-27/ccan/str/_info
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/str/_info
-+++ libuwifi-2019-05-27/ccan/str/_info
-@@ -1,4 +1,4 @@
--#include "config.h"
-+#include "../config.h"
- #include <stdio.h>
- #include <string.h>
- 
-Index: libuwifi-2019-05-27/ccan/str/debug.c
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/str/debug.c
-+++ libuwifi-2019-05-27/ccan/str/debug.c
-@@ -1,5 +1,5 @@
- /* CC0 (Public domain) - see LICENSE file for details */
--#include "config.h"
-+#include "../config.h"
- #include <ccan/str/str_debug.h>
- #include <assert.h>
- #include <ctype.h>
-Index: libuwifi-2019-05-27/ccan/str/str.h
-===================================================================
---- libuwifi-2019-05-27.orig/ccan/str/str.h
-+++ libuwifi-2019-05-27/ccan/str/str.h
-@@ -1,7 +1,7 @@
- /* CC0 (Public domain) - see LICENSE file for details */
- #ifndef CCAN_STR_H
- #define CCAN_STR_H
--#include "config.h"
-+#include "../config.h"
- #include <string.h>
- #include <stdbool.h>
- #include <limits.h>
-- 
2.30.2