diff options
-rw-r--r-- | www/libwebsockets/Makefile | 6 | ||||
-rw-r--r-- | www/libwebsockets/PLIST | 14 | ||||
-rw-r--r-- | www/libwebsockets/buildlink3.mk | 3 | ||||
-rw-r--r-- | www/libwebsockets/distinfo | 10 | ||||
-rw-r--r-- | www/libwebsockets/patches/patch-CMakeLists.txt | 15 | ||||
-rw-r--r-- | www/libwebsockets/patches/patch-lib_core_context.c | 15 |
6 files changed, 19 insertions, 44 deletions
diff --git a/www/libwebsockets/Makefile b/www/libwebsockets/Makefile index 9d4f8733860..6845454c9b1 100644 --- a/www/libwebsockets/Makefile +++ b/www/libwebsockets/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2021/05/26 19:38:28 bouyer Exp $ +# $NetBSD: Makefile,v 1.3 2022/07/03 10:46:54 wiz Exp $ -DISTNAME= libwebsockets-4.1.4 +DISTNAME= libwebsockets-4.3.0 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=warmcat/} GITHUB_TAG= v${PKGVERSION_NOREV} -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://libwebsockets.org/ @@ -12,6 +11,7 @@ COMMENT= Lightweight C library for websocket clients and servers LICENSE= mit USE_CMAKE= yes +USE_LANGUAGES= c c++ USE_TOOLS+= pkg-config CMAKE_ARGS+= -DLWS_WITH_LIBUV=ON diff --git a/www/libwebsockets/PLIST b/www/libwebsockets/PLIST index 385d952800a..2a9a2d54f1a 100644 --- a/www/libwebsockets/PLIST +++ b/www/libwebsockets/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2020/11/02 12:32:20 nia Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/07/03 10:46:54 wiz Exp $ include/libwebsockets.h include/libwebsockets/abstract/abstract.h include/libwebsockets/abstract/protocols.h @@ -11,17 +11,20 @@ include/libwebsockets/lws-async-dns.h include/libwebsockets/lws-bb-i2c.h include/libwebsockets/lws-bb-spi.h include/libwebsockets/lws-button.h +include/libwebsockets/lws-cache-ttl.h include/libwebsockets/lws-callbacks.h include/libwebsockets/lws-cgi.h include/libwebsockets/lws-client.h +include/libwebsockets/lws-conmon.h include/libwebsockets/lws-context-vhost.h +include/libwebsockets/lws-cose.h include/libwebsockets/lws-dbus.h -include/libwebsockets/lws-detailed-latency.h include/libwebsockets/lws-diskcache.h include/libwebsockets/lws-display.h include/libwebsockets/lws-dll2.h include/libwebsockets/lws-dsh.h include/libwebsockets/lws-eventlib-exports.h +include/libwebsockets/lws-fault-injection.h include/libwebsockets/lws-freertos.h include/libwebsockets/lws-fts.h include/libwebsockets/lws-genaes.h @@ -37,10 +40,13 @@ include/libwebsockets/lws-jose.h include/libwebsockets/lws-jwe.h include/libwebsockets/lws-jwk.h include/libwebsockets/lws-jws.h +include/libwebsockets/lws-lecp.h include/libwebsockets/lws-led.h include/libwebsockets/lws-lejp.h include/libwebsockets/lws-logs.h include/libwebsockets/lws-lwsac.h +include/libwebsockets/lws-map.h +include/libwebsockets/lws-metrics.h include/libwebsockets/lws-misc.h include/libwebsockets/lws-mqtt.h include/libwebsockets/lws-netdev.h @@ -63,12 +69,12 @@ include/libwebsockets/lws-spa.h include/libwebsockets/lws-spi.h include/libwebsockets/lws-ssd1306-i2c.h include/libwebsockets/lws-state.h -include/libwebsockets/lws-stats.h include/libwebsockets/lws-struct.h include/libwebsockets/lws-system.h include/libwebsockets/lws-test-sequencer.h include/libwebsockets/lws-threadpool.h include/libwebsockets/lws-timeout-timer.h +include/libwebsockets/lws-tls-sessions.h include/libwebsockets/lws-tokenize.h include/libwebsockets/lws-vfs.h include/libwebsockets/lws-write.h @@ -86,6 +92,6 @@ lib/cmake/libwebsockets/libwebsockets-config.cmake lib/libwebsockets-evlib_uv.so lib/libwebsockets.a lib/libwebsockets.so -lib/libwebsockets.so.17 +lib/libwebsockets.so.19 lib/pkgconfig/libwebsockets.pc lib/pkgconfig/libwebsockets_static.pc diff --git a/www/libwebsockets/buildlink3.mk b/www/libwebsockets/buildlink3.mk index 9606c392922..d81d916e2ad 100644 --- a/www/libwebsockets/buildlink3.mk +++ b/www/libwebsockets/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2020/11/02 12:32:20 nia Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2022/07/03 10:46:54 wiz Exp $ BUILDLINK_TREE+= libwebsockets @@ -6,6 +6,7 @@ BUILDLINK_TREE+= libwebsockets LIBWEBSOCKETS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libwebsockets+= libwebsockets>=1.7.2 +BUILDLINK_ABI_DEPENDS.libwebsockets?= libwebsockets>=4.3.0 BUILDLINK_PKGSRCDIR.libwebsockets?= ../../www/libwebsockets .include "../../security/openssl/buildlink3.mk" diff --git a/www/libwebsockets/distinfo b/www/libwebsockets/distinfo index c31d903351f..61e6872078c 100644 --- a/www/libwebsockets/distinfo +++ b/www/libwebsockets/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:29:37 nia Exp $ +$NetBSD: distinfo,v 1.5 2022/07/03 10:46:54 wiz Exp $ -BLAKE2s (libwebsockets-4.1.4.tar.gz) = 4efed454d12b836939c6c85802af6ad1f9ef667c1ad2d7b5a93644eb755b6d42 -SHA512 (libwebsockets-4.1.4.tar.gz) = 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854 -Size (libwebsockets-4.1.4.tar.gz) = 12698800 bytes -SHA1 (patch-CMakeLists.txt) = 7d8a4d5d87ab887c78a914c09ae61f119c47737e -SHA1 (patch-lib_core_context.c) = a0f7067a0ffa65b19a13945bfc1fe0cece5d2869 +BLAKE2s (libwebsockets-4.3.0.tar.gz) = f3d36d771602cfb8a4f5660a5ca8313e8034114dc056f7f3d6e5ff9919a4f5e3 +SHA512 (libwebsockets-4.3.0.tar.gz) = 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42 +Size (libwebsockets-4.3.0.tar.gz) = 15605272 bytes diff --git a/www/libwebsockets/patches/patch-CMakeLists.txt b/www/libwebsockets/patches/patch-CMakeLists.txt deleted file mode 100644 index c3dd98c760c..00000000000 --- a/www/libwebsockets/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/26 19:38:28 bouyer Exp $ - -Don't use libdl on BSD systems - ---- CMakeLists.txt.orig 2020-10-26 12:31:31.000000000 +0100 -+++ CMakeLists.txt 2021-05-26 19:47:32.380836987 +0200 -@@ -539,7 +539,7 @@ - list(APPEND LIB_LIST_AT_END "${ZLIB_LIBRARIES}") - endif() - --if (LWS_WITH_PLUGINS_API AND UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) -+if (LWS_WITH_PLUGINS_API AND UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")) - list(APPEND LIB_LIST_AT_END "dl") - endif() - diff --git a/www/libwebsockets/patches/patch-lib_core_context.c b/www/libwebsockets/patches/patch-lib_core_context.c deleted file mode 100644 index 06cc7fe6517..00000000000 --- a/www/libwebsockets/patches/patch-lib_core_context.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_core_context.c,v 1.1 2020/11/02 12:32:20 nia Exp $ - -Add more stuff to the ifdef mess. - ---- lib/core/context.c.orig 2020-10-26 11:31:31.000000000 +0000 -+++ lib/core/context.c -@@ -30,7 +30,7 @@ - - static const char *library_version = LWS_LIBRARY_VERSION; - --#if defined(__linux__) || defined(__FreeBSD__) || defined(__illumos__) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__illumos__) - /* for setrlimit */ - #include <sys/resource.h> - #endif |