From nobody Mon Mar 24 05:54:34 2025 X-Original-To: dev-commits-ports-main@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 4ZLj1R09Ndz5rR9B; Mon, 24 Mar 2025 05:54:35 +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 4ZLj1Q6K76z3YYZ; Mon, 24 Mar 2025 05:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742795674; 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=q7k1EDfwlgMUBX+UkUFDUUKSIjtSGyQ9VjFgeaS8ZWo=; b=R3P7f7RNxXh7yGce+vy9ZpGeQNvC7Dh7cuGfAq2IVk/RsZLSkrEBH2d3JCXdhLE0D/Zw8a 140BzwfY1t62xgWihyvo6lyDwaik6ri0qNXrtkTtHxekcpTz5hLawRnq1QnHoKwL3U8Hpg K9pGH8KOrRFy/fRUIbevAWIJvUtBzrsOt5XCCTJ6WkhI8sPr+MPwGwwA/ikql3VOa6pDkl xMxoLOmQ+xl1Zl/IRR8dSHPMcGTshvxAR1MddQ8Ea07XYlDbFjCJWMeWvELmjD6S478ao4 gWGcDDbpVxVXZ9oAULAKsP+m1OnwvB8xMoh3gJFiv9teTLvEi4p6hrr5zuEZVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742795674; a=rsa-sha256; cv=none; b=uP9gKDbEz/Tm7v6wuHZA22OIr+1olZSJ/MLpFeNsy6CVKI8/cduQcyMvfn1nYisxuH4f2H YzU+wGARIIoo8IQFHeXs98hAsoJsW2A44KjbhGBL0QjSPwjmWz1lzo9moOqDmW7K0Iipf1 /FJgsKqqTGvxDFpTTJ2Z2q5fm7VpWjKSOlpcfzKx2wn3K44kK1ttJH/OZTHvs3rKZIk/zw 7pihxjMl43GwkDhmfstYE8J7B5PxOV169u4W5BfqKc+Yl9f4++8iIvRakrdSFolE3gZ1Tg Qi7QRTfzv537R6y9hmNZc+xANA4JOJLqe16S2g2yquAsvm75g+3R8d/48Q3+ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742795674; 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=q7k1EDfwlgMUBX+UkUFDUUKSIjtSGyQ9VjFgeaS8ZWo=; b=Z5U2m3NBHSB1yhbOGYuQUU2qHO9dN7r9wpoE4o94QVBnva0ttKeTWhUKUsPwN8yUnSX+QS 6QGiPsWD+ld8rAfQDQA/4si42FZt2XhKYo72GnaNvJDTUFZlBS9ShtINbVU5IRyphzYksm q1Mb1fKkLdiekHQOqLZw1pjlTBElDvW+ntz7v2CqiiIe1r8kWdyspkviMf8BlgrZelJkql buHo9WOrAcDGiNFo+r6SdMWhICL8Bu24fat1rPOr153Ac3Z7+mXzJF85TEdPns65tJ4vuv tMhGCIoIaK4BMAG0i39B4Sa8Yjr77UvWXaUSPNIa5jRWiR1CxmQbZgbumEwfOg== 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 4ZLj1Q5lcJzj38; Mon, 24 Mar 2025 05:54:34 +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 52O5sY9M063432; Mon, 24 Mar 2025 05:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52O5sYl6063429; Mon, 24 Mar 2025 05:54:34 GMT (envelope-from git) Date: Mon, 24 Mar 2025 05:54:34 GMT Message-Id: <202503240554.52O5sYl6063429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: bcb9de9ec69b - main - www/{*chromium,iridium}: fix build with pipewire 1.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcb9de9ec69bb3bba4284a0afbe28ab96ecea5a6 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcb9de9ec69bb3bba4284a0afbe28ab96ecea5a6 commit bcb9de9ec69bb3bba4284a0afbe28ab96ecea5a6 Author: Robert Nagy AuthorDate: 2025-03-24 05:53:17 +0000 Commit: Robert Nagy CommitDate: 2025-03-24 05:54:27 +0000 www/{*chromium,iridium}: fix build with pipewire 1.4 Obtained from: https://webrtc-review.googlesource.com/c/src/+/380500 --- www/chromium/Makefile | 1 + ...modules_video__capture_linux_pipewire__session.cc | 20 ++++++++++++++++++++ www/iridium/Makefile | 1 + ...modules_video__capture_linux_pipewire__session.cc | 20 ++++++++++++++++++++ www/ungoogled-chromium/Makefile | 1 + ...modules_video__capture_linux_pipewire__session.cc | 20 ++++++++++++++++++++ 6 files changed, 63 insertions(+) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 38571c2bc878..e9dced151f60 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= chromium PORTVERSION= 134.0.6998.165 +PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc new file mode 100644 index 000000000000..33afacfc84c5 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc @@ -0,0 +1,20 @@ +--- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig 2025-03-24 05:49:20 UTC ++++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + } diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 8b7afc25091a..5e5f39030dd3 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,5 +1,6 @@ PORTNAME= iridium PORTVERSION= 2025.03.134.2 +PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc new file mode 100644 index 000000000000..33afacfc84c5 --- /dev/null +++ b/www/iridium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc @@ -0,0 +1,20 @@ +--- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig 2025-03-24 05:49:20 UTC ++++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + } diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 4889aa94a341..d0ad30d10d4e 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= ungoogled-chromium PORTVERSION= 134.0.6998.165 +PORTREVISION= 1 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc new file mode 100644 index 000000000000..33afacfc84c5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_video__capture_linux_pipewire__session.cc @@ -0,0 +1,20 @@ +--- third_party/webrtc/modules/video_capture/linux/pipewire_session.cc.orig 2025-03-24 05:49:20 UTC ++++ third_party/webrtc/modules/video_capture/linux/pipewire_session.cc +@@ -87,7 +87,7 @@ PipeWireNode::PipeWireNode(PipeWireSession* session, + .param = OnNodeParam, + }; + +- pw_node_add_listener(proxy_, &node_listener_, &node_events, this); ++ pw_node_add_listener(reinterpret_cast(proxy_), &node_listener_, &node_events, this); + } + + // static +@@ -119,7 +119,7 @@ void PipeWireNode::OnNodeInfo(void* data, const pw_nod + uint32_t id = info->params[i].id; + if (id == SPA_PARAM_EnumFormat && + info->params[i].flags & SPA_PARAM_INFO_READ) { +- pw_node_enum_params(that->proxy_, 0, id, 0, UINT32_MAX, nullptr); ++ pw_node_enum_params(reinterpret_cast(that->proxy_), 0, id, 0, UINT32_MAX, nullptr); + break; + } + }