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

[Ricardo Constantino]

On 12 July 2017 at 08:43, wm4 <nfxjfg at googlemail.com> wrote:
> On Tue, 11 Jul 2017 21:56:21 +0100
> Ricardo Constantino <wiiaboo at gmail.com> wrote:
>
>> On 6 July 2017 at 23:16, Ricardo Constantino <wiiaboo at gmail.com> wrote:
>> > On 23 June 2017 at 17:08, wm4 <nfxjfg at googlemail.com> wrote:
>> >> On Fri, 23 Jun 2017 01:53:37 +0100
>> >> Ricardo Constantino <wiiaboo at 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.