Skip to contentSkip to conversation

libuwsc: new package

PATCH Superseded 赵建辉 2 participants 2 messages Sep 5, 2019

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

赵建辉

author
#0 lore raw

PATCH v2 1/1 libuwsc: new package

---
Changes v1 -> v2:
- Remove config options for optional dependencies (suggested by Baruch Siach)

---
 package/Config.in            |  1 +
 package/libuwsc/Config.in    |  8 ++++++++
 package/libuwsc/libuwsc.hash |  3 +++
 package/libuwsc/libuwsc.mk   | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 package/libuwsc/Config.in
 create mode 100644 package/libuwsc/libuwsc.hash
 create mode 100644 package/libuwsc/libuwsc.mk
package/Config.in +1 -0
index 9336261c5d..a9f3867949 100644
@@ -1624,6 +1624,7 @@ menu "Networking"
  source "package/libupnp18/Config.in"
  source "package/libupnpp/Config.in"
  source "package/liburiparser/Config.in"
+ source "package/libuwsc/Config.in"
  source "package/libvncserver/Config.in"
  source "package/libwebsock/Config.in"
  source "package/libwebsockets/Config.in"
package/libuwsc/Config.in new file +8 -0
new file mode 100644
index 0000000000..ae99b6d2dc
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBUWSC
+ bool "libuwsc"
+ select BR2_PACKAGE_LIBEV
+ help
+   A Lightweight and fully asynchronous WebSocket client
+   library based on libev.
+
+   https://github.com/zhaojh329/libuwsc
package/libuwsc/libuwsc.hash new file +2 -0
new file mode 100644
index 0000000000..f137b3613b
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 bae2cd13eda86876ebcf99a38a069f5e8c01717713d2fec25031051b9c47624b

libuwsc-3.3.2.tar.gz
+sha256 e557975decde6439395e72dce7690d974d1a493722a7be5228794ec944f0c5db
LICENSE

package/libuwsc/libuwsc.mk new file +8 -0
new file mode 100644
index 0000000000..9fbd00a380
@@ -0,0 +1,32 @@
+################################################################################
+#
+# libuwsc
+#
+################################################################################
+
+LIBUWSC_VERSION = 3.3.2
+LIBUWSC_SITE =

https://github.com/zhaojh329/libuwsc/releases/download/v$(LIBUWSC_VERSION)
+LIBUWSC_LICENSE = MIT
+LIBUWSC_LICENSE_FILES = LICENSE
+LIBUWSC_INSTALL_STAGING = YES
+LIBUWSC_DEPENDENCIES = libev
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUWSC_DEPENDENCIES += openssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=ON
+else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
+LIBUWSC_DEPENDENCIES += wolfssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=ON
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBUWSC_DEPENDENCIES += mbedtls
+LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=ON
+endif
+
+ifneq ($(BR2_USE_MMU),)
+ifneq ($(findstring $(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_3), y),) +LIBUWSC_DEPENDENCIES += lua
+LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON
+endif
+endif
+
+$(eval $(cmake-package))

Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 libuwsc: new package

Hi Jianhui Zhao,

A few more comments below.

Quoted 66 lines · ???

---
Changes v1 -> v2:
- Remove config options for optional dependencies (suggested by Baruch Siach)

---
 package/Config.in            |  1 +
 package/libuwsc/Config.in    |  8 ++++++++
 package/libuwsc/libuwsc.hash |  3 +++
 package/libuwsc/libuwsc.mk   | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 package/libuwsc/Config.in
 create mode 100644 package/libuwsc/libuwsc.hash
 create mode 100644 package/libuwsc/libuwsc.mk
package/Config.in +1 -0
index 9336261c5d..a9f3867949 100644
@@ -1624,6 +1624,7 @@ menu "Networking"
  source "package/libupnp18/Config.in"
  source "package/libupnpp/Config.in"
  source "package/liburiparser/Config.in"
+ source "package/libuwsc/Config.in"
  source "package/libvncserver/Config.in"
  source "package/libwebsock/Config.in"
  source "package/libwebsockets/Config.in"
package/libuwsc/Config.in new file +8 -0
new file mode 100644
index 0000000000..ae99b6d2dc
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBUWSC
+ bool "libuwsc"
+ select BR2_PACKAGE_LIBEV
+ help
+   A Lightweight and fully asynchronous WebSocket client
+   library based on libev.
+
+   https://github.com/zhaojh329/libuwsc
package/libuwsc/libuwsc.hash new file +3 -0
new file mode 100644
index 0000000000..f137b3613b
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 bae2cd13eda86876ebcf99a38a069f5e8c01717713d2fec25031051b9c47624b
 libuwsc-3.3.2.tar.gz
+sha256 e557975decde6439395e72dce7690d974d1a493722a7be5228794ec944f0c5db
 LICENSE
package/libuwsc/libuwsc.mk new file +8 -0
new file mode 100644
index 0000000000..9fbd00a380
@@ -0,0 +1,32 @@
+################################################################################
+#
+# libuwsc
+#
+################################################################################
+
+LIBUWSC_VERSION = 3.3.2
+LIBUWSC_SITE =
Quoted 1 line

https://github.com/zhaojh329/libuwsc/releases/download/v$(LIBUWSC_VERSION)

Your patch seems to be newline damaged. It can't be applied directly. I suggest that you use 'git send-email' to avoid patch mangling.

Quoted 5 lines
package/libuwsc/libuwsc.mk new file +5 -0
+LIBUWSC_LICENSE = MIT
+LIBUWSC_LICENSE_FILES = LICENSE
+LIBUWSC_INSTALL_STAGING = YES
+LIBUWSC_DEPENDENCIES = libev
+

package/libuwsc/libuwsc.mk

Quoted 10 lines
package/libuwsc/libuwsc.mk new file +10 -0
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUWSC_DEPENDENCIES += openssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=ON
+else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
+LIBUWSC_DEPENDENCIES += wolfssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=ON
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBUWSC_DEPENDENCIES += mbedtls
+LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=ON
+endif

When no support SSL backend is available you should explicitly disable SSL support. I believe something line this would work:

else
LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF
endif

package/libuwsc/libuwsc.mk

Quoted 3 lines
package/libuwsc/libuwsc.mk new file +3 -0
+
+ifneq ($(BR2_USE_MMU),)
+ifneq ($(findstring $(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_3), y),)

Just do

ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_3),yy)

That works because only one lua version can be enabled for a given configuration.

But why is MMU required, actually? I see no fork() call in the code.

package/libuwsc/libuwsc.mk

Quoted 2 lines
package/libuwsc/libuwsc.mk new file +2 -0
+LIBUWSC_DEPENDENCIES += lua
+LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON

Here again lua support should be disabled explicitly in the 'else' part.

package/libuwsc/libuwsc.mk

Quoted 4 lines
package/libuwsc/libuwsc.mk new file +4 -0
+endif
+endif
+
+$(eval $(cmake-package))

baruch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -