From nobody Thu Jul 03 07:01:28 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bXnk10Lbmz61dsX; Thu, 03 Jul 2025 07:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXnk06jWCz461N; Thu, 03 Jul 2025 07:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751526088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcrxzWoCbtoJDDLzIt9LwGNcXTzKJVeBwlvnayFlyIo=; b=Gok4dO63rkvDdis/LjdcDi+6RzR/RCcZM3BHOKAG5rdVYnxkQEMHOPVnSvCytpKem6xG6G 95WlP5dewYaqJB7p3oVWaJw/wad3legonO3XbP1sTxx1ovwgCopUYLbibVldbR6+RP3gH1 p2wo8PvsMDNYD506jmIV4HTBBlF7M0yxmI2R+7R25UjUwv5SFrqVHbSt5qCJlBNdaVvHd7 BVTOBEeJoDKvGXfftWdDdNLsB3fC3+Lpi91eVEa+IdIUmIl3JU8wLanJDbGGQSo2wDqbUH xC0qB+SViCfVVnNBTWd6s6hDTIkj+7hdtIV59gnoFsUFsnWAdmws9ejphLUf6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751526088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xcrxzWoCbtoJDDLzIt9LwGNcXTzKJVeBwlvnayFlyIo=; b=q5AMVVHgT8gjrK42a0i8TMUAdcCDQTPOYVO2QRjLVyeqRmZ8ATsZruH2+D+HZYvPAuCff4 j6ku9cC/JzA972NykH8n11izmcsnJyHR44AS/sFGJ+bka6+cCuTBtPqKlFZ73YJ6fC8+LK FpaFTyAhdlAZZRvHtXmRQjlYsqtccr7ltalAA8RqZsQPvz4wIDmLNTAuRdl8gMaQfMO/fD esNBgo4SkgZhB8ITs2/p0KXUyKOc4lE+enOMNTEiaaQquz0OdrN3dES/MJPkcoENJ4UFI2 CySD/3s1jCXhn/j2P4kSAXhkQpS4cO0+JxeOmndEeCXTleyU3flqqeB3xtVAPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751526088; a=rsa-sha256; cv=none; b=cX64rYVlskMSmshF9b8EkvzDkM9XAyiMT34ssODobRombGlDET2WuO2YV0L//1itsTCC+c SVihdEAJchVBgPOoyz6MqUPSRzUZaR9cKKVOJOgfqSLbAP16d6BTRLazvhNreNy3wwQBsC HNWkgzwrDGyx3KT5kd+XaL096d6M1V5s9fWuvfxDu34kfvX/9maT12Yl0KHfSbb3QV7cDO Z0Sb8r44/RaYqup9hAK6725I3fe+rh1N/o2m+Pitvnd2Bi9b6zuVdgCHKr32RUagLq67IG shzNwjHLwLEXHzRfwCjgayfQQlEWqLiGpZkBy3TgsYIYjqlrXY9bVpEb6HEQNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bXnk06FL9zv6R; Thu, 03 Jul 2025 07:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56371Sdm087291; Thu, 3 Jul 2025 07:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56371SbA087288; Thu, 3 Jul 2025 07:01:28 GMT (envelope-from git) Date: Thu, 3 Jul 2025 07:01:28 GMT Message-Id: <202507030701.56371SbA087288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 9493931667c8 - 2025Q3 - devel/websocketpp: fix asio namespaces unbreaking users List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q3 X-Git-Reftype: branch X-Git-Commit: 9493931667c81b02210b228a2ce65982fdc5f9fd Auto-Submitted: auto-generated The branch 2025Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9493931667c81b02210b228a2ce65982fdc5f9fd commit 9493931667c81b02210b228a2ce65982fdc5f9fd Author: Jan-Espen Oversand AuthorDate: 2025-07-03 06:57:17 +0000 Commit: Matthias Andree 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