[FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

[James Almer]

On 10/11/2017 9:22 PM, Michael Niedermayer wrote:
> On Wed, Oct 11, 2017 at 09:26:18PM +0000, James Almer wrote:
>> ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 11 17:55:25 2017 -0300| [6dfcbd80ad446ff163b47f2bf432bbf706436ea8] | committer: James Almer
>>
>> Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'
>>
>> * commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63':
>>   build: Fine-grained link-time dependency settings
>>
>> Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870,
>> d9da7151eef7fc469787e7298196cea291acfd82 and
>> 5e27ef800bfa2be17a6353ddedac6b7400e4624f.
>>
>> Merged-by: James Almer <jamrial at gmail.com>
>>
>>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6dfcbd80ad446ff163b47f2bf432bbf706436ea8
>> ---
>>
>>  Makefile                |   3 +-
>>  configure               | 297 +++++++++++++++++++++++++++++-------------------
>>  ffbuild/common.mak      |   2 +-
>>  ffbuild/library.mak     |   2 +-
>>  tests/checkasm/Makefile |   2 +-
>>  5 files changed, 187 insertions(+), 119 deletions(-)
> 
> This breaks build here (linux x86-64)
> 
> ./configure --enable-libxavs --enable-gpl
> ERROR: libxavs not found
> 
> Iam trying to test most patches for FFmpeg before they are pushed, but
> i can only test what is posted for review on ffmpeg-devel ...

Testing locally i see it's complaining about missing pthreads and libm
ldflag, since they of course are not part of the global extralibs anymore.
Switching detection to pkg-config would be ideal, but for some reason
even the supplied .pc file doesn't include the -lm ldflag, only the
pthreads one, and libxavs looks like it hasn't been updated for six
years now (at least the one in sourceforge), so it's unlikely to be
fixed on their end.

Can you test the attached patch?
-------------- next part --------------
From b08e7418b246b6e142158c13407097509f97aabc Mon Sep 17 00:00:00 2001
From: James Almer <jamrial at gmail.com>
Date: Wed, 11 Oct 2017 22:28:29 -0300
Subject: [PATCH] configure: fix check for libxavs

Regression since 6dfcbd80ad446ff163b47f2bf432bbf706436ea8.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 9f95d58c6e..2b22d4ebcb 100755
--- a/configure
+++ b/configure
@@ -6098,7 +6098,7 @@ enabled libx264           && { use_pkg_config libx264 x264 "stdint.h x264.h" x26
                                enable libx262; }
 enabled libx265           && require_pkg_config libx265 x265 x265.h x265_api_get &&
                              require_cpp_condition x265.h "X265_BUILD >= 68"
-enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs
+enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
 enabled libxvid           && require libxvid xvid.h xvid_global -lxvidcore
 enabled libzimg           && require_pkg_config libzimg "zimg >= 2.3.0" zimg.h zimg_get_api_version
 enabled libzmq            && require_pkg_config libzmq libzmq zmq.h zmq_ctx_new
-- 
2.14.2