git: cc9777201fd1 - main - www/*chromium: properly ifdef includes in the previous pipewire commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Aug 2023 11:42:38 UTC
The branch main has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cc9777201fd19fb92c48a63358c0950192bb64dc
commit cc9777201fd19fb92c48a63358c0950192bb64dc
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2023-08-23 11:41:43 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
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 <asm/ioctl.h>
++#if !defined(WEBRTC_BSD)
+ #include <asm/ioctl.h>
++#endif
#include <dlfcn.h>
#include <fcntl.h>
#include <libdrm/drm_fourcc.h>
--#include <linux/types.h>
++#if !defined(WEBRTC_BSD)
+ #include <linux/types.h>
++#endif
#include <spa/param/video/format-utils.h>
#include <unistd.h>
#include <xf86drm.h>
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 <asm/ioctl.h>
++#if !defined(WEBRTC_BSD)
+ #include <asm/ioctl.h>
++#endif
#include <dlfcn.h>
#include <fcntl.h>
#include <libdrm/drm_fourcc.h>
--#include <linux/types.h>
++#if !defined(WEBRTC_BSD)
+ #include <linux/types.h>
++#endif
#include <spa/param/video/format-utils.h>
#include <unistd.h>
#include <xf86drm.h>