From nobody Fri Dec 19 16:28:31 2025 X-Original-To: dev-commits-ports-all@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 4dXtJH6Tl8z6M0Vp for ; Fri, 19 Dec 2025 16:28:31 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXtJH4JWPz3m7l for ; Fri, 19 Dec 2025 16:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766161711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPOMb2yD7MwsBRxI0XLMMU+Wa8cNW0uTE2+4c20LQzM=; b=UPzlowAuokSLl7NRyG1ORp4OTkkN/25SA8Ubx0Xv9ByFoCUTTtJn6PruYB2HTT/TBW0IXR pL1LxVpl9FW4oR4/fZfraCYoMmFDx900w+WgaPC8LfxpsPSmHoWoxM5h1iVCFZhVtonmAE 8/wCWNA75NSry2ojylw6uT+BdvfPhw0O4Zod9z0Pi1XQJWpm5jAul2FI47cTdQorr8l7hW Zcmrhi98ws6iKywPaMb+HxHW+2zGwjZN7cSYV44Dz0sDNtv5sysLK/aQDeceJko7oJyBYL Oj6MOK4cpdDRklZ1DWrTouuru7PXuC5T3NAaU6HKFIyRhFKDVu4LG4+5S1PHcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766161711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPOMb2yD7MwsBRxI0XLMMU+Wa8cNW0uTE2+4c20LQzM=; b=LpZrn7tGUuf1v2BKfMV9zM3MwlxnSrhbYrb7an259U4S7zy+bOqZR01ddsBVvzh5oaW8Wb qSUAQ/MvIhW+9Q9U1RZI6ZzslCWxNq6rmkkibLM1JIspRPATo5j42RL6ZQN1GB9ivywN6C 3Z3erHliCDjni+lTkgJODcPR253LQj/QM6VA7ZjkaxF2A2XMGmiU9z+d0YXT8TrdV27wT2 MZDVtBI8s9Z1yroxTN3eRqeU/5saL3NPK7N6OePwu+nyt1p0zdHad4OkUaLGWVtm41dQV1 vgJGKfMSSQET4Eu/JHib03bn8P8DwS+U+dBC32k+sWdPG4tSNLkayxwpvzADrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766161711; a=rsa-sha256; cv=none; b=c/D9p2FFJ4ovZH7YoIJOeAd9iJ9nHaoI2AwlIQFIINb0AOxgqhXo3j8G8EA2TcvVceQ0JD 3MUoINSStaaSBZfEUiMYCXS5GnwzXea3MYxW5C6vQc/E1r8PF98HtxgRvgFLlA84IxTtwP NtfSxvL3tRNIT6LjVLN07n6YAWAQDe5N3WrFo1oHnP/Rp0eTnv1n9krFnwfzsNANWEMrBX +qVocA5p8/m1k/7PplG4KgujV/YjEP2Jh56enfbE/X1aTVIbR2w9Qgk/D2oapw2LvtJkyN bLP8Lj6ijDmlIUuhzBA3cXp+FR/T5O3hUGTbGDb/tZPjzelp9Ny19qSAr+xjLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dXtJH3H0gzpK for ; Fri, 19 Dec 2025 16:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 972e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Dec 2025 16:28:31 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4a0545221d33 - main - multimedia/x264: incorporate an upstream patch to support newer ffmpeg List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a0545221d3342ff477cebc4920fe5934aea730c Auto-Submitted: auto-generated Date: Fri, 19 Dec 2025 16:28:31 +0000 Message-Id: <69457d2f.972e.681c64ab@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a0545221d3342ff477cebc4920fe5934aea730c commit 4a0545221d3342ff477cebc4920fe5934aea730c Author: Baptiste Daroussin AuthorDate: 2025-12-19 16:28:10 +0000 Commit: Baptiste Daroussin CommitDate: 2025-12-19 16:28:10 +0000 multimedia/x264: incorporate an upstream patch to support newer ffmpeg --- multimedia/x264/Makefile | 2 ++ .../32c3b801191522961102d4bea292cdb61068d0dd.patch | 38 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 97a5a4643de4..b9dd3cdb4c03 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -26,6 +26,8 @@ MAINTAINER= bofh@FreeBSD.org COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) WWW= https://www.videolan.org/x264.html +EXTRA_PATCHES= ${FILESDIR}/32c3b801191522961102d4bea292cdb61068d0dd.patch:-p1 + LICENSE= GPLv2 LICENSE_NAME_PGO= PGO LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/multimedia/x264/files/32c3b801191522961102d4bea292cdb61068d0dd.patch b/multimedia/x264/files/32c3b801191522961102d4bea292cdb61068d0dd.patch new file mode 100644 index 000000000000..31ea7fc63bd6 --- /dev/null +++ b/multimedia/x264/files/32c3b801191522961102d4bea292cdb61068d0dd.patch @@ -0,0 +1,38 @@ +From 32c3b801191522961102d4bea292cdb61068d0dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Fri, 4 Apr 2025 16:59:34 +0300 +Subject: [PATCH] lavf: Update the code to work with the latest libavutil API + +--- + input/lavf.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/input/lavf.c b/input/lavf.c +index 90f4cec5..e2489963 100644 +--- a/input/lavf.c ++++ b/input/lavf.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #define FAIL_IF_ERROR( cond, ... ) FAIL_IF_ERR( cond, "lavf", __VA_ARGS__ ) + +@@ -141,8 +142,13 @@ static int read_frame_internal( cli_pic_t *p_pic, lavf_hnd_t *h, int i_frame, vi + if( info ) + { + info->fullrange = is_fullrange; ++#if LIBAVUTIL_VERSION_MAJOR < 60 + info->interlaced = h->frame->interlaced_frame; + info->tff = h->frame->top_field_first; ++#else ++ info->interlaced = !!(h->frame->flags & AV_FRAME_FLAG_INTERLACED); ++ info->tff = !!(h->frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST); ++#endif + } + + if( h->vfr_input ) +-- +GitLab +