opencv: one more guard for V4L2_PIX_FMT_Y16

3 files changed, 24 insertions, 16 deletions

diff --git a/graphics/opencv-contrib-face/distinfo b/graphics/opencv-contrib-face/distinfo
index 3260b4079e7..f61acbabe80 100644
--- a/graphics/opencv-contrib-face/distinfo
+++ b/graphics/opencv-contrib-face/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/10/10 07:02:01 adam Exp $
+$NetBSD: distinfo,v 1.24 2021/10/16 07:16:29 adam Exp $
 
 RMD160 (opencv-3.4.16.tar.gz) = c8c3c68a05b01d58505ca84e328996bbe17706b2
 SHA512 (opencv-3.4.16.tar.gz) = 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
@@ -29,4 +29,4 @@ SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670
 SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 847c9cf47c3fb71a2e05281544a03a5ed0d224a5
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo
index 9642aea1b22..d29f2504261 100644
--- a/graphics/opencv/distinfo
+++ b/graphics/opencv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2021/10/10 07:02:01 adam Exp $
+$NetBSD: distinfo,v 1.55 2021/10/16 07:16:29 adam Exp $
 
 RMD160 (opencv-3.4.16.tar.gz) = c8c3c68a05b01d58505ca84e328996bbe17706b2
 SHA512 (opencv-3.4.16.tar.gz) = 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a
@@ -26,4 +26,4 @@ SHA1 (patch-modules_flann_include_opencv2_flann_defines.h) = ab848e67c4e03219670
 SHA1 (patch-modules_imgcodecs_src_grfmt__exr.cpp) = 1a33d1b14e837b973b3ac2465d0b20fd6501e9bf
 SHA1 (patch-modules_imgproc_src_resize.cpp) = e842d5960c4c00162a34f46cb45cf69d0e9f21ce
 SHA1 (patch-modules_ts_src_ts.cpp) = b9a3992014b02dbd89d46375a2476385e91dc24c
-SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = 847c9cf47c3fb71a2e05281544a03a5ed0d224a5
+SHA1 (patch-modules_videoio_src_cap__v4l.cpp) = f80cc2f5b37e04378a2f25b2fa14e9b3206513c3
diff --git a/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp b/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
index dc71eaa1117..d2870e2fa2d 100644
--- a/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
+++ b/graphics/opencv/patches/patch-modules_videoio_src_cap__v4l.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.8 2021/10/06 21:10:24 adam Exp $
+$NetBSD: patch-modules_videoio_src_cap__v4l.cpp,v 1.9 2021/10/16 07:16:29 adam Exp $
 
 Conditionalize settings not available in NetBSD's v4l2 emulation.
 Avoid non-standard integer types.
 
---- modules/videoio/src/cap_v4l.cpp.orig	2021-07-04 21:10:13.000000000 +0000
+--- modules/videoio/src/cap_v4l.cpp.orig	2021-10-08 18:31:56.000000000 +0000
 +++ modules/videoio/src/cap_v4l.cpp
 @@ -215,6 +215,14 @@ make & enjoy!
  #include <fcntl.h>
@@ -51,7 +51,7 @@ Avoid non-standard integer types.
  
  #ifndef V4L2_PIX_FMT_Y10
  #define V4L2_PIX_FMT_Y10 v4l2_fourcc('Y', '1', '0', ' ')
-@@ -555,7 +569,9 @@ bool CvCaptureCAM_V4L::autosetup_capture
+@@ -555,13 +569,17 @@ bool CvCaptureCAM_V4L::autosetup_capture
              V4L2_PIX_FMT_NV12,
              V4L2_PIX_FMT_NV21,
              V4L2_PIX_FMT_SBGGR8,
@@ -61,7 +61,15 @@ Avoid non-standard integer types.
              V4L2_PIX_FMT_SN9C10X,
  #ifdef HAVE_JPEG
              V4L2_PIX_FMT_MJPEG,
-@@ -618,9 +634,13 @@ bool CvCaptureCAM_V4L::convertableToRgb(
+             V4L2_PIX_FMT_JPEG,
+ #endif
++#ifdef V4L2_PIX_FMT_Y16
+             V4L2_PIX_FMT_Y16,
++#endif
+             V4L2_PIX_FMT_Y12,
+             V4L2_PIX_FMT_Y10,
+             V4L2_PIX_FMT_GREY,
+@@ -618,9 +636,13 @@ bool CvCaptureCAM_V4L::convertableToRgb(
      case V4L2_PIX_FMT_UYVY:
      case V4L2_PIX_FMT_SBGGR8:
      case V4L2_PIX_FMT_SN9C10X:
@@ -75,7 +83,7 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_Y10:
      case V4L2_PIX_FMT_GREY:
      case V4L2_PIX_FMT_BGR24:
-@@ -655,7 +675,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame
+@@ -655,7 +677,9 @@ void CvCaptureCAM_V4L::v4l2_create_frame
              channels = 1;
              size.height = size.height * 3 / 2; // "1.5" channels
              break;
@@ -85,7 +93,7 @@ Avoid non-standard integer types.
          case V4L2_PIX_FMT_Y12:
          case V4L2_PIX_FMT_Y10:
              depth = IPL_DEPTH_16U;
-@@ -1532,11 +1554,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1532,11 +1556,13 @@ void CvCaptureCAM_V4L::convertToRgb(cons
                  (unsigned char*)buffers[MAX_V4L_BUFFERS].start,
                  (unsigned char*)frame.imageData);
          return;
@@ -99,7 +107,7 @@ Avoid non-standard integer types.
      default:
          break;
      }
-@@ -1575,6 +1599,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1575,6 +1601,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
      case V4L2_PIX_FMT_RGB24:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC3, currentBuffer.start), destination, COLOR_RGB2BGR);
          return;
@@ -107,7 +115,7 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_Y16:
      {
          cv::Mat temp(imageSize, CV_8UC1, buffers[MAX_V4L_BUFFERS].start);
-@@ -1596,6 +1621,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
+@@ -1596,6 +1623,7 @@ void CvCaptureCAM_V4L::convertToRgb(cons
          cv::cvtColor(temp, destination, COLOR_GRAY2BGR);
          return;
      }
@@ -115,7 +123,7 @@ Avoid non-standard integer types.
      case V4L2_PIX_FMT_GREY:
          cv::cvtColor(cv::Mat(imageSize, CV_8UC1, currentBuffer.start), destination, COLOR_GRAY2BGR);
          break;
-@@ -1708,8 +1734,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1708,8 +1736,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_FOURCC:
          return -1;
@@ -126,7 +134,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_FORMAT:
          return -1;
      case cv::CAP_PROP_MODE:
-@@ -1724,8 +1752,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1724,8 +1754,10 @@ static inline int capPropertyToV4L2(int 
          return V4L2_CID_HUE;
      case cv::CAP_PROP_GAIN:
          return V4L2_CID_GAIN;
@@ -137,7 +145,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_CONVERT_RGB:
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_BLUE_U:
-@@ -1736,8 +1766,10 @@ static inline int capPropertyToV4L2(int 
+@@ -1736,8 +1768,10 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_SHARPNESS:
          return V4L2_CID_SHARPNESS;
@@ -148,7 +156,7 @@ Avoid non-standard integer types.
      case cv::CAP_PROP_GAMMA:
          return V4L2_CID_GAMMA;
      case cv::CAP_PROP_TEMPERATURE:
-@@ -1748,34 +1780,54 @@ static inline int capPropertyToV4L2(int 
+@@ -1748,34 +1782,54 @@ static inline int capPropertyToV4L2(int 
          return -1;
      case cv::CAP_PROP_WHITE_BALANCE_RED_V:
          return V4L2_CID_RED_BALANCE;