commit: 8917d4ce45811846288c2585387d2fb4aabb91e2 Author: Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com> AuthorDate: Sat Sep 30 13:34:33 2023 +0000 Commit: Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com> CommitDate: Sat Sep 30 14:56:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8917d4ce
net-libs/ixwebsocket: add 11.4.4 Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com> net-libs/ixwebsocket/Manifest | 1 + .../ixwebsocket-11.4.4-remove-network-tests.patch | 28 ++++++++++ .../ixwebsocket-11.4.4-use-system-spdlog.patch | 55 +++++++++++++++++++ net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild | 62 ++++++++++++++++++++++ 4 files changed, 146 insertions(+) diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest index 7228a3647c..c89b01c853 100644 --- a/net-libs/ixwebsocket/Manifest +++ b/net-libs/ixwebsocket/Manifest @@ -1,2 +1,3 @@ DIST ixwebsocket-11.3.3.tar.gz 631670 BLAKE2B 77e88fd107b5670ff70ff06e1cb6c32145ce709008fc2c51abf7c05d0b5f6e02524846261a5b3252b1e5d95e55545aa8a3d9ae663675f91ead709bf133e48d3e SHA512 3831794450bd9e5c08251301afae83ed0ffdb5d1d2e1db40d02d09545e0a78f8ea9d637210181211dff113b78dbb9a4ebaa26faef28f8f65a340321067fa3a8f DIST ixwebsocket-11.4.3.tar.gz 633130 BLAKE2B 8208b83979ce1a842d41d2cf19c7e9475dc5801677e21a0c502d6268d3cc913cb8b3a1c493b9b816ec7734e2179839fe9eef6c9985452e9de6a8378204d2221b SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97 +DIST ixwebsocket-11.4.4.tar.gz 637396 BLAKE2B bb8e6f727697de4577243a8eed35f347ab0bb204207fa4d57c2d5220462c3ba4654bb069c675f9bca14163c3ca93cd7cf0d8ab3088302b3ac02ac4dd93d8693e SHA512 698ad96f25f53bf48906201826008bad46c657f8043d3653988716ddd9fb5dfeb52cebc002b3af76b91d0561155607a5f38bbc2c808aa67f438432207da82a35 diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-remove-network-tests.patch new file mode 100644 index 0000000000..5b9b5eaf0d --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-remove-network-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index c2fa943..15e3136 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -11,7 +11,6 @@ option(USE_TLS "Add TLS support" ON) + + # Shared sources + set (TEST_TARGET_NAMES +- IXSocketTest + IXSocketConnectTest + IXWebSocketServerTest + IXWebSocketTestConnectionDisconnection +@@ -19,7 +18,6 @@ set (TEST_TARGET_NAMES + # IXHttpClientTest ## FIXME httpbin.org does not seem normal + IXUnityBuildsTest + IXHttpTest +- IXDNSLookupTest + IXWebSocketSubProtocolTest + # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws + IXStrCaseCompareTest +@@ -33,7 +31,6 @@ if (UNIX) + list(APPEND TEST_TARGET_NAMES + # Fail on Windows in CI probably because the pathing is wrong and + # some resource files cannot be found +- IXHttpServerTest + IXWebSocketChatTest + ) + endif() diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-use-system-spdlog.patch new file mode 100644 index 0000000000..8944acaf47 --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-use-system-spdlog.patch @@ -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) diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild new file mode 100644 index 0000000000..ab45a5ac9c --- /dev/null +++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 2021-2023 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 +}
