Attachment 203840 Details for Bug 237423 – port video capture device patches from chromium

[patch] port video capture device patches from chromium

qtwebengine_fix_video_capture_device.patch (text/plain), 3.75 KB, created by Christoph Moench-Tegeder on 2019-04-20 22:07:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2019-04-20 22:07:52 UTC

Size: 3.75 KB

patch

obsolete

>diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
>index 2292e6c9b373..1e78252ee66f 100644
>--- a/www/qt5-webengine/Makefile
>+++ b/www/qt5-webengine/Makefile
>@@ -20,6 +20,7 @@
> 
> PORTNAME=	webengine
> DISTVERSION=	${QT5_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	www
> PKGNAMEPREFIX=	qt5-
> 
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc
>new file mode 100644
>index 000000000000..667722536567
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_create__video__capture__device__factory.cc
>@@ -0,0 +1,20 @@
>+--- src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc.orig	2019-03-07 09:23:57 UTC
>++++ src/3rdparty/chromium/media/capture/video/create_video_capture_device_factory.cc
>+@@ -10,7 +10,7 @@
>+ #include "media/capture/video/fake_video_capture_device_factory.h"
>+ #include "media/capture/video/file_video_capture_device_factory.h"
>+ 
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+ #include "media/capture/video/linux/video_capture_device_factory_linux.h"
>+ #elif defined(OS_CHROMEOS)
>+ #include "media/capture/video/chromeos/public/cros_features.h"
>+@@ -31,7 +31,7 @@ namespace {
>+ std::unique_ptr<VideoCaptureDeviceFactory>
>+ CreatePlatformSpecificVideoCaptureDeviceFactory(
>+     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
>+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
>++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
>+   return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner);
>+ #elif defined(OS_CHROMEOS)
>+   // On Chrome OS we have to support two use cases:
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc
>new file mode 100644
>index 000000000000..a17f0b87ce6a
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc.orig	2019-03-07 09:23:57 UTC
>++++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc
>+@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
>+   return true;
>+ }
>+ 
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+ bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
>+     mojo::ScopedHandle fd_handle,
>+     uint32_t memory_size_in_bytes) {
>diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h
>new file mode 100644
>index 000000000000..7ccc971368ef
>--- /dev/null
>+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h
>@@ -0,0 +1,11 @@
>+--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h.orig	2019-03-07 09:23:57 UTC
>++++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h
>+@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
>+ 
>+ // This requires platforms where base::SharedMemoryHandle is backed by a
>+ // file descriptor.
>+-#if defined(OS_LINUX)
>++#if defined(OS_LINUX) || defined(OS_BSD)
>+   bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
>+                                            uint32_t memory_size_in_bytes);
>+ #endif  // defined(OS_LINUX)

Actions: View | Diff

Attachments on bug 237423: 203840