[FFmpeg-devel] libavfilter: vid.stab filters patch for 0.98 version -> configure version check added

[Stefano Sabatini]

On date Monday 2014-01-13 21:58:48 +0100, Georg Martius encoded:
> Hi,
> > > On Monday 06 January 2014 11:14:25 Roger Pack wrote:
> > > > On 1/4/14, Georg Martius <georg.martius at web.de> wrote:
> > > > > Hi all,
> > > > > 
> > > > > please find attached the patch for vf_vidstab* in libavfilter to work
> > > > > with
> > > > > the
> > > > > newest version of the vid.stab library.
> > > > 
> > > > What version is the current filter based off (also I failed to see a
> > > > git tag for 0.97?)
> 0.96. There was no official 0.97 release
> 
> > > > Thank you.
> > > > -roger-
> > > > _______________________________________________
> > > > ffmpeg-devel mailing list
> > > > ffmpeg-devel at ffmpeg.org
> > > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> > > 
> > > From c4979a263324f86bc83aa151347e3425b6790e1d Mon Sep 17 00:00:00 2001
> > > From: Georg Martius <martius at mis.mpg.de>
> > > Date: Thu, 9 Jan 2014 22:22:16 +0100
> > > Subject: [PATCH] configure: added version check for pkg libraries, used
> > > for
> > > 
> > >  vidstab
> > > 
> > > Signed-off-by: Georg Martius <martius at mis.mpg.de>
> > > ---
> > > 
> > >  configure | 11 ++++++++++-
> > >  1 file changed, 10 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/configure b/configure
> > > index 101954e..4717811 100755
> > > --- a/configure
> > > +++ b/configure
> > > @@ -1006,6 +1006,14 @@ check_pkg_config(){
> > > 
> > >          set_safe ${pkg}_libs   $pkg_libs
> > >  
> > >  }
> > > 
> > > +check_pkg_version(){
> > > +    log check_pkg_version "$@"
> > > +    pkgandversion="$1"
> > > +    shift 1
> > > +    check_cmd $pkg_config --exists --print-errors $pkgandversion ||
> > > +      die "ERROR: $pkgandversion failed (via pkg-config)"
> > > +}
> > > +
> > 
> > This is redundant with check_pkg_config()
> > 
> > What about changing check_pkg_config() like this:
> > 
> >  check_pkg_config(){
> >      log check_pkg_config "$@"
> > -    pkg="$1"
> > +    pkgandversion="$1"
> > +    pkg="${1%% *}"
> >      headers="$2"
> >      funcs="$3"
> >      shift 3
> > -    check_cmd $pkg_config --exists --print-errors $pkg || return
> > +    check_cmd $pkg_config --exists --print-errors $pkgandversion || return
> >      pkg_cflags=$($pkg_config --cflags $pkg)
> >      pkg_libs=$($pkg_config --libs $pkg)
> >      check_func_headers "$headers" "$funcs" $pkg_cflags $pkg_libs "$@" &&

> Yes looks good to me. Can you now apply my patch for the filters that one can 
> compile with the newest vid.stab version?
> Yes and please add the comment:
> Fixes ticket #3296

Check patch in attachment, tested and works here, depends on filter
code patch.
-- 
FFmpeg = Fierce & Faithful Mortal Political Erudite Guru
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-configure-add-version-check-for-pkg-libraries-and-us.patch
Type: text/x-diff
Size: 1998 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140114/e415a3dc/attachment.bin>