[FFmpeg-devel] [FFmpeg-cvslog] Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'

[James Almer]

On 10/13/2017 1:48 PM, James Almer wrote:
> So in here it's including the libraries libopenmpt.pc said it needed
> (using pkg-config --static). Are "-lshlwapi -lpthread -lcrypt32"
> extralibs you added manually, or were they derived from dependencies
> like libmpg123, vorbis, etc by pkg-config?
> 
> Also, all the errors below mention functions from the c++ standard
> library, so it looks like libopenmpt.pc should be including -lstdc++
> in Libs.private but it doesn't? I see that libopempt depends on
> PortAudiocpp to build, so i'm guessing that's indeed the case.
> 
> See if adding -lstdc++ fixes it. If it does then it means that, before
> the commit that introduced these issues, a previous library you
> requested (maybe libgme) added -lstdc++ to the global ldflags.
> It would for that matter help a lot if you post the exact configure line
> you're using.

The attached patch adds the -lstdc++ flag to the check as i mentioned
above. See if it fixes it.
-------------- next part --------------
From 276ed55b9427aa21cd56b9511614b0d5df1081bc Mon Sep 17 00:00:00 2001
From: James Almer <jamrial at gmail.com>
Date: Fri, 13 Oct 2017 15:16:55 -0300
Subject: [PATCH] configure: add a -lstdc++ flag to the libopenmpt check

It's missing in the pkg-config file, so add it here as a workaround.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 64fd088208..14b3b9f6c0 100755
--- a/configure
+++ b/configure
@@ -6030,7 +6030,7 @@ enabled libopenjpeg       && { { check_lib libopenjpeg openjpeg-2.3/openjpeg.h o
                                { check_lib libopenjpeg openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                { check_lib libopenjpeg openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
                                die "ERROR: libopenjpeg not found"; }
-enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create
+enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++
 enabled libopus           && {
     enabled libopus_decoder && {
         require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
-- 
2.14.2