From 02a1d43b953e9c94f50da3be0e5a3174576764e4 Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 24 Feb 2020 13:37:19 +0100 Subject: [PATCH] ttyd: dynamically link against libwebsockets --- .../patches/cmake-find-libwebsockets.patch | 27 +++++++++++++++++++ srcpkgs/ttyd/template | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch diff --git a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch b/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch new file mode 100644 index 00000000000..68816ea49a1 --- /dev/null +++ b/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch @@ -0,0 +1,27 @@ +# make it link against libwebsockets dynamically + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -53,21 +53,9 @@ + + find_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) +-find_package(Libwebsockets 1.7.0 QUIET) +- +-if(NOT Libwebsockets_FOUND) # for libwebsockets-dev on ubuntu 16.04 +- find_path(LIBWEBSOCKETS_INCLUDE_DIR NAMES libwebsockets.h) +- find_library(LIBWEBSOCKETS_LIBRARY NAMES websockets) +- find_package_handle_standard_args(Libwebsockets REQUIRED_VARS LIBWEBSOCKETS_LIBRARY LIBWEBSOCKETS_INCLUDE_DIR) +- mark_as_advanced(LIBWEBSOCKETS_INCLUDE_DIR LIBWEBSOCKETS_LIBRARY) +- if(Libwebsockets_FOUND) +- SET(LIBWEBSOCKETS_INCLUDE_DIRS "${LIBWEBSOCKETS_INCLUDE_DIR}") +- SET(LIBWEBSOCKETS_LIBRARIES "${LIBWEBSOCKETS_LIBRARY}") +- endif() +-endif() + + set(INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIRS} ${JSON-C_INCLUDE_DIRS} ${LIBUV_INCLUDE_DIRS}) +-set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES}) ++set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} websockets ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES}) + + if(WIN32) + list(APPEND LINK_LIBS shell32) diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template index 701cad1f0fb..f6abde61397 100644 --- a/srcpkgs/ttyd/template +++ b/srcpkgs/ttyd/template @@ -1,7 +1,7 @@ # Template file for 'ttyd' pkgname=ttyd version=1.6.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config xxd" makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel