Skip to content

Commit c3fe791

Browse files
leakingmemorymandree
authored andcommitted
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
1 parent 0c72e5b commit c3fe791

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

devel/websocketpp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= websocketpp
22
PORTVERSION= 0.8.2
3-
PORTREVISION= 2
3+
PORTREVISION= 3
44
CATEGORIES= devel
55

66
MAINTAINER= sigsegv@radiotube.org

devel/websocketpp/files/patch-websocketpp_transport_asio_connection.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@
5858
lib::error_code interrupt(interrupt_handler handler) {
5959
if (config::enable_multithreading) {
6060
- m_io_service->post(m_strand->wrap(handler));
61-
+ boost::asio::post(*m_io_service, m_strand->wrap(handler));
61+
+ lib::asio::post(*m_io_service, m_strand->wrap(handler));
6262
} else {
6363
- m_io_service->post(handler);
64-
+ boost::asio::post(*m_io_service, handler);
64+
+ lib::asio::post(*m_io_service, handler);
6565
}
6666
return lib::error_code();
6767
}
6868

6969
lib::error_code dispatch(dispatch_handler handler) {
7070
if (config::enable_multithreading) {
7171
- m_io_service->post(m_strand->wrap(handler));
72-
+ boost::asio::post(*m_io_service, m_strand->wrap(handler));
72+
+ lib::asio::post(*m_io_service, m_strand->wrap(handler));
7373
} else {
7474
- m_io_service->post(handler);
75-
+ boost::asio::post(*m_io_service, handler);
75+
+ lib::asio::post(*m_io_service, handler);
7676
}
7777
return lib::error_code();
7878
}

multimedia/obs-studio/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ WWW= https://obsproject.com/ \
1414
LICENSE= GPLv2+
1515
LICENSE_FILE= ${WRKSRC}/COPYING
1616

17-
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
1817
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)
1918
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
2019

0 commit comments

Comments
 (0)