From nobody Wed Aug 12 17:01:14 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hKvs66Wfyz6nd15 for ; Wed, 12 Aug 2026 17:01:14 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hKvs65H1Zz3bR1 for ; Wed, 12 Aug 2026 17:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786554074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yuLcwvClUu9jvpToicrsKRUDTqHl0MGFrt1N4vlPmU=; b=AWIkhi++H3e48DQuOpH16gjXqFWc2WidSStSgbGRQbVQu1ySTunH38EdFhd5Hse8//AG66 GGiO3QnXF5x0TmzI1F3fPyF5EBANIQgv56ZZFykVcAXWZ3fG78gzvwJBi9OSy+qsdKSlOu Z9/ibfjdZIZ8KLLMj+9I6jYKaWd0zMawnjSMZHk4RlhDGRLSjV7UXt8OrI6cpowFweqafU HjnnY2FUq6Z5xarRooVKSqNFNBzHEU8QbjE4QADi+TQrAR8IJyWfzcrkCpEbEU9SwlEShH HcqSsF1Z5yG3aCUCw8ICLNFFdn5QRYDh0i1JvbxsprLxUPSUCC0MUPqBl1BRYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786554074; a=rsa-sha256; cv=none; b=wNpBLEhE/BbvoCPbV3ueIUNHNbj+IFdZSmF6Am7Gw7RK0VCvGo4EFfJ54Vop9rMgvTunVt 0Dlxdp/OeE09KbP+qDl3a4k2yE3qiqXkmdFad1jzlqashKNRDB6qT44NJQnPZXkp5AWjW+ FVo5B2muEbnNoV8WmwADAZCy87Bk+5FvKNYwhG2KyodoWiKwbMjIHPh9tBA2iYGqgN9PpB bz6ElDK9CSLao1NzrYY4zklguUCsax50zlh3xFYMC4CLfbR4taJRLKIMBv4iKhRAbnG6l+ AJLmg1/EjYUxSR4AxxnlpoawMab7SU/dcoy4koyOZ8UkqyweQeJ/VWL2u8zXXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786554074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yuLcwvClUu9jvpToicrsKRUDTqHl0MGFrt1N4vlPmU=; b=KW0jd0dP7Nlnk/MYxQf6GYzJx65qRUhm7vyOERxuiJDzGTQgBYdsSeMrpaNWU6FoC+wdhB ZYELLGk4DV6Y6C7ryopL6Zml7vr9BOaE4nzb3EeF+bdK8x/mn6oh9mwAl/bsGxAN7PZFfa UUniLMe/tYaV1Z9iveW9fUhMMs70Em2UItxugnrw/Fvn+X+AsP8Y/bBkp7HSczSyvMsfJ8 Ex60NPwbFUBrkWR2LJ52s94Du6W0MDurqw33biSDrvxfRroXcEpzvseFnxlkZ9jzTtTvh7 9cr3WbqAFDMxQQqWLxTWKJ7LJCPjO5AccbAv21rAAKJ1l4romynUTCAXOXv5cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hKvs64G9RzZZV for ; Wed, 12 Aug 2026 17:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 186e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 12 Aug 2026 17:01:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: fb3564b44fa7 - main - video: fix v4l2_buffer size assert on non-i386 32-bit ports List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb3564b44fa7b469b1ef29d3d2866364b89431eb Auto-Submitted: auto-generated Date: Wed, 12 Aug 2026 17:01:14 +0000 Message-Id: <6a7ca6da.186e4.183a9f47@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3564b44fa7b469b1ef29d3d2866364b89431eb commit fb3564b44fa7b469b1ef29d3d2866364b89431eb Author: Abdelkader Boudih AuthorDate: 2026-08-12 16:44:04 +0000 Commit: Adrian Chadd CommitDate: 2026-08-12 16:51:50 +0000 video: fix v4l2_buffer size assert on non-i386 32-bit ports Split the #else branch into an explicit __i386__ case (68) and a generic ILP32-with-64-bit-time_t case (80) covering arm and powerpc. Fixes: 0343ab8a6afa Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58790 --- sys/sys/videoio.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/sys/videoio.h b/sys/sys/videoio.h index 4a49a188fa47..bcf7ccaf8cb2 100644 --- a/sys/sys/videoio.h +++ b/sys/sys/videoio.h @@ -495,11 +495,6 @@ struct v4l2_frmivalenum { #define VIDIOC_ENUM_FRAMESIZES _IOWR('V', 74, struct v4l2_frmsizeenum) #define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum) -/* - * These are commented out as there are currently some issues building - * some compatibility interfaces. - */ -#if 0 _Static_assert(sizeof(struct v4l2_pix_format) == 48, "v4l2_pix_format layout"); _Static_assert(sizeof(struct v4l2_capability) == 104, "v4l2_capability layout"); _Static_assert(sizeof(struct v4l2_requestbuffers) == 20, @@ -508,11 +503,16 @@ _Static_assert(sizeof(struct v4l2_requestbuffers) == 20, _Static_assert(__offsetof(struct v4l2_format, fmt) == 8, "v4l2_format layout"); _Static_assert(sizeof(struct v4l2_format) == 208, "v4l2_format layout"); _Static_assert(sizeof(struct v4l2_buffer) == 88, "v4l2_buffer layout"); -#else +#elif defined(__i386__) +/* i386 is the only 32-bit port with a 32-bit time_t. */ _Static_assert(__offsetof(struct v4l2_format, fmt) == 4, "v4l2_format layout"); _Static_assert(sizeof(struct v4l2_format) == 204, "v4l2_format layout"); _Static_assert(sizeof(struct v4l2_buffer) == 68, "v4l2_buffer layout"); -#endif +#else +/* ILP32 with a 64-bit time_t: arm, powerpc, mips, riscv32. */ +_Static_assert(__offsetof(struct v4l2_format, fmt) == 4, "v4l2_format layout"); +_Static_assert(sizeof(struct v4l2_format) == 204, "v4l2_format layout"); +_Static_assert(sizeof(struct v4l2_buffer) == 80, "v4l2_buffer layout"); #endif #endif /* _SYS_VIDEOIO_H_ */