mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-21 21:13:27 -04:00
net-libs/ixwebsocket: Bump to 11.3.3, add subslot
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer <nex+b-g-o@nexadn.de>
This commit is contained in:
Adrian Schollmeyer
@@ -1 +1 @@
|
||||
DIST ixwebsocket-11.3.2.tar.gz 600266 BLAKE2B 21051ddbea29fa1cb7a2e4a04426b9bc2e518e7ab93bb866005948e9726b78cb45ce5a2f672c2924affc5e897e5e37e6d2f62fdf7d07d6675888352b9dd0c5ba SHA512 2ee25575d3315a64eef370df87f431e055293105cc6e784c4a776c2c5c5ec45f6c9d39e900fdcea1ad6b4a26b55581600250a9b1c300ce2eb8eebd670e6fda26
|
||||
DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77d2f6b..665c35f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -206,14 +206,6 @@ if (USE_ZLIB)
|
||||
target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
|
||||
endif()
|
||||
|
||||
-# brew install libdeflate
|
||||
-find_package(Deflate)
|
||||
-if (DEFLATE_FOUND)
|
||||
- include_directories(${DEFLATE_INCLUDE_DIRS})
|
||||
- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
|
||||
- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
|
||||
-endif()
|
||||
-
|
||||
if (WIN32)
|
||||
target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
@@ -1,34 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77d2f6b..4c64106 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -238,23 +238,25 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||
target_compile_options(ixwebsocket PRIVATE /MP)
|
||||
endif()
|
||||
|
||||
+include(GNUInstallDirs)
|
||||
+
|
||||
target_include_directories(ixwebsocket PUBLIC
|
||||
$<BUILD_INTERFACE:${IXWEBSOCKET_INCLUDE_DIRS}/>
|
||||
- $<INSTALL_INTERFACE:include/ixwebsocket>
|
||||
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket>
|
||||
)
|
||||
|
||||
set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
|
||||
|
||||
install(TARGETS ixwebsocket
|
||||
EXPORT ixwebsocket
|
||||
- ARCHIVE DESTINATION lib
|
||||
- PUBLIC_HEADER DESTINATION include/ixwebsocket/
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/
|
||||
)
|
||||
|
||||
install(EXPORT ixwebsocket
|
||||
FILE ixwebsocket-config.cmake
|
||||
NAMESPACE ixwebsocket::
|
||||
- DESTINATION lib/cmake/ixwebsocket)
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket)
|
||||
|
||||
if (USE_WS OR USE_TEST)
|
||||
include(FetchContent)
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77d2f6b..665c35f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -206,14 +206,6 @@ if (USE_ZLIB)
|
||||
target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
|
||||
endif()
|
||||
|
||||
-# brew install libdeflate
|
||||
-find_package(Deflate)
|
||||
-if (DEFLATE_FOUND)
|
||||
- include_directories(${DEFLATE_INCLUDE_DIRS})
|
||||
- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES})
|
||||
- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE)
|
||||
-endif()
|
||||
-
|
||||
if (WIN32)
|
||||
target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
@@ -1,28 +0,0 @@
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 661aebb..bab73c7 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
|
||||
|
||||
# Shared sources
|
||||
set (TEST_TARGET_NAMES
|
||||
- IXSocketTest
|
||||
IXSocketConnectTest
|
||||
IXWebSocketServerTest
|
||||
IXWebSocketTestConnectionDisconnection
|
||||
IXUrlParserTest
|
||||
- IXHttpClientTest
|
||||
IXUnityBuildsTest
|
||||
IXHttpTest
|
||||
- IXDNSLookupTest
|
||||
IXWebSocketSubProtocolTest
|
||||
# IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
|
||||
IXStrCaseCompareTest
|
||||
@@ -33,7 +30,6 @@ if (UNIX)
|
||||
|
||||
# Fail on Windows in CI probably because the pathing is wrong and
|
||||
# some resource files cannot be found
|
||||
- IXHttpServerTest
|
||||
IXWebSocketChatTest
|
||||
)
|
||||
endif()
|
||||
@@ -1,55 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77d2f6b..86c7172 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -257,13 +257,9 @@ install(EXPORT ixwebsocket
|
||||
DESTINATION lib/cmake/ixwebsocket)
|
||||
|
||||
if (USE_WS OR USE_TEST)
|
||||
- include(FetchContent)
|
||||
- FetchContent_Declare(spdlog
|
||||
- GIT_REPOSITORY "https://github.com/gabime/spdlog"
|
||||
- GIT_TAG "v1.8.0"
|
||||
- GIT_SHALLOW 1)
|
||||
-
|
||||
- FetchContent_MakeAvailable(spdlog)
|
||||
+ find_package(spdlog REQUIRED)
|
||||
+ find_package(fmt REQUIRED)
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_FMT_EXTERNAL")
|
||||
|
||||
if (USE_WS)
|
||||
add_subdirectory(ws)
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 661aebb..ab0c92e 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -66,7 +66,7 @@ target_include_directories(ixwebsocket_test PRIVATE
|
||||
../third_party
|
||||
)
|
||||
target_link_libraries(ixwebsocket_test ixwebsocket)
|
||||
-target_link_libraries(ixwebsocket_test spdlog)
|
||||
+target_link_libraries(ixwebsocket_test spdlog::spdlog fmt::fmt)
|
||||
|
||||
foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
|
||||
add_executable(${TEST_TARGET_NAME}
|
||||
@@ -89,7 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES})
|
||||
target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test)
|
||||
target_link_libraries(${TEST_TARGET_NAME} ixwebsocket)
|
||||
|
||||
- target_link_libraries(${TEST_TARGET_NAME} spdlog)
|
||||
+ target_link_libraries(${TEST_TARGET_NAME} spdlog fmt)
|
||||
|
||||
add_test(NAME ${TEST_TARGET_NAME}
|
||||
COMMAND ${TEST_TARGET_NAME}
|
||||
diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt
|
||||
index 98f15de..10834e5 100644
|
||||
--- a/ws/CMakeLists.txt
|
||||
+++ b/ws/CMakeLists.txt
|
||||
@@ -31,6 +31,6 @@ add_executable(ws
|
||||
# library with the most dependencies come first
|
||||
target_link_libraries(ws ixwebsocket)
|
||||
|
||||
-target_link_libraries(ws spdlog)
|
||||
+target_link_libraries(ws spdlog::spdlog fmt::fmt)
|
||||
|
||||
install(TARGETS ws RUNTIME DESTINATION bin)
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 661aebb..bab73c7 100644
|
||||
index c8822a4..9ec705c 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON)
|
||||
@@ -18,7 +18,7 @@ index 661aebb..bab73c7 100644
|
||||
IXWebSocketSubProtocolTest
|
||||
# IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws
|
||||
IXStrCaseCompareTest
|
||||
@@ -33,7 +30,6 @@ if (UNIX)
|
||||
@@ -34,7 +31,6 @@ if (UNIX)
|
||||
|
||||
# Fail on Windows in CI probably because the pathing is wrong and
|
||||
# some resource files cannot be found
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2021 Gentoo Authors
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/machinezone/IXWebSocket"
|
||||
SRC_URI="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
SLOT="0/11.3.2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+ssl test zlib ws"
|
||||
|
||||
@@ -49,8 +49,6 @@ PATCHES=(
|
||||
"${FILESDIR}/${P}-remove-network-tests.patch"
|
||||
# Upstream uses git submodules
|
||||
"${FILESDIR}/${P}-use-system-spdlog.patch"
|
||||
# Upstream detects deflate dynamically, so let's remove it
|
||||
"${FILESDIR}/${P}-remove-deflate.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
Reference in New Issue
Block a user