* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/
@ 2023-10-02 12:23 Remigiusz Micielski
0 siblings, 0 replies; 5+ messages in thread
From: Remigiusz Micielski @ 2023-10-02 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 88387d976d12640285394647c0b433b3768e1563
Author: Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Mon Oct 2 12:22:11 2023 +0000
Commit: Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Mon Oct 2 12:23:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=88387d97
net-libs/ixwebsocket: drop 11.3.3, 11.4.3
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>
net-libs/ixwebsocket/Manifest | 2 -
.../ixwebsocket-11.3.3-remove-network-tests.patch | 28 ---------
.../ixwebsocket-11.3.3-use-system-spdlog.patch | 55 ------------------
.../ixwebsocket-11.4.3-remove-network-tests.patch | 28 ---------
.../ixwebsocket-11.4.3-use-system-spdlog.patch | 55 ------------------
net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild | 67 ----------------------
net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild | 62 --------------------
7 files changed, 297 deletions(-)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index c89b01c853..70c0aa65e4 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1,3 +1 @@
-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.3.3-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-remove-network-tests.patch
deleted file mode 100644
index 64761c4cec..0000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-remove-network-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-use-system-spdlog.patch
deleted file mode 100644
index ed329b41de..0000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.3.3-use-system-spdlog.patch
+++ /dev/null
@@ -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)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-remove-network-tests.patch
deleted file mode 100644
index 64761c4cec..0000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-remove-network-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-use-system-spdlog.patch
deleted file mode 100644
index 8944acaf47..0000000000
--- a/net-libs/ixwebsocket/files/ixwebsocket-11.4.3-use-system-spdlog.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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.3.3.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild
deleted file mode 100644
index 005c7834d6..0000000000
--- a/net-libs/ixwebsocket/ixwebsocket-11.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ctest --output-on-failure || die
-}
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild
deleted file mode 100644
index 0ec823cd88..0000000000
--- a/net-libs/ixwebsocket/ixwebsocket-11.4.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/
@ 2024-02-23 14:15 Remigiusz Micielski
0 siblings, 0 replies; 5+ messages in thread
From: Remigiusz Micielski @ 2024-02-23 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 2dd8789f46357123b4f0b026e7d23030b2509cdd
Author: Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Fri Feb 23 01:09:00 2024 +0000
Commit: Remigiusz Micielski <remigiusz.micielski <AT> gmail <DOT> com>
CommitDate: Fri Feb 23 14:15:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2dd8789f
net-libs/ixwebsocket: add fix server empty thread name patch
Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>
...ocket-11.4.4-fix-server-empty-thread-name.patch | 82 ++++++++++++++++++++++
net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild | 2 +
2 files changed, 84 insertions(+)
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch
new file mode 100644
index 0000000000..af062b3b93
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.4-fix-server-empty-thread-name.patch
@@ -0,0 +1,82 @@
+From a7019631b765581b7e3549cf7cdac77496984709 Mon Sep 17 00:00:00 2001
+From: lanthora <lanthora@outlook.com>
+Date: Wed, 2 Aug 2023 13:16:43 +0800
+Subject: [PATCH] Fix server empty thread name (#478)
+
+---
+ ixwebsocket/IXWebSocket.cpp | 11 ++++++++++-
+ ixwebsocket/IXWebSocket.h | 5 +++++
+ ixwebsocket/IXWebSocketServer.cpp | 3 +++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/ixwebsocket/IXWebSocket.cpp b/ixwebsocket/IXWebSocket.cpp
+index 1a879a78..b74426ef 100644
+--- a/ixwebsocket/IXWebSocket.cpp
++++ b/ixwebsocket/IXWebSocket.cpp
+@@ -41,6 +41,7 @@ namespace ix
+ , _enablePong(kDefaultEnablePong)
+ , _pingIntervalSecs(kDefaultPingIntervalSecs)
+ , _pingType(SendMessageKind::Ping)
++ , _autoThreadName(true)
+ {
+ _ws.setOnCloseCallback(
+ [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
+@@ -370,7 +371,10 @@ namespace ix
+
+ void WebSocket::run()
+ {
+- setThreadName(getUrl());
++ if (_autoThreadName)
++ {
++ setThreadName(getUrl());
++ }
+
+ bool firstConnectionAttempt = true;
+
+@@ -627,4 +631,9 @@ namespace ix
+ std::lock_guard<std::mutex> lock(_configMutex);
+ return _subProtocols;
+ }
++
++ void WebSocket::setAutoThreadName(bool enabled)
++ {
++ _autoThreadName = enabled;
++ }
+ } // namespace ix
+diff --git a/ixwebsocket/IXWebSocket.h b/ixwebsocket/IXWebSocket.h
+index 7adfe166..21292e7d 100644
+--- a/ixwebsocket/IXWebSocket.h
++++ b/ixwebsocket/IXWebSocket.h
+@@ -119,6 +119,8 @@ namespace ix
+ uint32_t getMinWaitBetweenReconnectionRetries() const;
+ const std::vector<std::string>& getSubProtocols();
+
++ void setAutoThreadName(bool enabled);
++
+ private:
+ WebSocketSendInfo sendMessage(const IXWebSocketSendData& message,
+ SendMessageKind sendMessageKind,
+@@ -182,6 +184,9 @@ namespace ix
+ // Subprotocols
+ std::vector<std::string> _subProtocols;
+
++ // enable or disable auto set thread name
++ bool _autoThreadName;
++
+ friend class WebSocketServer;
+ };
+ } // namespace ix
+diff --git a/ixwebsocket/IXWebSocketServer.cpp b/ixwebsocket/IXWebSocketServer.cpp
+index 03b0ea50..4518389b 100644
+--- a/ixwebsocket/IXWebSocketServer.cpp
++++ b/ixwebsocket/IXWebSocketServer.cpp
+@@ -91,6 +91,9 @@ namespace ix
+ setThreadName("Srv:ws:" + connectionState->getId());
+
+ auto webSocket = std::make_shared<WebSocket>();
++
++ webSocket->setAutoThreadName(false);
++
+ if (_onConnectionCallback)
+ {
+ _onConnectionCallback(webSocket, connectionState);
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
index ab45a5ac9c..2f852a9479 100644
--- a/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
+++ b/net-libs/ixwebsocket/ixwebsocket-11.4.4.ebuild
@@ -49,6 +49,8 @@ PATCHES=(
"${FILESDIR}/${P}-remove-network-tests.patch"
# Upstream uses git submodules
"${FILESDIR}/${P}-use-system-spdlog.patch"
+ # Fix Server empty thread name
+ "${FILESDIR}/${P}-fix-server-empty-thread-name.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/
@ 2023-09-30 14:56 Remigiusz Micielski
0 siblings, 0 replies; 5+ messages in thread
From: Remigiusz Micielski @ 2023-09-30 14:56 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/
@ 2022-04-29 7:20 Adrian Schollmeyer
0 siblings, 0 replies; 5+ messages in thread
From: Adrian Schollmeyer @ 2022-04-29 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 1ff1e0590d5f72f58e800d32b321cb43f071fd62
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Fri Apr 29 07:20:17 2022 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Fri Apr 29 07:20:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1ff1e059
net-libs/ixwebsocket: add 11.4.2, drop 11.4.1
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 2 +-
...etwork-tests.patch => ixwebsocket-11.4.2-remove-network-tests.patch} | 0
...e-system-spdlog.patch => ixwebsocket-11.4.2-use-system-spdlog.patch} | 0
.../{ixwebsocket-11.4.1.ebuild => ixwebsocket-11.4.2.ebuild} | 0
4 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index 28b53dab2..a9658fa9f 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -1,2 +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
+DIST ixwebsocket-11.4.2.tar.gz 631385 BLAKE2B 1f6cff44263548d8bb0be9308ec75aaccef93a4e0ef83d8c647fbc5567b8b9b85f0d91414907905fc4e9ebcfb3eb62fd71241888ffa25fbea1adda93c50f4be2 SHA512 7a7d2207986007ad0f09f98dec4f6e8fa61c73b8189b47f931b43a49779a55e55669e882763f78b2f5ab805b6adcb254f09c16efd8280f0d32db7d7e71dbb426
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.2-remove-network-tests.patch
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch
similarity index 100%
rename from net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch
rename to net-libs/ixwebsocket/files/ixwebsocket-11.4.2-use-system-spdlog.patch
diff --git a/net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild
similarity index 100%
rename from net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild
rename to net-libs/ixwebsocket/ixwebsocket-11.4.2.ebuild
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/
@ 2022-04-24 14:02 Adrian Schollmeyer
0 siblings, 0 replies; 5+ messages in thread
From: Adrian Schollmeyer @ 2022-04-24 14:02 UTC (permalink / raw
To: gentoo-commits
commit: b0b6e91a61a1920dac5a8d8077a59a0013783dfe
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sun Apr 24 14:02:48 2022 +0000
Commit: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
CommitDate: Sun Apr 24 14:02:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b0b6e91a
net-libs/ixwebsocket: add 11.4.1
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de>
net-libs/ixwebsocket/Manifest | 1 +
.../ixwebsocket-11.4.1-remove-network-tests.patch | 28 ++++++++++
.../ixwebsocket-11.4.1-use-system-spdlog.patch | 55 +++++++++++++++++++
net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild | 62 ++++++++++++++++++++++
net-libs/ixwebsocket/metadata.xml | 3 ++
5 files changed, 149 insertions(+)
diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest
index 1bdbe5089..28b53dab2 100644
--- a/net-libs/ixwebsocket/Manifest
+++ b/net-libs/ixwebsocket/Manifest
@@ -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
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch
new file mode 100644
index 000000000..64761c4ce
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-remove-network-tests.patch
@@ -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()
diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-use-system-spdlog.patch
new file mode 100644
index 000000000..8944acaf4
--- /dev/null
+++ b/net-libs/ixwebsocket/files/ixwebsocket-11.4.1-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.1.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild
new file mode 100644
index 000000000..0ec823cd8
--- /dev/null
+++ b/net-libs/ixwebsocket/ixwebsocket-11.4.1.ebuild
@@ -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
+}
diff --git a/net-libs/ixwebsocket/metadata.xml b/net-libs/ixwebsocket/metadata.xml
index 1d44d14fb..9bd43ff3c 100644
--- a/net-libs/ixwebsocket/metadata.xml
+++ b/net-libs/ixwebsocket/metadata.xml
@@ -8,4 +8,7 @@
<use>
<flag name="ws">Build the ws utility</flag>
</use>
+ <slots>
+ <subslots>Correspond to SONAME</subslots>
+ </slots>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-23 14:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-02 12:23 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/ixwebsocket/, net-libs/ixwebsocket/files/ Remigiusz Micielski
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 14:15 Remigiusz Micielski
2023-09-30 14:56 Remigiusz Micielski
2022-04-29 7:20 Adrian Schollmeyer
2022-04-24 14:02 Adrian Schollmeyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox