diff mbox

[FFmpeg-devel] configure: use pkg-config for libgme, if available

Message ID 20170623005337.13528-1-wiiaboo@gmail.com
State Accepted
Commit 0bf857a13fd5a9ae1f5c3f15e1d16d91a0213a26
Headers show

Commit Message

Ricardo Constantino June 23, 2017, 12:53 a.m. UTC 
The pkg-config file is relatively new (2013), so some distros might
not have it yet. And the -lstdc++ being required for the static lib
is only present since the last release in December 2016.
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

wm4 June 23, 2017, 4:08 p.m. UTC | #1 
On Fri, 23 Jun 2017 01:53:37 +0100
Ricardo Constantino <wiiaboo@gmail.com> wrote:

> The pkg-config file is relatively new (2013), so some distros might
> not have it yet. And the -lstdc++ being required for the static lib
> is only present since the last release in December 2016.
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index dd9608540e..74f8ba4c57 100755
> --- a/configure
> +++ b/configure
> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
>                                 done || die "ERROR: libgsm not found"; }

The first patch without the fallback has my blessing.
Ricardo Constantino July 6, 2017, 10:16 p.m. UTC | #2 
On 23 June 2017 at 17:08, wm4 <nfxjfg@googlemail.com> wrote:
> On Fri, 23 Jun 2017 01:53:37 +0100
> Ricardo Constantino <wiiaboo@gmail.com> wrote:
>
>> The pkg-config file is relatively new (2013), so some distros might
>> not have it yet. And the -lstdc++ being required for the static lib
>> is only present since the last release in December 2016.
>> ---
>>  configure | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index dd9608540e..74f8ba4c57 100755
>> --- a/configure
>> +++ b/configure
>> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
>>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
>>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
>>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
>> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
>> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
>> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
>>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
>>                                 done || die "ERROR: libgsm not found"; }
>
> The first patch without the fallback has my blessing.

Pinging this one because some distros (Ubuntu at least) don't have 0.6.1 yet.
Ricardo Constantino July 11, 2017, 8:56 p.m. UTC | #3 
On 6 July 2017 at 23:16, Ricardo Constantino <wiiaboo@gmail.com> wrote:
> On 23 June 2017 at 17:08, wm4 <nfxjfg@googlemail.com> wrote:
>> On Fri, 23 Jun 2017 01:53:37 +0100
>> Ricardo Constantino <wiiaboo@gmail.com> wrote:
>>
>>> The pkg-config file is relatively new (2013), so some distros might
>>> not have it yet. And the -lstdc++ being required for the static lib
>>> is only present since the last release in December 2016.
>>> ---
>>>  configure | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/configure b/configure
>>> index dd9608540e..74f8ba4c57 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
>>>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
>>>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
>>>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
>>> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
>>> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
>>> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>>>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
>>>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
>>>                                 done || die "ERROR: libgsm not found"; }
>>
>> The first patch without the fallback has my blessing.
>
> Pinging this one because some distros (Ubuntu at least) don't have 0.6.1 yet.

Ping.
wm4 July 12, 2017, 7:43 a.m. UTC | #4 
On Tue, 11 Jul 2017 21:56:21 +0100
Ricardo Constantino <wiiaboo@gmail.com> wrote:

> On 6 July 2017 at 23:16, Ricardo Constantino <wiiaboo@gmail.com> wrote:
> > On 23 June 2017 at 17:08, wm4 <nfxjfg@googlemail.com> wrote:  
> >> On Fri, 23 Jun 2017 01:53:37 +0100
> >> Ricardo Constantino <wiiaboo@gmail.com> wrote:
> >>  
> >>> The pkg-config file is relatively new (2013), so some distros might
> >>> not have it yet. And the -lstdc++ being required for the static lib
> >>> is only present since the last release in December 2016.
> >>> ---
> >>>  configure | 3 ++-
> >>>  1 file changed, 2 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/configure b/configure
> >>> index dd9608540e..74f8ba4c57 100755
> >>> --- a/configure
> >>> +++ b/configure
> >>> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
> >>>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
> >>>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
> >>>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
> >>> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
> >>> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
> >>> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
> >>>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
> >>>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
> >>>                                 done || die "ERROR: libgsm not found"; }  
> >>
> >> The first patch without the fallback has my blessing.  
> >
> > Pinging this one because some distros (Ubuntu at least) don't have 0.6.1 yet.  
> 
> Ping.

I can push it if you want?
Ricardo Constantino July 12, 2017, 11:19 a.m. UTC | #5 
On 12 July 2017 at 08:43, wm4 <nfxjfg@googlemail.com> wrote:
> On Tue, 11 Jul 2017 21:56:21 +0100
> Ricardo Constantino <wiiaboo@gmail.com> wrote:
>
>> On 6 July 2017 at 23:16, Ricardo Constantino <wiiaboo@gmail.com> wrote:
>> > On 23 June 2017 at 17:08, wm4 <nfxjfg@googlemail.com> wrote:
>> >> On Fri, 23 Jun 2017 01:53:37 +0100
>> >> Ricardo Constantino <wiiaboo@gmail.com> wrote:
>> >>
>> >>> The pkg-config file is relatively new (2013), so some distros might
>> >>> not have it yet. And the -lstdc++ being required for the static lib
>> >>> is only present since the last release in December 2016.
>> >>> ---
>> >>>  configure | 3 ++-
>> >>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> >>>
>> >>> diff --git a/configure b/configure
>> >>> index dd9608540e..74f8ba4c57 100755
>> >>> --- a/configure
>> >>> +++ b/configure
>> >>> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
>> >>>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
>> >>>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
>> >>>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
>> >>> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
>> >>> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
>> >>> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
>> >>>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
>> >>>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
>> >>>                                 done || die "ERROR: libgsm not found"; }
>> >>
>> >> The first patch without the fallback has my blessing.
>> >
>> > Pinging this one because some distros (Ubuntu at least) don't have 0.6.1 yet.
>>
>> Ping.
>
> I can push it if you want?

Sure, whichever patch you prefer.
wm4 July 13, 2017, 12:06 p.m. UTC | #6 
On Wed, 12 Jul 2017 12:19:42 +0100
Ricardo Constantino <wiiaboo@gmail.com> wrote:

> On 12 July 2017 at 08:43, wm4 <nfxjfg@googlemail.com> wrote:
> > On Tue, 11 Jul 2017 21:56:21 +0100
> > Ricardo Constantino <wiiaboo@gmail.com> wrote:
> >  
> >> On 6 July 2017 at 23:16, Ricardo Constantino <wiiaboo@gmail.com> wrote:  
> >> > On 23 June 2017 at 17:08, wm4 <nfxjfg@googlemail.com> wrote:  
> >> >> On Fri, 23 Jun 2017 01:53:37 +0100
> >> >> Ricardo Constantino <wiiaboo@gmail.com> wrote:
> >> >>  
> >> >>> The pkg-config file is relatively new (2013), so some distros might
> >> >>> not have it yet. And the -lstdc++ being required for the static lib
> >> >>> is only present since the last release in December 2016.
> >> >>> ---
> >> >>>  configure | 3 ++-
> >> >>>  1 file changed, 2 insertions(+), 1 deletion(-)
> >> >>>
> >> >>> diff --git a/configure b/configure
> >> >>> index dd9608540e..74f8ba4c57 100755
> >> >>> --- a/configure
> >> >>> +++ b/configure
> >> >>> @@ -5826,7 +5826,8 @@ enabled fontconfig        && enable libfontconfig
> >> >>>  enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
> >> >>>  enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
> >> >>>  enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
> >> >>> -enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
> >> >>> +enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
> >> >>> +                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
> >> >>>  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
> >> >>>                                     check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
> >> >>>                                 done || die "ERROR: libgsm not found"; }  
> >> >>
> >> >> The first patch without the fallback has my blessing.  
> >> >
> >> > Pinging this one because some distros (Ubuntu at least) don't have 0.6.1 yet.  
> >>
> >> Ping.  
> >
> > I can push it if you want?  
> 
> Sure, whichever patch you prefer.

Pushed.
diff mbox

Patch

diff --git a/configure b/configure
index dd9608540e..74f8ba4c57 100755
--- a/configure
+++ b/configure
@@ -5826,7 +5826,8 @@  enabled fontconfig        && enable libfontconfig
 enabled libfontconfig     && require_pkg_config fontconfig "fontconfig/fontconfig.h" FcInit
 enabled libfreetype       && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
 enabled libfribidi        && require_pkg_config fribidi fribidi.h fribidi_version_info
-enabled libgme            && require  libgme gme/gme.h gme_new_emu -lgme -lstdc++
+enabled libgme            && { use_pkg_config libgme gme/gme.h gme_new_emu ||
+                               require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
                                    check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
                                done || die "ERROR: libgsm not found"; }