From c3672d4eafa1cc56a203d7f2f930cceff29a9463 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Fri, 31 Dec 2021 20:31:28 +0300
Subject: [PATCH] Up libwebsockets
---
...nown_unknown_hi3516ev300_openipc_defconfig | 2 +-
...ts-txt-fix-static-build-with-openssl.patch | 34 -------------------
2 files changed, 1 insertion(+), 35 deletions(-)
delete mode 100644 general/package/libwebsockets-openipc/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
index d1a72328..406cc15f 100644
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig
@@ -67,7 +67,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
BR2_PACKAGE_LIBEVENT_OPENIPC=y
BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y
BR2_PACKAGE_LIBOGG_OPENIPC=y
-BR2_PACKAGE_LIBWEBSOCKETS=y
+BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
BR2_PACKAGE_LIBYAML=y
BR2_PACKAGE_MAJESTIC_FONTS=y
BR2_PACKAGE_MAJESTIC_HI3516EV300=y
diff --git a/general/package/libwebsockets-openipc/0001-CMakeLists-txt-fix-static-build-with-openssl.patch b/general/package/libwebsockets-openipc/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
deleted file mode 100644
index 868685d3..00000000
--- a/general/package/libwebsockets-openipc/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 16 Oct 2019 20:09:13 +0200
-Subject: [PATCH] CMakeLists.txt: fix static build with openssl
-
-openssl can depends on -latomic so use pkg-config (if available) to
-retrieve these static dependencies otherwise build will fail because
-HMAC_CTX_new test will return a wrong result
-
-Fixes:
- - http://autobuild.buildroot.org/results/65d0528b208c0a470264f7e2433be89425971dd7
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved (and backported) from:
-https://github.com/warmcat/libwebsockets/commit/5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3]
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2693ac56a..888f65e83 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1803,7 +1803,10 @@ if (LWS_WITH_SSL)
- if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL)
- # TODO: Add support for STATIC also.
- if (NOT LWS_WITH_ESP32)
-+ find_package(PkgConfig QUIET)
-+ pkg_check_modules(PC_OPENSSL openssl QUIET)
- find_package(OpenSSL REQUIRED)
-+ list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
- endif()
- set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
- endif()