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

[James Almer]

On 10/12/2017 6:41 PM, Michael Niedermayer wrote:
> On Thu, Oct 12, 2017 at 11:33:45PM +0200, Michael Niedermayer wrote:
>> On Thu, Oct 12, 2017 at 05:36:17PM -0300, James Almer wrote:
>>> On 10/12/2017 4:25 PM, Michael Niedermayer wrote:
>>>> On Thu, Oct 12, 2017 at 02:25:46PM -0300, James Almer wrote:
>>>>> On 10/12/2017 1:56 PM, Michael Niedermayer wrote:
>>>>>> On Wed, Oct 11, 2017 at 10:30:13PM -0300, James Almer wrote:
>>>>>>> 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?
>>>>>>
>>>>>> seems to fix it
>>>>>
>>>>> Pushed then. Thanks.
>>>>>
>>>>>> but i get a build failure with fontconfig now:
>>>>>>
>>>>>> ../configure  --enable-fontconfig  && make -j12
>>>>>>
>>>>>> LD      ffmpeg_g
>>>>>> libavfilter/libavfilter.a(avf_showcqt.o): In function `render_fontconfig':
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:606: undefined reference to `FcInitLoadConfigAndFonts'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:611: undefined reference to `FcNameParse'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:617: undefined reference to `FcDefaultSubstitute'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:619: undefined reference to `FcConfigSubstitute'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:626: undefined reference to `FcFontMatch'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:627: undefined reference to `FcPatternDestroy'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:643: undefined reference to `FcPatternDestroy'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:644: undefined reference to `FcConfigDestroy'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:621: undefined reference to `FcPatternDestroy'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:622: undefined reference to `FcConfigDestroy'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:635: undefined reference to `FcPatternGetString'
>>>>>> ffmpeg/nasm/src/libavfilter/avf_showcqt.c:613: undefined reference to `FcConfigDestroy'
>>>>>> collect2: error: ld returned 1 exit status
>>>>>> make: *** [ffmpeg_g] Error 1
>>>>>
>>>>> That'd be because showcqt is missing its fontconfig and freetype deps in
>>>>> configure, a mistake that was hidden by extralibs being global before
>>>>> this merge.
>>>>>
>>>>> Does the attached patch fix it?
>>>>
>>>> it seems so but it just results in the next failure
>>>>
>>>> make distclean ; ../configure --build-suffix=asterix && make -j12
>>>
>>> Does the attached patch fix this for you?
>>
>> yes
>>
>> next is:
>> make fate-timefilter
>>
>> doesnt work anymore
>>
>> make libavdevice/tests/timefilter
>> make: *** No rule to make target `libavdevice/tests/timefilter'.  Stop.
>>
>> i assume this is unintended, its a bit tricky to bisect with the
>> build system not fully working. Id first have to reduce the testcase
>> to the subbset that works on all checkouts ...
> 
> also video4linux is gone
> 
> ./configure
> config.h:#define CONFIG_V4L2_INDEV 0
> 
> and with a branch with all that reverted:
> ./configure
> config.h:#define CONFIG_V4L2_INDEV 1

v4l2 is not autodetected. Configure was checking for the wrong name for
this indev. See 734ed38931
The correct behavior is the current one, v4l2_indev disabled unless you
configure with --enable-libv4l2