summaryrefslogtreecommitdiff
path: root/multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2020-12-02 21:07:42 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2020-12-02 21:07:42 +0000
commite67df875ae7140b40585d85789757ec992f21b30 (patch)
tree4c7ed5d7370265d1843b670b39c9e1540f4e497f /multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp
parentdevel/urjtag: Add the NOASYNC option to possibly work around bugs like bug#25... (diff)
Update v4l_compat, libv4l and v4l-utils to 1.20.0
- Regenerate patches. - Fetch all sources from GitHub. - Update package descriptions, WWW links. Approved by: pi (implicit)
Notes
Notes: svn path=/head/; revision=556854
Diffstat (limited to 'multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp')
-rw-r--r--multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp b/multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp
index 4e10a8c8fdaa..ad6afcb85243 100644
--- a/multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp
+++ b/multimedia/libv4l/files/patch-utils_v4l2-ctl_v4l2-ctl-overlay.cpp
@@ -1,21 +1,21 @@
---- utils/v4l2-ctl/v4l2-ctl-overlay.cpp.orig 2020-04-09 16:29:54 UTC
+--- utils/v4l2-ctl/v4l2-ctl-overlay.cpp.orig 2020-05-21 11:22:05 UTC
+++ utils/v4l2-ctl/v4l2-ctl-overlay.cpp
-@@ -14,11 +14,12 @@
+@@ -14,11 +14,13 @@
#include <dirent.h>
#include <math.h>
-+#include "v4l2-ctl.h"
-+
-+#ifndef __FreeBSD__
- #include <linux/fb.h>
+-#include <linux/fb.h>
#include <vector>
--#include "v4l2-ctl.h"
--
+ #include "v4l2-ctl.h"
+
++#ifndef __FreeBSD__
++#include <linux/fb.h>
++
static unsigned int set_fbuf;
static unsigned int set_overlay_fmt;
static struct v4l2_format overlay_fmt; /* set_format/get_format video overlay */
-@@ -546,3 +547,24 @@ void overlay_list(cv4l_fd &fd)
+@@ -546,3 +548,24 @@ void overlay_list(cv4l_fd &fd)
if (options[OptFindFb])
find_fb(fd.g_fd());
}