diff mbox

[FFmpeg-devel,v2] configure: Update libmysofa check with a new symbol.

Message ID 20190828201635.7350-1-andrey.semashev@gmail.com
State Accepted
Commit 7ea2710ec4d1b8920017c05fbb23c346e807e0f2
Headers show

Commit Message

Andrey Semashev Aug. 28, 2019, 8:16 p.m. UTC 
The current code in libavfilter/af_sofalizer.c requires
mysofa_neighborhood_init_withstepdefine function, which only appeared
in libmysofa 0.7. Use this function in configure script to bail out
early if a too old libmysofa is found in the system instead of failing
at compile time.
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andrey Semashev Sept. 2, 2019, 4:41 p.m. UTC | #1 
Ping? I would like this to make it into 4.2 as well.

On Wed, Aug 28, 2019 at 11:16 PM Andrey Semashev
<andrey.semashev@gmail.com> wrote:
>
> The current code in libavfilter/af_sofalizer.c requires
> mysofa_neighborhood_init_withstepdefine function, which only appeared
> in libmysofa 0.7. Use this function in configure script to bail out
> early if a too old libmysofa is found in the system instead of failing
> at compile time.
> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 51dc77c780..0d06ea6a02 100755
> --- a/configure
> +++ b/configure
> @@ -6237,8 +6237,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         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load ||
> -                               require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; }
> +enabled libmysofa         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
> +                               require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
>  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei ||
>                                 check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc -lnppidei ||
>                                 die "ERROR: libnpp not found"; }
> --
> 2.20.1
>
Paul B Mahol Sept. 2, 2019, 5:10 p.m. UTC | #2 
On 9/2/19, Andrey Semashev <andrey.semashev@gmail.com> wrote:
> Ping? I would like this to make it into 4.2 as well.
>

Applied to master.

> On Wed, Aug 28, 2019 at 11:16 PM Andrey Semashev
> <andrey.semashev@gmail.com> wrote:
>>
>> The current code in libavfilter/af_sofalizer.c requires
>> mysofa_neighborhood_init_withstepdefine function, which only appeared
>> in libmysofa 0.7. Use this function in configure script to bail out
>> early if a too old libmysofa is found in the system instead of failing
>> at compile time.
>> ---
>>  configure | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 51dc77c780..0d06ea6a02 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6237,8 +6237,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         && { check_pkg_config libmysofa libmysofa
>> mysofa.h mysofa_load ||
>> -                               require libmysofa mysofa.h mysofa_load
>> -lmysofa $zlib_extralibs; }
>> +enabled libmysofa         && { check_pkg_config libmysofa libmysofa
>> mysofa.h mysofa_neighborhood_init_withstepdefine ||
>> +                               require libmysofa mysofa.h
>> mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
>>  enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion
>> -lnppig -lnppicc -lnppc -lnppidei ||
>>                                 check_lib libnpp npp.h nppGetLibVersion
>> -lnppi -lnppc -lnppidei ||
>>                                 die "ERROR: libnpp not found"; }
>> --
>> 2.20.1
>>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Andrey Semashev Sept. 8, 2019, 8:08 a.m. UTC | #3 
On 2019-09-02 20:10, Paul B Mahol wrote:
> On 9/2/19, Andrey Semashev <andrey.semashev@gmail.com> wrote:
>> Ping? I would like this to make it into 4.2 as well.
>>
> 
> Applied to master.

Thanks. Could you also merge it to 4.2 branch?

>> On Wed, Aug 28, 2019 at 11:16 PM Andrey Semashev
>> <andrey.semashev@gmail.com> wrote:
>>>
>>> The current code in libavfilter/af_sofalizer.c requires
>>> mysofa_neighborhood_init_withstepdefine function, which only appeared
>>> in libmysofa 0.7. Use this function in configure script to bail out
>>> early if a too old libmysofa is found in the system instead of failing
>>> at compile time.
>>> ---
>>>   configure | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/configure b/configure
>>> index 51dc77c780..0d06ea6a02 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -6237,8 +6237,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         && { check_pkg_config libmysofa libmysofa
>>> mysofa.h mysofa_load ||
>>> -                               require libmysofa mysofa.h mysofa_load
>>> -lmysofa $zlib_extralibs; }
>>> +enabled libmysofa         && { check_pkg_config libmysofa libmysofa
>>> mysofa.h mysofa_neighborhood_init_withstepdefine ||
>>> +                               require libmysofa mysofa.h
>>> mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
>>>   enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion
>>> -lnppig -lnppicc -lnppc -lnppidei ||
>>>                                  check_lib libnpp npp.h nppGetLibVersion
>>> -lnppi -lnppc -lnppidei ||
>>>                                  die "ERROR: libnpp not found"; }
>>> --
>>> 2.20.1
>>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
diff mbox

Patch

diff --git a/configure b/configure
index 51dc77c780..0d06ea6a02 100755
--- a/configure
+++ b/configure
@@ -6237,8 +6237,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         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_load ||
-                               require libmysofa mysofa.h mysofa_load -lmysofa $zlib_extralibs; }
+enabled libmysofa         && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
+                               require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
 enabled libnpp            && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei ||
                                check_lib libnpp npp.h nppGetLibVersion -lnppi -lnppc -lnppidei ||
                                die "ERROR: libnpp not found"; }