net-libs/ixwebsocket: add 11.4.1

Signed-off-by: Adrian Schollmeyer <nex+b-g-o@nexadn.de>
This commit is contained in:
Adrian Schollmeyer
2022-04-24 16:02:48 +02:00
parent ceac712a60
commit b0b6e91a61
5 changed files with 149 additions and 0 deletions

View File

@@ -1 +1,2 @@
DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f
DIST ixwebsocket-11.4.1.tar.gz 631397 BLAKE2B c5be5cc5684b69b9a71577db33550cb5512ea7b7965da7a31d1680ae1c2c711db42b442ed99ff57e5f87dd3fa299e4ac2dc184f41af92616dd142444d4bf7827 SHA512 73204d86b876ab739263525312bc473b4f4f9d15b96e6a5c511b58dc13bb0d99c083a83c31ecb08be15eb6b413ad0cf6434ef3b7af8d29e559079705a609f119

View File

@@ -0,0 +1,28 @@
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c8822a4..9ec705c 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
@@ -34,7 +31,6 @@ if (UNIX)
# Fail on Windows in CI probably because the pathing is wrong and
# some resource files cannot be found
- IXHttpServerTest
IXWebSocketChatTest
)
endif()

View File

@@ -0,0 +1,55 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e87173e..0ea2528 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,13 +296,9 @@ if (IXWEBSOCKET_INSTALL)
endif()
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 c8822a4..fb12711 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -67,7 +67,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}
@@ -90,7 +90,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::spdlog fmt::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)

View File

@@ -0,0 +1,62 @@
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
MY_P="IXWebSocket-${PV}"
DESCRIPTION="C++ websocket client and server library"
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/11.3.2"
KEYWORDS="~amd64 ~x86"
IUSE="+ssl test zlib ws"
DEPEND="
ssl? (
dev-libs/openssl:=
)
ws? (
>=dev-libs/spdlog-1.8.0:=
)
zlib? (
sys-libs/zlib:=
)
test? (
>=dev-libs/spdlog-1.8.0:=
)
"
RDEPEND="
ssl? (
dev-libs/openssl:=
)
zlib? (
sys-libs/zlib:=
)
"
BDEPEND=""
S="${WORKDIR}/${MY_P}"
RESTRICT="!test? ( test )"
PATCHES=(
# Some tests require network connectivity
"${FILESDIR}/${P}-remove-network-tests.patch"
# Upstream uses git submodules
"${FILESDIR}/${P}-use-system-spdlog.patch"
)
src_configure() {
local mycmakeargs=(
-DUSE_TLS="$(usex ssl)"
-DUSE_ZLIB="$(usex zlib)"
-DUSE_WS="$(usex ws)"
-DUSE_TEST="$(usex test)"
)
cmake_src_configure
}

View File

@@ -8,4 +8,7 @@
<use>
<flag name="ws">Build the ws utility</flag>
</use>
<slots>
<subslots>Correspond to SONAME</subslots>
</slots>
</pkgmetadata>