git: 9493931667c8 - 2025Q3 - devel/websocketpp: fix asio namespaces unbreaking users

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Thu, 03 Jul 2025 07:01:28 UTC
The branch 2025Q3 has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9493931667c81b02210b228a2ce65982fdc5f9fd

commit 9493931667c81b02210b228a2ce65982fdc5f9fd
Author:     Jan-Espen Oversand <sigsegv@radiotube.org>
AuthorDate: 2025-07-03 06:57:17 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-07-03 07:01:22 +0000

    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
    (cherry picked from commit c3fe791f1a841cbe6c101bef256740e2e7d30218)
---
 devel/websocketpp/Makefile                                        | 2 +-
 .../files/patch-websocketpp_transport_asio_connection.hpp         | 8 ++++----
 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