From owner-dev-commits-ports-main@freebsd.org Sat May 22 12:59:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 890FA64D8B8; Sat, 22 May 2021 12:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FnNq83q79z4p0Q; Sat, 22 May 2021 12:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30438249CA; Sat, 22 May 2021 12:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14MCxmQb066206; Sat, 22 May 2021 12:59:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14MCxmHY066205; Sat, 22 May 2021 12:59:48 GMT (envelope-from git) Date: Sat, 22 May 2021 12:59:48 GMT Message-Id: <202105221259.14MCxmHY066205@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 37ecec030264 - main - multimedia/libv4l: Update webcamd and Linux source tree dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ecec030264ebe6625c14a8fa9edf0d7dfd937d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2021 12:59:50 -0000 The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/ports/commit/?id=37ecec030264ebe6625c14a8fa9edf0d7dfd937d commit 37ecec030264ebe6625c14a8fa9edf0d7dfd937d Author: Hans Petter Selasky AuthorDate: 2021-05-22 12:57:35 +0000 Commit: Hans Petter Selasky CommitDate: 2021-05-22 12:57:59 +0000 multimedia/libv4l: Update webcamd and Linux source tree dependencies. Approved by: pi (implicit) --- multimedia/libv4l/Makefile | 8 ++++---- multimedia/libv4l/distinfo | 10 ++++----- .../libv4l/files/patch-utils_common_fwht-ctrls.h | 24 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) 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