diff options
Diffstat (limited to 'www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc')
-rw-r--r-- | www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc index 43a48afecee..3b3ed1dad3a 100644 --- a/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ b/www/seamonkey/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc @@ -1,33 +1,18 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.1 2013/05/23 13:25:30 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.2 2013/09/28 14:37:05 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2013-05-03 03:08:07.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2013-09-16 18:26:51.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc -@@ -12,12 +12,23 @@ - #include <unistd.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <linux/videodev2.h> - #include <errno.h> - #include <stdio.h> - #include <sys/mman.h> - #include <string.h> - -+//v4l includes -+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -+#include <sys/videoio.h> -+#elif defined(__sun) -+#include <sys/videodev2.h> -+#else -+#include <linux/videodev2.h> -+#endif +@@ -25,6 +25,9 @@ + #else + #include <linux/videodev2.h> + #endif +#ifdef HAVE_LIBV4L2 +#include <libv4l2.h> +#endif -+ + #include <new> - #include "ref_count.h" -@@ -26,6 +37,15 @@ +@@ -34,6 +37,15 @@ #include "critical_section_wrapper.h" #include "video_capture_linux.h" |