[FFmpeg-devel,1/1] configure: add pkg-config check for libmysofa

From 8082ba451d089790f0719c4ec6788796b2079e9d Mon Sep 17 00:00:00 2001
From: Reino17 <rwijnsma@xs4all.nl>
Date: Mon, 7 May 2018 17:28:10 +0200
Subject: [PATCH] configure: add pkg-config check for libmysofa

This does require libmysofa with today's latest commit (https://github.com/hoene/libmysofa/commit/08f243d1ec35f6f794aedeb4b187d9f9353bdbc1).
They already had a pkg-config file, but the dependencies weren't setup right. Until now.
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

On 7-5-2018 17:59, Reino Wijnsma <rwijnsma@xs4all.nl> wrote:
> From 8082ba451d089790f0719c4ec6788796b2079e9d Mon Sep 17 00:00:00 2001
> From: Reino17 <rwijnsma@xs4all.nl>
> Date: Mon, 7 May 2018 17:28:10 +0200
> Subject: [PATCH] configure: add pkg-config check for libmysofa
>
> This does require libmysofa with today's latest commit (https://github.com/hoene/libmysofa/commit/08f243d1ec35f6f794aedeb4b187d9f9353bdbc1).
> They already had a pkg-config file, but the dependencies weren't setup right. Until now.
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 7c14323..2d61731 100755
> --- a/configure
> +++ b/configure
> @@ -6007,7 +6007,8 @@ enabled libmfx            && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" M
>                                 { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
>  enabled libmodplug        && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
>  enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
> -enabled libmysofa         && require libmysofa "mysofa.h" mysofa_load -lmysofa $zlib_extralibs
> +enabled libmysofa         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load ||
> +                               require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; }
>  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc ||
>                                 check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc ||
>                                 die "ERROR: libnpp not found"; }
*ping*

On 5/13/18, Reino Wijnsma <rwijnsma@xs4all.nl> wrote:
> On 7-5-2018 17:59, Reino Wijnsma <rwijnsma@xs4all.nl> wrote:
>> From 8082ba451d089790f0719c4ec6788796b2079e9d Mon Sep 17 00:00:00 2001
>> From: Reino17 <rwijnsma@xs4all.nl>
>> Date: Mon, 7 May 2018 17:28:10 +0200
>> Subject: [PATCH] configure: add pkg-config check for libmysofa
>>
>> This does require libmysofa with today's latest commit
>> (https://github.com/hoene/libmysofa/commit/08f243d1ec35f6f794aedeb4b187d9f9353bdbc1).
>> They already had a pkg-config file, but the dependencies weren't setup
>> right. Until now.
>> ---
>>  configure | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 7c14323..2d61731 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6007,7 +6007,8 @@ enabled libmfx            && { check_pkg_config
>> libmfx libmfx "mfx/mfxvideo.h" M
>>                                 { require libmfx "mfx/mfxvideo.h" MFXInit
>> "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config";
>> } }
>>  enabled libmodplug        && require_pkg_config libmodplug libmodplug
>> libmodplug/modplug.h ModPlug_Load
>>  enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h
>> lame_set_VBR_quality -lmp3lame $libm_extralibs
>> -enabled libmysofa         && require libmysofa "mysofa.h" mysofa_load
>> -lmysofa $zlib_extralibs
>> +enabled libmysofa         && { check_pkg_config libmysofa libmysofa
>> mysofa.h mysofa_load ||
>> +                               require libmysofa mysofa.h mysofa_load
>> -lmysofa $zlib_extralibs; }
>>  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion
>> -lnppig -lnppicc -lnppc ||
>>                                 check_lib libnpp npp.h nppGetLibVersion
>> -lnppi -lnppc ||
>>                                 die "ERROR: libnpp not found"; }
> *ping*

Could you wait for new libmysofa release?

On Sun, May 13, 2018 at 7:11 PM, Paul B Mahol <onemda@gmail.com> wrote:
> On 5/13/18, Reino Wijnsma <rwijnsma@xs4all.nl> wrote:
>> *ping*
>
> Could you wait for new libmysofa release?

Hi,

I think this depends on whether this breaks build where it used to
work before. As you may notice, it still has the non-pkg-config
fall-back. So if the test doesn't link (I think this check tests for
linking?), it should revert to the non-pkg-config one.

Unfortunately I do not have libmysofa installed so I cannot verify
this myself, but it heavily looks like this actually is an overall
improvement, esp. if they are not going to change the name of the pc
file.


Best regards,
Jan

On 13-5-2018 18:11, Paul B Mahol <onemda@gmail.com> wrote:
> Could you wait for new libmysofa release?
I'm not a FFmpeg coder/developer, so if you believe that's the best thing to do, then that's fine by me. The current non-pkg-config-file method works fine afterall.

-- Reino