From nobody Wed Aug 23 11:42:38 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 4RW48G4hHcz4rTkN; Wed, 23 Aug 2023 11:42:38 +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 4RW48G4C2rz3Pjx; Wed, 23 Aug 2023 11:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692790958; 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=R7Z39qU0b4mI+0J3+iJlnifqlUSI0xoJTnnM/9s43K8=; b=xOQH5D7oPwgK/XAYTv1c2uvHJ/Xj/opKVoVFQ6tfaSnuY0Su2qhTwQVL1AvQbn4UIy23i0 NTXPLqiiEwNWAKVgs1dapgLGTMDO/TyYDipEzRQa0JIKYCFt+RFfh8AOebpRUy+jidFiiK p2KrNscOQCol4gL3qhL+gFGNO5cDQKDW/V4Z76wHCkhtJkvu1IYIEOnm197oZX+O6KuhKS lJK6FgIJNLBzqxzI5NLDonBy6JOngPMmrxxSeKXz/8t0MgSTEtmCg8GtUwxLc4WofMcQnr yFHlrHTQpmYLNvPiEKRTZHQyT39lxjnKCVhlqYO9DbFUqE4UtD2rejfge9t+lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692790958; 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=R7Z39qU0b4mI+0J3+iJlnifqlUSI0xoJTnnM/9s43K8=; b=w/lUxySirLU+oqg/2n1RM6JTqyccUsgYA43qYBzkZth4lCn3OHhsYvLohxyxGY2VTyEgDG RDbiEubt2jfGdHjIIyeFR9SiF15MZ4mRvpcTOgEGNDVUpn0q60m2UrO0ZqgQrJPTIzS3aO oX6lBW9UXhWCTJObaA2XLiqwHZGjxTcMIUqRxLZv0HaNzk00OmI5AtksdwL5XuN2pGDipv yBnl/XPRe1JM0FrRtoJNw+lXZKegbHBdc1xeQLqA4W2w9D+tQxxz+03r5N7pGVA2I6hBGU hMHkA9ORxgcCjLZqcJcePFLE7V72uVOkM1WPmhD+KAPzupKo9hi7vrOjC8DFjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692790958; a=rsa-sha256; cv=none; b=rGgrCnsF5t8cDZALSaC1a5R9YjWdW03VdOcd75xqEj9mnGxzi3pvOIKOOFLiuIOYvpZc48 Sx2kYVbiKn6HPqXEAfikyWvhig4mIBnAUNEAvMrnl2dVKX+7SkTPDjgGnORHEwNgC55nsR dtA1WWu79WH8l7yhOJMxmQWqLJ4tM6ZttxNCoEYkYGwB9XaoGx0erVcG/Ny4PzI70Z/bxo Z+ZOSrYS+uF654qcBCKp7rHgz32It0m6OlpGsnroFXWbpZTU59uz0h0DxCsoqI8BWIeN6/ SdBGxMswJP5TghdcdTVLwyKueODzWy4x8LLq/MrQynsHx5MC+7v9QjOtgWhweg== 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 4RW48G2ywHzk62; Wed, 23 Aug 2023 11:42:38 +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 37NBgcbG042485; Wed, 23 Aug 2023 11:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NBgcXW042482; Wed, 23 Aug 2023 11:42:38 GMT (envelope-from git) Date: Wed, 23 Aug 2023 11:42:38 GMT Message-Id: <202308231142.37NBgcXW042482@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: cc9777201fd1 - main - www/*chromium: properly ifdef includes in the previous pipewire commit 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: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc9777201fd19fb92c48a63358c0950192bb64dc Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc9777201fd19fb92c48a63358c0950192bb64dc commit cc9777201fd19fb92c48a63358c0950192bb64dc Author: Robert Nagy AuthorDate: 2023-08-23 11:41:43 +0000 Commit: Robert Nagy CommitDate: 2023-08-23 11:42:33 +0000 www/*chromium: properly ifdef includes in the previous pipewire commit --- ...rtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc | 12 ++++++++---- ...rtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) 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 index 7f22e012c98a..3606a669f405 100644 --- 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 @@ -1,14 +1,18 @@ ---- 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.orig 2023-08-23 11:41:11 UTC +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc -@@ -10,11 +10,9 @@ +@@ -10,11 +10,15 @@ #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" --#include ++#if !defined(WEBRTC_BSD) + #include ++#endif #include #include #include --#include ++#if !defined(WEBRTC_BSD) + #include ++#endif #include #include #include 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 index 7f22e012c98a..3606a669f405 100644 --- 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 @@ -1,14 +1,18 @@ ---- 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.orig 2023-08-23 11:41:11 UTC +++ third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc -@@ -10,11 +10,9 @@ +@@ -10,11 +10,15 @@ #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h" --#include ++#if !defined(WEBRTC_BSD) + #include ++#endif #include #include #include --#include ++#if !defined(WEBRTC_BSD) + #include ++#endif #include #include #include