diff mbox

[FFmpeg-devel,1/2] configure: add pkg-config detection for twolame

Message ID 20171129203941.10598-2-qyot27@gmail.com
State New
Headers show

Commit Message

Stephen Hutchinson Nov. 29, 2017, 8:39 p.m. UTC 
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Hendrik Leppkes Nov. 29, 2017, 8:57 p.m. UTC | #1 
On Wed, Nov 29, 2017 at 9:39 PM, Stephen Hutchinson <qyot27@gmail.com> wrote:
> ---
>  configure | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 4e7254eaeb..3c08125da3 100755
> --- a/configure
> +++ b/configure
> @@ -5888,7 +5888,9 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
>  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
>  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
>  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
> -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
> +enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
> +                               require libtwolame twolame.h twolame_init -ltwolame &&
> +                               warn "using libtwolame without pkg-config"; } &&
>                               { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||

If all supported versions of twolame have always had a pkg-config
file, then just replace it with require_pkg_config without the
fallback dance.

- Hendrik
James Almer Nov. 29, 2017, 9:11 p.m. UTC | #2 
On 11/29/2017 5:57 PM, Hendrik Leppkes wrote:
> On Wed, Nov 29, 2017 at 9:39 PM, Stephen Hutchinson <qyot27@gmail.com> wrote:
>> ---
>>  configure | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 4e7254eaeb..3c08125da3 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5888,7 +5888,9 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
>>  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
>>  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
>>  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
>> -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
>> +enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
>> +                               require libtwolame twolame.h twolame_init -ltwolame &&
>> +                               warn "using libtwolame without pkg-config"; } &&
>>                               { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
> 
> If all supported versions of twolame have always had a pkg-config
> file, then just replace it with require_pkg_config without the
> fallback dance.

Nope, only git head currently. https://github.com/njh/twolame/pull/72
James Almer Nov. 29, 2017, 9:12 p.m. UTC | #3 
On 11/29/2017 6:11 PM, James Almer wrote:
> On 11/29/2017 5:57 PM, Hendrik Leppkes wrote:
>> On Wed, Nov 29, 2017 at 9:39 PM, Stephen Hutchinson <qyot27@gmail.com> wrote:
>>> ---
>>>  configure | 4 +++-
>>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index 4e7254eaeb..3c08125da3 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -5888,7 +5888,9 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
>>>  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
>>>  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
>>>  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
>>> -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
>>> +enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
>>> +                               require libtwolame twolame.h twolame_init -ltwolame &&
>>> +                               warn "using libtwolame without pkg-config"; } &&
>>>                               { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
>>
>> If all supported versions of twolame have always had a pkg-config
>> file, then just replace it with require_pkg_config without the
>> fallback dance.
> 
> Nope, only git head currently. https://github.com/njh/twolame/pull/72

Oh nevermind, all releases seem to have it. I mistook this as having one
properly working for static builds.
Carl Eugen Hoyos Nov. 30, 2017, 1:43 a.m. UTC | #4 
2017-11-29 21:57 GMT+01:00 Hendrik Leppkes <h.leppkes@gmail.com>:
> On Wed, Nov 29, 2017 at 9:39 PM, Stephen Hutchinson <qyot27@gmail.com> wrote:
>> ---
>>  configure | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 4e7254eaeb..3c08125da3 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5888,7 +5888,9 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
>>  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
>>  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
>>  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
>> -enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
>> +enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
>> +                               require libtwolame twolame.h twolame_init -ltwolame &&
>> +                               warn "using libtwolame without pkg-config"; } &&
>>                               { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
>
> If all supported versions of twolame have always had a pkg-config
> file, then just replace it with require_pkg_config without the
> fallback dance.

Please keep the non-pkg-config case to allow testing on a few
less common platforms.

Thank you, Carl Eugen
diff mbox

Patch

diff --git a/configure b/configure
index 4e7254eaeb..3c08125da3 100755
--- a/configure
+++ b/configure
@@ -5888,7 +5888,9 @@  enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
 enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
 enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
 enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
-enabled libtwolame        && require libtwolame twolame.h twolame_init -ltwolame &&
+enabled libtwolame        && { check_pkg_config libtwolame "twolame >= 0.3.10" twolame.h twolame_init ||
+                               require libtwolame twolame.h twolame_init -ltwolame &&
+                               warn "using libtwolame without pkg-config"; } &&
                              { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
                                die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
 enabled libv4l2           && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl