Skip to content

Commit

Permalink
my changes not already commited on SynoCommunity#4068
Browse files Browse the repository at this point in the history
- updated libwebsockets
- fix clock_gettime for arm5 and older ppc
- install mosquitto_rr too
- update icon
  • Loading branch information
hgy59 authored and ymartin59 committed Oct 4, 2020
1 parent c4351a5 commit c619b3a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
10 changes: 5 additions & 5 deletions cross/libwebsockets/Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PKG_NAME = libwebsockets
PKG_VERS = 2.4.1
PKG_VERS = 3.2.2
PKG_EXT = tar.gz
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://github.com/warmcat/libwebsockets/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

DEPENDS = cross/openssl

HOMEPAGE = http://libevent.org/
COMMENT = An event notification library
LICENSE = http://libevent.org/LICENSE.txt
HOMEPAGE = https://libwebsockets.org/
COMMENT = Libwebsockets (LWS) is a flexible, lightweight pure C library for implementing modern network protocols easily with a tiny footprint, using a nonblocking event loop.
LICENSE = MIT

include ../../mk/spksrc.cross-cmake.mk
6 changes: 2 additions & 4 deletions cross/libwebsockets/PLIST
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
bin:bin/libwebsockets-test-client
bin:bin/libwebsockets-test-echo
bin:bin/libwebsockets-test-fraggle
bin:bin/libwebsockets-test-ping
bin:bin/libwebsockets-test-lejp
bin:bin/libwebsockets-test-server
bin:bin/libwebsockets-test-server-extpoll
lnk:lib/libwebsockets.so
lib:lib/libwebsockets.so.12
lib:lib/libwebsockets.so.15
rsc:share/libwebsockets-test-server
6 changes: 3 additions & 3 deletions cross/libwebsockets/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libwebsockets-2.4.1.tar.gz SHA1 0f7841014958b654efc595e96ddce13586f868e1
libwebsockets-2.4.1.tar.gz SHA256 29414be4f79f6abc0e6aadccd09a4da0f0c431e3b5691f496acd081ae6a8240c
libwebsockets-2.4.1.tar.gz MD5 742c94e3fd255bb94735a87e86b1bdde
libwebsockets-3.2.2.tar.gz SHA1 96fbfa59ee6a0e9b2861d60c9a030463e0a28ea3
libwebsockets-3.2.2.tar.gz SHA256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
libwebsockets-3.2.2.tar.gz MD5 a29a3e69d22bbb6aa33def7cb6d58c0a
12 changes: 6 additions & 6 deletions cross/mosquitto/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ DEPENDS = cross/c-ares cross/openssl cross/util-linux cross/libwebsockets

HOMEPAGE = http://www.mosquitto.org/
COMMENT = Mosquitto is an open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1.
LICENSE = EPL/EDL licensed
LICENSE = EPL 1.0 and EDL 1.0

CONFIGURE_TARGET = nop
#INSTALL_TARGET = mosquitto_install

COMPILE_MAKE_OPTIONS = "WITH_WEBSOCKETS=yes WITH_SRV=yes WITH_DOCS=no"

include ../../mk/spksrc.cross-cc.mk
ifeq ($(findstring $(ARCH), 88f6281 ppc853x),$(ARCH))
# use clock_gettime of librt
ADDITIONAL_LDFLAGS = -lrt
endif

#.PHONY: mosquitto_install
#mosquitto_install:
# $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR)
include ../../mk/spksrc.cross-cc.mk
1 change: 1 addition & 0 deletions cross/mosquitto/PLIST
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bin:sbin/mosquitto
bin:bin/mosquitto_passwd
bin:bin/mosquitto_pub
bin:bin/mosquitto_rr
bin:bin/mosquitto_sub
lnk:lib/libmosquitto.so
lib:lib/libmosquitto.so.1
Expand Down
Binary file modified spk/mosquitto/src/mosquitto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c619b3a

Please sign in to comment.