summaryrefslogtreecommitdiff
path: root/www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__li...
diff options
context:
space:
mode:
authorryoon <ryoon>2017-04-27 01:55:57 +0000
committerryoon <ryoon>2017-04-27 01:55:57 +0000
commit4f468686d03a503403fca0cf856bba43d5172843 (patch)
treed6f9c74e3f15c5bd95d4093365f031125f0e0ff2 /www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
parent8fd3079c81cef1954603d4117c2abd377820c7ee (diff)
downloadpkgsrc-4f468686d03a503403fca0cf856bba43d5172843.tar.gz
Import firefox52-52.1.0 as www/firefox52.
Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is fast and easy to use, and offers many advantages over other web browsers, such as tabbed browsing and the ability to block pop-up windows. Firefox also offers excellent bookmark and history management, and it can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available.
Diffstat (limited to 'www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc')
-rw-r--r--www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc42
1 files changed, 42 insertions, 0 deletions
diff --git a/www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
new file mode 100644
index 00000000000..5aad4f564ed
--- /dev/null
+++ b/www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
@@ -0,0 +1,42 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2017/04/27 01:55:57 ryoon Exp $
+
+--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2017-01-23 16:13:55.000000000 +0000
++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+@@ -25,6 +25,9 @@
+ #else
+ #include <linux/videodev2.h>
+ #endif
++#ifdef HAVE_LIBV4L2
++#include <libv4l2.h>
++#endif
+
+ #include "webrtc/system_wrappers/interface/ref_count.h"
+ #include "webrtc/system_wrappers/interface/trace.h"
+@@ -34,6 +37,15 @@
+ #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
+ #endif
+
++#ifdef HAVE_LIBV4L2
++#define open v4l2_open
++#define close v4l2_close
++#define dup v4l2_dup
++#define ioctl v4l2_ioctl
++#define mmap v4l2_mmap
++#define munmap v4l2_munmap
++#endif
++
+ namespace webrtc
+ {
+ namespace videocapturemodule
+@@ -274,6 +286,11 @@ int32_t DeviceInfoLinux::GetDeviceName(
+ memset(deviceNameUTF8, 0, deviceNameLength);
+ memcpy(cameraName, cap.card, sizeof(cap.card));
+
++ if (cameraName[0] == '\0')
++ {
++ sprintf(cameraName, "Camera at /dev/video%d", deviceNumber);
++ }
++
+ if (deviceNameLength >= strlen(cameraName))
+ {
+ memcpy(deviceNameUTF8, cameraName, strlen(cameraName));