From owner-dev-commits-ports-all@freebsd.org Thu Apr 15 19:35:10 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 2038D5D4393; Thu, 15 Apr 2021 19:35:10 +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 4FLqLQ0N04z4m3x; Thu, 15 Apr 2021 19:35:10 +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 F302917062; Thu, 15 Apr 2021 19:35:09 +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 13FJZ9R8057491; Thu, 15 Apr 2021 19:35:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13FJZ9WF057490; Thu, 15 Apr 2021 19:35:09 GMT (envelope-from git) Date: Thu, 15 Apr 2021 19:35:09 GMT Message-Id: <202104151935.13FJZ9WF057490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: eabfea6cac19 - main - multimedia/ffmpeg: unbreak LENSFUN=ON after 3d7938b00655 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eabfea6cac19287dcb343a48d8a35942d8d33d42 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Apr 2021 19:35:10 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=eabfea6cac19287dcb343a48d8a35942d8d33d42 commit eabfea6cac19287dcb343a48d8a35942d8d33d42 Author: Oleg Sidorkin AuthorDate: 2021-04-13 14:23:59 +0000 Commit: Jan Beich CommitDate: 2021-04-15 19:34:43 +0000 multimedia/ffmpeg: unbreak LENSFUN=ON after 3d7938b00655 libavfilter/vf_lensfun.c:229:63: error: too many arguments to function call, expected 5, have 7 inlink->h, LF_PF_U8, lensfun->reverse); ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/lensfun/lensfun.h:3075:11: note: 'lf_modifier_create' declared here LF_EXPORT lfModifier *lf_modifier_create ( ^ libavfilter/vf_lensfun.c:231:119: error: too few arguments to function call, expected 5, have 3 lf_modifier_enable_vignetting_correction(lensfun->modifier, lensfun->aperture, lensfun->focus_distance); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ /usr/local/include/lensfun/lensfun.h:3097:11: note: 'lf_modifier_enable_vignetting_correction' declared here LF_EXPORT int lf_modifier_enable_vignetting_correction ( ^ libavfilter/vf_lensfun.c:233:75: error: too few arguments to function call, expected 3, have 1 lf_modifier_enable_distortion_correction(lensfun->modifier); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ /usr/local/include/lensfun/lensfun.h:3091:11: note: 'lf_modifier_enable_distortion_correction' declared here LF_EXPORT int lf_modifier_enable_distortion_correction (lfModifier *modifier, const lfLens* lens, float focal); ^ libavfilter/vf_lensfun.c:234:100: error: too few arguments to function call, expected 4, have 2 lf_modifier_enable_projection_transform(lensfun->modifier, lensfun->target_geometry); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ /usr/local/include/lensfun/lensfun.h:3101:11: note: 'lf_modifier_enable_projection_transform' declared here LF_EXPORT cbool lf_modifier_enable_projection_transform ( ^ /usr/local/include/lensfun/lensfun.h:115:15: note: expanded from macro 'cbool' #define cbool int ^ libavfilter/vf_lensfun.c:238:68: error: too few arguments to function call, expected 3, have 1 lf_modifier_enable_tca_correction(lensfun->modifier); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ /usr/local/include/lensfun/lensfun.h:3094:11: note: 'lf_modifier_enable_tca_correction' declared here LF_EXPORT int lf_modifier_enable_tca_correction (lfModifier *modifier, const lfLens* lens, float focal); ^ PR: 255035 --- .../ffmpeg/files/patch-libavfilter_vf__lensfun.c | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/multimedia/ffmpeg/files/patch-libavfilter_vf__lensfun.c b/multimedia/ffmpeg/files/patch-libavfilter_vf__lensfun.c new file mode 100644 index 000000000000..805d07687521 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavfilter_vf__lensfun.c @@ -0,0 +1,51 @@ +Partially revert https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8b78eb312de9 +until graphics/lensfun is updated to a version that contains +https://github.com/lensfun/lensfun/commit/b135e05d729d + +--- libavfilter/vf_lensfun.c.orig 2021-04-08 21:28:40 UTC ++++ libavfilter/vf_lensfun.c +@@ -222,20 +222,39 @@ static int config_props(AVFilterLink *inlink) + + if (!lensfun->modifier) { + if (lensfun->camera && lensfun->lens) { +- lensfun->modifier = lf_modifier_create(lensfun->lens, ++ lensfun->modifier = lf_modifier_create( ++#if (LF_VERSION > 0x35F00) ++ lensfun->lens, + lensfun->focal_length, ++#endif + lensfun->camera->CropFactor, + inlink->w, + inlink->h, LF_PF_U8, lensfun->reverse); + if (lensfun->mode & VIGNETTING) +- lf_modifier_enable_vignetting_correction(lensfun->modifier, lensfun->aperture, lensfun->focus_distance); ++ lf_modifier_enable_vignetting_correction(lensfun->modifier, ++#if (LF_VERSION <= 0x35F00) ++ lensfun->lens, lensfun->focal_length, ++#endif ++ lensfun->aperture, lensfun->focus_distance); + if (lensfun->mode & GEOMETRY_DISTORTION) { +- lf_modifier_enable_distortion_correction(lensfun->modifier); +- lf_modifier_enable_projection_transform(lensfun->modifier, lensfun->target_geometry); ++ lf_modifier_enable_distortion_correction(lensfun->modifier, ++#if (LF_VERSION <= 0x35F00) ++ lensfun->lens, lensfun->focal_length ++#endif ++ ); ++ lf_modifier_enable_projection_transform(lensfun->modifier, ++#if (LF_VERSION <= 0x35F00) ++ lensfun->lens, lensfun->focal_length, ++#endif ++ lensfun->target_geometry); + lf_modifier_enable_scaling(lensfun->modifier, lensfun->scale); + } + if (lensfun->mode & SUBPIXEL_DISTORTION) +- lf_modifier_enable_tca_correction(lensfun->modifier); ++ lf_modifier_enable_tca_correction(lensfun->modifier, ++#if (LF_VERSION <= 0x35F00) ++ lensfun->lens, lensfun->focal_length ++#endif ++ ); + } else { + // lensfun->camera and lensfun->lens should have been initialized + return AVERROR_BUG;