From nobody Fri Aug 18 21:02:39 2023 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 4RSDpl3QZ2z4r5dx; Fri, 18 Aug 2023 21:02:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSDpl2vMcz4X5j; Fri, 18 Aug 2023 21:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692392559; 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=bo94e8uqmNbPmq51NCvGWtW9A90PLoBKUggmFBT8P80=; b=cp1o3QedpqvF45Ex0z8JsaGYhTggUJtaFv1tXoHoY9PfQ7nrsA5Rgtnt1wkzXuSmeGzpRC r+BBYA+acy/lzSgaZjmWXeC8vO/xM0/zKoCf4H5S5JErBCl62fJFc3zOLzfCCgL+br0Jyg MDESs3YR0RFTVi5xK/+AJ8sfdXb6/yiKYLxjflLLAb6/SCSpdq4NnCOhWW6ZV8jCfP/0ze MoJ4PEsmK+Qt1STEustq07uEDUw5NpLq9l8vagF/rTC8R4pC1oaI+8UrEQ9d3GXV7csZsL eOraxmmXqZ+fwmNARzKctu5Gzv4BJzc6aAX23o01byiu5/RxfeV07Y/puI4MWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692392559; 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=bo94e8uqmNbPmq51NCvGWtW9A90PLoBKUggmFBT8P80=; b=WcR5g+Hbmjg3FsD0cqzhy79TUPI2axAIau0DRyKzLdMSN8TQ1tKRdVkaCV3XZm+HSVnrww PQSweW6vHKMiNaYtzkqdbFjrVl2udv9cAMbb8FvinozVk7srMjgJjPTsgyLBSz3KmXlY6p t/iaCFbRFxL2zemfXAUHU5ayi4DsHg+SLwmImVcE5mvl/ZJapOt2tJN/Kl3DWjbzUb9rhR SYsM3jF29SftOAqam0/eo9I2g2ctAJHjm668r8i6Gb9YeqBKpVqKTdakos2okhBiMZRRng H3SihU9Fs/b9oilccR3I2McPwijRc0cuYUTBPZkYts+P0Czae52foY18NuXAMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692392559; a=rsa-sha256; cv=none; b=H5GctRf+f1G4gQ9HO+fPUB/xOsjCmhCcZGxMklKVNaapZHLEX7BgatbnaOSaVdXG2NP2qR sl9det3sXl9P4GQI+72agxmz74/c/vVq1s1wklHel5XH6soMJDNR871UEEDNfspIMjZV/K BDlKWNQdf1XveVRMOEdu1cmKnJ333f2rZS0K4bz5CQ7QVy/QePjzg9Z6pRVXlx7nvTIN51 hy89T6QLtVTEMoiyhim/iM7rlilpn5vvr8TyVrph/K/ew98nd1ac6RtGCZBOj2iOSGpjiY Jc5IAbVwJlz6lWIIB1CaRAyvKZs6cIc4OAle8o4TqC+2ZFeII9Ro9+BLl++smQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RSDpl1wVQzXDx; Fri, 18 Aug 2023 21:02:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IL2dOv001174; Fri, 18 Aug 2023 21:02:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IL2dCV001171; Fri, 18 Aug 2023 21:02:39 GMT (envelope-from git) Date: Fri, 18 Aug 2023 21:02:39 GMT Message-Id: <202308182102.37IL2dCV001171@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ca9744daf326 - main - www/*chromium: enable PipeWire for screen sharing on Wayland 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca9744daf3266b182a330b3fcbd4d6d5f85a6e22 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca9744daf3266b182a330b3fcbd4d6d5f85a6e22 commit ca9744daf3266b182a330b3fcbd4d6d5f85a6e22 Author: Jan Beich AuthorDate: 2023-01-02 07:06:47 +0000 Commit: Jan Beich CommitDate: 2023-08-18 21:00:52 +0000 www/*chromium: enable PipeWire for screen sharing on Wayland PR: 268726 Approved by: maintainer timeout (7 months) --- www/chromium/Makefile | 13 +++++++++++-- ...c_modules_desktop__capture_linux_wayland_egl__dmabuf.cc | 14 ++++++++++++++ www/iridium/Makefile | 14 +++++++++++--- ...c_modules_desktop__capture_linux_wayland_egl__dmabuf.cc | 14 ++++++++++++++ www/ungoogled-chromium/Makefile | 13 +++++++++++-- ...c_modules_desktop__capture_linux_wayland_egl__dmabuf.cc | 14 ++++++++++++++ 6 files changed, 75 insertions(+), 7 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index c2c4d7e934e3..ceaa14ce2498 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= chromium PORTVERSION= 116.0.5845.96 +PORTREVISION= 1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external @@ -137,8 +138,8 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST -OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO +OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO @@ -192,6 +193,14 @@ LTO_VARS= GN_ARGS+=use_thin_lto=true \ LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 + +PIPEWIRE_DESC= Screen capture via PipeWire +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ + GN_ARGS+=rtc_link_pipewire=true +PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ + GN_ARGS+=rtc_link_pipewire=false + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc new file mode 100644 index 000000000000..7f22e012c98a --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc @@ -0,0 +1,14 @@ +--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2022-12-14 00:41:59 UTC ++++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +@@ -10,11 +10,9 @@ + + #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" + +-#include + #include + #include + #include +-#include + #include + #include + #include diff --git a/www/iridium/Makefile b/www/iridium/Makefile index c6cf786aeddd..afe9cde56158 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,6 @@ PORTNAME= iridium PORTVERSION= 2023.07.115.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -135,8 +135,8 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= iridium-browser.desktop iridium SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO -OPTIONS_DEFAULT= CODECS CUPS KERBEROS SNDIO +OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS LTO PIPEWIRE +OPTIONS_DEFAULT= CODECS CUPS KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO @@ -186,6 +186,14 @@ LTO_VARS= GN_ARGS+=use_thin_lto=true \ LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 + +PIPEWIRE_DESC= Screen capture via PipeWire +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ + GN_ARGS+=rtc_link_pipewire=true +PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ + GN_ARGS+=rtc_link_pipewire=false + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false diff --git a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc new file mode 100644 index 000000000000..7f22e012c98a --- /dev/null +++ b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc @@ -0,0 +1,14 @@ +--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2022-12-14 00:41:59 UTC ++++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +@@ -10,11 +10,9 @@ + + #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" + +-#include + #include + #include + #include +-#include + #include + #include + #include diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 9f9c561cf300..511f244e36ec 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,6 @@ PORTNAME= ungoogled-chromium PORTVERSION= 116.0.5845.96 +PORTREVISION= 1 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ @@ -151,8 +152,8 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= ungoogled-chromium.desktop ungoogled-chromium SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST -OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO +OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO OPTIONS_EXCLUDE_aarch64=LTO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO @@ -206,6 +207,14 @@ LTO_VARS= GN_ARGS+=use_thin_lto=true \ LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 + +PIPEWIRE_DESC= Screen capture via PipeWire +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \ + GN_ARGS+=rtc_link_pipewire=true +PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \ + GN_ARGS+=rtc_link_pipewire=false + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc new file mode 100644 index 000000000000..7f22e012c98a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc @@ -0,0 +1,14 @@ +--- third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig 2022-12-14 00:41:59 UTC ++++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc +@@ -10,11 +10,9 @@ + + #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" + +-#include + #include + #include + #include +-#include + #include + #include + #include