From 37ecec030264ebe6625c14a8fa9edf0d7dfd937d Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Sat, 22 May 2021 14:57:35 +0200 Subject: [PATCH] multimedia/libv4l: Update webcamd and Linux source tree dependencies. Approved by: pi (implicit) --- multimedia/libv4l/Makefile | 8 +++---- multimedia/libv4l/distinfo | 10 ++++---- .../files/patch-utils_common_fwht-ctrls.h | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index 7c0a122b415e..d838a52f8dd7 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -3,7 +3,7 @@ PORTNAME?= libv4l PORTVERSION= 1.20.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v4l-utils- CATEGORIES= multimedia @@ -19,10 +19,10 @@ USE_GITHUB= yes GH_ACCOUNT= hselasky GH_PROJECT= v4l-utils -GH_TUPLE= hselasky:webcamd:v5.10.6.0:webcamd \ - torvalds:linux:v5.10-rc6:linux +GH_TUPLE= hselasky:webcamd:v5.13.2.2:webcamd \ + torvalds:linux:v5.13-rc2:linux -WEBCAMDDIR= ${WRKDIR}/webcamd-5.10.6.0 +WEBCAMDDIR= ${WRKDIR}/webcamd-5.13.2.2 LINUXDIR= ${WRKDIR}/linux-* .if ${PORTNAME} == v4l-utils || ${PORTNAME} == libv4l diff --git a/multimedia/libv4l/distinfo b/multimedia/libv4l/distinfo index dc24e83fe587..823b0339e0ae 100644 --- a/multimedia/libv4l/distinfo +++ b/multimedia/libv4l/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1606936269 +TIMESTAMP = 1621686769 SHA256 (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1a2bcc1fa5182f718c982c6ee58d0756dca602639ab6b9a9caff021272b33646 SIZE (hselasky-v4l-utils-v4l-utils-1.20.0_GH0.tar.gz) = 1620489 -SHA256 (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = e6c2627130c369fa6cb0a2b30850ccd44735f755127677be457bc5a783b7b3e2 -SIZE (hselasky-webcamd-v5.10.6.0_GH0.tar.gz) = 267471 -SHA256 (torvalds-linux-v5.10-rc6_GH0.tar.gz) = d139d4cc8eb8b27364adc774c0df0feac39389beb4357a36d628a48c92fed393 -SIZE (torvalds-linux-v5.10-rc6_GH0.tar.gz) = 185316277 +SHA256 (hselasky-webcamd-v5.13.2.2_GH0.tar.gz) = a9164a5731be35c5f79aecf8ccbd0e11d3ea7e1a29f81b356def5b08954bacb1 +SIZE (hselasky-webcamd-v5.13.2.2_GH0.tar.gz) = 272186 +SHA256 (torvalds-linux-v5.13-rc2_GH0.tar.gz) = 34673cea88f7e5399b704bcacc088b3f14f5800dadf04af6a90b19c35ad3777f +SIZE (torvalds-linux-v5.13-rc2_GH0.tar.gz) = 192612873 diff --git a/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h b/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h new file mode 100644 index 000000000000..d1518d1f70a4 --- /dev/null +++ b/multimedia/libv4l/files/patch-utils_common_fwht-ctrls.h @@ -0,0 +1,24 @@ +--- utils/common/fwht-ctrls.h.orig 2021-05-22 12:52:28 UTC ++++ utils/common/fwht-ctrls.h +@@ -11,21 +11,6 @@ + #ifndef _FWHT_CTRLS_H_ + #define _FWHT_CTRLS_H_ + +-#define V4L2_CTRL_TYPE_FWHT_PARAMS 0x0105 +- + #define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_MPEG_BASE + 292) +- +-struct v4l2_ctrl_fwht_params { +- __u64 backward_ref_ts; +- __u32 version; +- __u32 width; +- __u32 height; +- __u32 flags; +- __u32 colorspace; +- __u32 xfer_func; +- __u32 ycbcr_enc; +- __u32 quantization; +-}; +- + + #endif