From 3a28080660e54a820fd7eedfae8ec768945d223c Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Wed, 21 Apr 2021 17:49:00 +0200 Subject: multimedia/libv4l: Add upstream patch to make the v4l2-ctl utility more useful. Submitted by: Trenton Schulz Approved by: pi (implicit) --- multimedia/libv4l/Makefile | 1 + .../libv4l/files/patch-utils_common_media-info.cpp | 46 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 multimedia/libv4l/files/patch-utils_common_media-info.cpp diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index f89b670b9516..e24c4033c92c 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -3,6 +3,7 @@ PORTNAME?= libv4l PORTVERSION= 1.20.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v4l-utils- CATEGORIES= multimedia diff --git a/multimedia/libv4l/files/patch-utils_common_media-info.cpp b/multimedia/libv4l/files/patch-utils_common_media-info.cpp new file mode 100644 index 000000000000..f4c3dc6a306d --- /dev/null +++ b/multimedia/libv4l/files/patch-utils_common_media-info.cpp @@ -0,0 +1,46 @@ +--- utils/common/media-info.cpp.orig 2020-05-21 11:22:05 UTC ++++ utils/common/media-info.cpp +@@ -24,6 +24,10 @@ + #include + #include + #include ++#ifndef __linux__ ++#include ++#include ++#endif + + static std::string num2s(unsigned num, bool is_hex = true) + { +@@ -61,7 +65,7 @@ media_type mi_media_detect_type(const char *device) + + if (stat(device, &sb) == -1) + return MEDIA_TYPE_CANT_STAT; +- ++#ifdef __linux__ + std::string uevent_path("/sys/dev/char/"); + + uevent_path += num2s(major(sb.st_rdev), false) + ":" + +@@ -97,6 +101,23 @@ media_type mi_media_detect_type(const char *device) + } + + uevent_file.close(); ++#else // Not Linux ++ int fd = open(device, O_RDONLY); ++ if (fd >= 0) { ++ struct v4l2_capability caps; ++ int error = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ close(fd); ++ if (error == 0) { ++ if (caps.device_caps & V4L2_CAP_VIDEO_CAPTURE) { ++ return MEDIA_TYPE_VIDEO; ++ } else if (caps.device_caps & V4L2_CAP_VBI_CAPTURE) { ++ return MEDIA_TYPE_VBI; ++ } else if (caps.device_caps & V4L2_CAP_RADIO) { ++ return MEDIA_TYPE_RADIO; ++ } ++ } ++ } ++#endif + return MEDIA_TYPE_UNKNOWN; + } + -- cgit v1.2.3