diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-11-10 10:35:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-11-10 11:46:37 +0000 |
| commit | 826eec9b59f4558d27142143bc51398b1b6fb7ee (patch) | |
| tree | 7319cc8c476e68a5eacf4ae227b58b945522d100 | |
| parent | 167a93982c659b96f4a42dcde92c202e996cd007 (diff) | |
| download | aports-826eec9b59f4558d27142143bc51398b1b6fb7ee.tar.gz aports-826eec9b59f4558d27142143bc51398b1b6fb7ee.tar.bz2 aports-826eec9b59f4558d27142143bc51398b1b6fb7ee.tar.xz | |
main/libwebsockets: upgrade to 4.1.4
| -rw-r--r-- | main/libwebsockets/APKBUILD | 19 | ||||
| -rw-r--r-- | main/libwebsockets/fix-version-string.patch | 15 |
2 files changed, 27 insertions, 7 deletions
diff --git a/main/libwebsockets/APKBUILD b/main/libwebsockets/APKBUILD index cbd2ca7915..0450b935cb 100644 --- a/main/libwebsockets/APKBUILD +++ b/main/libwebsockets/APKBUILD @@ -1,19 +1,18 @@ # Contributor: V.Krishn <vkrishn4@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libwebsockets -pkgver=4.0.20 -pkgrel=2 +pkgver=4.1.4 +pkgrel=0 pkgdesc="C library for lightweight websocket clients and servers" url="https://libwebsockets.org" arch="all" license="MIT" options="!check" makedepends="cmake linux-headers openssl-dev zlib-dev libuv-dev" -subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test" +subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test $pkgname-evlib_uv:_evlib" source=" libwebsockets-$pkgver.tar.gz::https://github.com/warmcat/libwebsockets/archive/v$pkgver.tar.gz - - 0001-test-apps-dont-build-extension-support-if-LWS_WITHOU.patch + fix-version-string.patch " build() { @@ -48,5 +47,11 @@ _test() { mv "$pkgdir"/usr/share "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a libwebsockets-4.0.20.tar.gz -81fec995e0ee18247b42a3cd6f7ea85af2b19a52cf4b193b11fe1ddfeb765f0dacbfe7a075239e21541864ccbf8eb727ef3ffb49784b586707f171d3ae0daa75 0001-test-apps-dont-build-extension-support-if-LWS_WITHOU.patch" +_evlib() { + local _plugin=${subpkgname#$pkgname-} + pkgdesc="libwebsocket $_plugin plugin" + amove usr/lib/libwebsockets-$_plugin.so +} + +sha512sums="4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854 libwebsockets-4.1.4.tar.gz +9325b7cadeb2ca8fb20b4759feb49fb255b1b14c432b7c8c3a1b793a49266bb4f69b78a9c72656039e94ba4fc59ca2c5e821ba33e4f133e72cab26786feb9d60 fix-version-string.patch" diff --git a/main/libwebsockets/fix-version-string.patch b/main/libwebsockets/fix-version-string.patch new file mode 100644 index 0000000000..416f586f95 --- /dev/null +++ b/main/libwebsockets/fix-version-string.patch @@ -0,0 +1,15 @@ +Exclude the git hash from aports tree in the libwebsocket.pc version + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42abee8..2ed3f7a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -340,7 +340,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "4") + set(CPACK_PACKAGE_VERSION_MINOR "1") + set(CPACK_PACKAGE_VERSION_PATCH_NUMBER "4") + +-set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}-${LWS_BUILD_HASH}") ++set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}") + set(CPACK_PACKAGE_RELEASE 1) + + set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") |