diff --git a/packages/addons/addon-depends/ttyd-depends/json-c/package.mk b/packages/addons/addon-depends/ttyd-depends/json-c/package.mk index 4a6df9200b..0062db29df 100644 --- a/packages/addons/addon-depends/ttyd-depends/json-c/package.mk +++ b/packages/addons/addon-depends/ttyd-depends/json-c/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="json-c" -PKG_VERSION="3e81b4abe359c8128bb2b4127f4e8c8c057fb004" -PKG_SHA256="85569b581e8ff0999de5a43a65332559df3aa386e757d76ac8a4915eb4fb783a" +PKG_VERSION="9021cdcdd01fc9dbcbe1f06391848c2ac915212f" +PKG_SHA256="a102249b3f7f11c526d1af6e428f351398620ec3d679458b9ad3cdcfb14ceaaf" PKG_LICENSE="MIT" PKG_SITE="https://github.com/json-c/json-c" PKG_URL="https://github.com/json-c/json-c/archive/$PKG_VERSION.tar.gz" diff --git a/packages/addons/addon-depends/ttyd-depends/libuv/package.mk b/packages/addons/addon-depends/ttyd-depends/libuv/package.mk new file mode 100644 index 0000000000..84b9c50b4f --- /dev/null +++ b/packages/addons/addon-depends/ttyd-depends/libuv/package.mk @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="libuv" +PKG_VERSION="1.40.0" +PKG_SHA256="70fe1c9ba4f2c509e8166c0ca2351000237da573bb6c82092339207a9715ba6b" +PKG_LICENSE="MIT" +PKG_SITE="https://github.com/libuv/libuv" +PKG_URL="https://github.com/libuv/libuv/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="Multi-platform support library with a focus on asynchronous I/O" + +PKG_CMAKE_OPTS_TARGET="-DLIBUV_BUILD_TESTS=OFF" diff --git a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk index f1e63d2c6e..5133818557 100644 --- a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk +++ b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk @@ -2,10 +2,13 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libwebsockets" -PKG_VERSION="3.1.0" -PKG_SHA256="db948be74c78fc13f1f1a55e76707d7baae3a1c8f62b625f639e8f2736298324" +PKG_VERSION="4.0.7" +PKG_SHA256="531e8f54fb9df64e790a3a62ace103dfbd67d2e3994745623422f89fbb7abcaf" PKG_LICENSE="LGPL2+" PKG_SITE="https://libwebsockets.org" PKG_URL="https://github.com/warmcat/libwebsockets/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain openssl json-c" +PKG_DEPENDS_TARGET="toolchain openssl json-c libuv" PKG_LONGDESC="Library for implementing network protocols with a tiny footprint." + +PKG_CMAKE_OPTS_TARGET="-DLWS_WITH_LIBUV=ON \ + -DLWS_WITHOUT_TESTAPPS=ON" diff --git a/packages/addons/service/ttyd/changelog.txt b/packages/addons/service/ttyd/changelog.txt index 939a143a03..6be8a16299 100644 --- a/packages/addons/service/ttyd/changelog.txt +++ b/packages/addons/service/ttyd/changelog.txt @@ -1,2 +1,6 @@ +101 +- update to 1.6.1 +- fix disconnections + 100 - initial LibreELEC version diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index 50a172e8e7..3eab409648 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ttyd" -PKG_VERSION="1.4.4" -PKG_SHA256="b910a33ddaa474c369991ba345187a8a2f4aa420389083671ba3a6c305a491d6" -PKG_REV="100" +PKG_VERSION="1.6.1" +PKG_SHA256="d72dcca3dec00cda87b80a0a25ae4fee2f8b9098c1cdb558508dcb14fbb6fafc" +PKG_REV="101" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/tsl0922/ttyd" @@ -23,6 +23,7 @@ addon() { cp -P $PKG_INSTALL/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.14 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.16 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib } diff --git a/packages/addons/service/ttyd/source/system.d/service.ttyd.service b/packages/addons/service/ttyd/source/system.d/service.ttyd.service index cd65602731..958842770d 100644 --- a/packages/addons/service/ttyd/source/system.d/service.ttyd.service +++ b/packages/addons/service/ttyd/source/system.d/service.ttyd.service @@ -8,7 +8,7 @@ TimeoutStopSec=1 Restart=always RestartSec=2 StartLimitInterval=0 -Type=forking +Type=exec [Install] WantedBy=kodi.target