Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adjust configuration options to closer match other distributions and also upstream's recommendations. Mosquitto also requires LWS_WITH_EXTERNAL_POLL to be enabled when linked with this library. Enable following options: LWS_WITH_DISKCACHE, LWS_WITH_FTS, LWS_WITH_RANGES, LWS_WITH_THREADPOOL and (LWS_WITH_EXTERNAL_POLL via MQTT option). Use SHA1 via OpenSSL (LWS_WITHOUT_BUILTIN_SHA1) While at also adjust .cmake and .pc files to properly report version Changelog: https://github.com/warmcat/libwebsockets/blob/v4.3.0/changelog warmcat/libwebsockets@v4.3.0...v4.3.2 PR: 262552 Reported by: Leo Schneider <ttkdroid@gmail.com> Tested by: Rod Morgan <rmorgan@portmorgan.com>
- Loading branch information
Daniel Engberg
authored and
Daniel Engberg
committed
Feb 16, 2023
1 parent
6f54d06
commit 7a57329
Showing
5 changed files
with
62 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1633420177 | ||
SHA256 (libwebsockets-v4.2.2.tar.xz) = 0d8cf2abeea4a6ad24935c60a26120ed864fb263dd95b6abf7d19356b7095410 | ||
SIZE (libwebsockets-v4.2.2.tar.xz) = 12769280 | ||
TIMESTAMP = 1676237078 | ||
SHA256 (libwebsockets-v4.3.2.tar.xz) = 287ad6f63344323c4e2404d2ab3a8a0803932d554c724aaffbb1e8fe2e5e9243 | ||
SIZE (libwebsockets-v4.3.2.tar.xz) = 13598720 |
8 changes: 8 additions & 0 deletions
8
net/libwebsockets/files/patch-cmake_libwebsockets-config-version.cmake.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- cmake/libwebsockets-config-version.cmake.in.orig 1970-01-01 00:00:00 UTC | ||
+++ cmake/libwebsockets-config-version.cmake.in | ||
@@ -1,4 +1,4 @@ | ||
-set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION@") | ||
+set(PACKAGE_VERSION "@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH_NUMBER@") | ||
|
||
# Check whether the requested PACKAGE_FIND_VERSION is compatible | ||
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- lib/CMakeLists.txt.orig 2023-02-14 23:28:15 UTC | ||
+++ lib/CMakeLists.txt | ||
@@ -316,7 +316,7 @@ includedir=\${prefix}/include | ||
|
||
Name: libwebsockets | ||
Description: Websockets server and client library | ||
-Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} | ||
+Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH_NUMBER} | ||
|
||
Libs: -L\${libdir} -lwebsockets | ||
Cflags: -I\${includedir} | ||
@@ -328,7 +328,7 @@ endif() | ||
|
||
|
||
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc" | ||
- DESTINATION lib${LIB_SUFFIX}/pkgconfig) | ||
+ DESTINATION libdata/pkgconfig) | ||
|
||
file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" | ||
"prefix=\"${CMAKE_INSTALL_PREFIX}\" | ||
@@ -338,7 +338,7 @@ includedir=\${prefix}/include | ||
|
||
Name: libwebsockets_static | ||
Description: Websockets server and client static library | ||
-Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} | ||
+Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH_NUMBER} | ||
|
||
Libs: -L\${libdir} -l:libwebsockets${CMAKE_STATIC_LIBRARY_SUFFIX} | ||
Libs.private: | ||
@@ -352,7 +352,7 @@ endif() | ||
|
||
|
||
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc" | ||
- DESTINATION lib${LIB_SUFFIX}/pkgconfig) | ||
+ DESTINATION libdata/pkgconfig) | ||
|
||
endif(UNIX OR MINGW) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters