diff options
| author | Jan-Espen Oversand <sigsegv@radiotube.org> | 2025-07-03 08:57:17 +0200 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2025-07-03 09:00:26 +0200 |
| commit | c3fe791f1a841cbe6c101bef256740e2e7d30218 (patch) | |
| tree | 4b064f092e452ea01072b11f6cb25b8f68fc1768 | |
| parent | chinese/ibus-table-chinese: Update to 1.8.13 (diff) | |
devel/websocketpp: fix asio namespaces unbreaking users
and unbreak multimedia/obs-studio.
This works by using standalone asio's namespace
instead of boost::asio's everywhere. (Boost includes asio,
and websocketpp can work with Boost and the standalone Asio,
pulling it into its own namespace wrapper.)
Tested by: tagattie@, mandree@
PR: 287916
| -rw-r--r-- | devel/websocketpp/Makefile | 2 | ||||
| -rw-r--r-- | devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp | 8 | ||||
| -rw-r--r-- | multimedia/obs-studio/Makefile | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/devel/websocketpp/Makefile b/devel/websocketpp/Makefile index 12cd87d532f7..70784d13e2a8 100644 --- a/devel/websocketpp/Makefile +++ b/devel/websocketpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= websocketpp PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= sigsegv@radiotube.org diff --git a/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp b/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp index 30872545d7b5..0c37aa055508 100644 --- a/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp +++ b/devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp @@ -58,10 +58,10 @@ lib::error_code interrupt(interrupt_handler handler) { if (config::enable_multithreading) { - m_io_service->post(m_strand->wrap(handler)); -+ boost::asio::post(*m_io_service, m_strand->wrap(handler)); ++ lib::asio::post(*m_io_service, m_strand->wrap(handler)); } else { - m_io_service->post(handler); -+ boost::asio::post(*m_io_service, handler); ++ lib::asio::post(*m_io_service, handler); } return lib::error_code(); } @@ -69,10 +69,10 @@ lib::error_code dispatch(dispatch_handler handler) { if (config::enable_multithreading) { - m_io_service->post(m_strand->wrap(handler)); -+ boost::asio::post(*m_io_service, m_strand->wrap(handler)); ++ lib::asio::post(*m_io_service, m_strand->wrap(handler)); } else { - m_io_service->post(handler); -+ boost::asio::post(*m_io_service, handler); ++ lib::asio::post(*m_io_service, handler); } return lib::error_code(); } diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 0f4330e6004e..76af6a21a134 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -14,7 +14,6 @@ WWW= https://obsproject.com/ \ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails due to incompability of devel/boost-libs>=1.87 and devel/websocketpp<=0.82_2, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=287916 BROKEN_armv7= compilation fails: format specifies type 'unsigned long' but the argument has type 'size_t' (aka 'unsigned int') [-Werror,-Wformat] (32-builds aren't supported, see issue 10481) BROKEN_i386= link fails: relocation R_386_PC32 cannot be used against symbol 'strlist_split'; recompile with -fPIC, see https://github.com/obsproject/obs-studio/issues/10481 |