[FFmpeg-devel] [RFC][PATCH] configure: libfreetype check

[Alexander Strasser]

On 2013-12-07 01:12 +0100, Alexander Strasser wrote:
> On 2013-12-06 23:25 +0100, Clément Bœsch wrote:
> > On Fri, Dec 06, 2013 at 10:55:04PM +0100, Alexander Strasser wrote:
[two other variants skipped]
> > > From 7da78bc381d02fbf328d251843be11f32fb04ae3 Mon Sep 17 00:00:00 2001
> > > Message-Id: <7da78bc381d02fbf328d251843be11f32fb04ae3.1386364728.git.eclipse7 at gmx.net>
> > > From: Alexander Strasser <eclipse7 at gmx.net>
> > > Date: Fri, 6 Dec 2013 17:20:26 +0100
> > > Subject: [PATCH] configure: Special case libfreetype test
> > > 
> > > Include the freetype header, in-directly through a macro, like it
> > > is done in the drawtext filter. Do not break if the header is moved,
> > > like it was done in at least distribution.
> > > 
> > > Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
> > > ---
> > >  configure | 21 ++++++++++++++++++++-
> > >  1 file changed, 20 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/configure b/configure
> > > index 5881e6a..5606426 100755
> > > --- a/configure
> > > +++ b/configure
> > > @@ -1127,6 +1127,25 @@ require_pkg_config(){
> > >      add_extralibs $(get_safe ${pkg}_libs)
> > >  }
> > >  
> > > +require_libfreetype(){
> > > +    log check_libfreetype "$@"
> > > +    pkg="freetype2"
> > > +    shift 3
> > > +    check_cmd $pkg_config --exists --print-errors $pkg || return
> > > +    pkg_cflags=$($pkg_config --cflags $pkg)
> > > +    pkg_libs=$($pkg_config --libs $pkg)
> > > +    {
> > > +        echo "#include <ft2build.h>"
> > > +        echo "#include FT_FREETYPE_H"
> > > +        echo "long check_func(void) { return (long) FT_Init_FreeType; }"
> > > +        echo "int main(void) { return 0; }"
> > > +    } | check_ld "cc" $pkg_cflags $pkg_libs && enable $funcs &&
> > > +        set_safe ${pkg}_cflags $pkg_cflags   &&
> > > +        set_safe ${pkg}_libs   $pkg_libs
> > > +    add_cflags    $(get_safe ${pkg}_cflags)
> > > +    add_extralibs $(get_safe ${pkg}_libs)
> > > +}
> > > +
> > 
> > This approach looks the saner.
> > 
> > Also note that you need to remove one #include in the drawtext filter to
> > make the compilation works.
> 
>   Yeah, I got a notice about that. The inlcude can just be deleted,
> I think it was wrong to begin with. But to be sure I will check the
> history of that file.

  Checked it. Was already wrong in the initial commit.

  So if I hear no more comments, I will go with variant 3 + removal
of the wrong #include in vf_drawtext. I am planning to commit tomorrow
evening CET at latest. Maybe earlier; I do not like to leave build
problems like this open for too long, it hinders all the builders that
enable libfreetype and have a version with the headers moved.

  Variant 3 was also favored by one person on IRC.

  Alexander
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131207/e7f7ef02/attachment.asc>