git: eabfea6cac19 - main - multimedia/ffmpeg: unbreak LENSFUN=ON after 3d7938b00655

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eabfea6cac19287dcb343a48d8a35942d8d33d42

commit eabfea6cac19287dcb343a48d8a35942d8d33d42
Author:     Oleg Sidorkin <osidorkin at gmail.com>
AuthorDate: 2021-04-13 14:23:59 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
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;