diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-09-27 04:12:34 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-09-27 04:12:34 +0000 |
| commit | d77b258ef898a4dc67703ba0834c31195c37c3ed (patch) | |
| tree | fef4ce571483e001eeac1a5846fee4ec54d65500 /www/firefox/files/patch-bug826985 | |
| parent | www/firefox-esr: update to 52.4.0 (diff) | |
www/firefox: update to 56.0 (rust required)
This is slightly early but due to recent PORTREVISION bump there's no
point doing QA for 55.0.* anymore.
Changes: https://www.mozilla.org/firefox/56.0/releasenotes/
PR: 221335
Security: 1098a15b-b0f6-42b7-b5c7-8a8646e8be07
MFH: 2017Q3 not possible: requires r447450 and r450556
Notes
Notes:
svn path=/head/; revision=450707
Diffstat (limited to 'www/firefox/files/patch-bug826985')
| -rw-r--r-- | www/firefox/files/patch-bug826985 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/firefox/files/patch-bug826985 b/www/firefox/files/patch-bug826985 index 8e23b9382748..8e9e7d24a024 100644 --- a/www/firefox/files/patch-bug826985 +++ b/www/firefox/files/patch-bug826985 @@ -107,10 +107,11 @@ index 12df1b3..e9863ba 100644 #include <new> -@@ -26,6 +31,15 @@ - #include "critical_section_wrapper.h" - #include "video_capture_linux.h" - +@@ -32,6 +35,15 @@ + #include "webrtc/modules/video_capture/linux/video_capture_linux.h" + #include "webrtc/system_wrappers/include/critical_section_wrapper.h" + #include "webrtc/system_wrappers/include/trace.h" ++ +#ifdef HAVE_LIBV4L2 +#define open v4l2_open +#define close v4l2_close @@ -119,10 +120,9 @@ index 12df1b3..e9863ba 100644 +#define mmap v4l2_mmap +#define munmap v4l2_munmap +#endif -+ - namespace webrtc - { - namespace videocapturemodule + + namespace webrtc { + namespace videocapturemodule { diff --git media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi index d46b5aa..e452223 100644 --- media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi |