| Message ID | 20200817232123.149267-1-philipl@overt.org |
|---|---|
| State | Accepted |
| Commit | 98ea1a662ee172961feaa374fe8d26078838d250 |
| Headers | show |
| Series | [FFmpeg-devel] configure: Add additional glslang libraries to make linking work | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
This patch is needed to fix compilation on windows using the git master branches of both glslang and ffmpeg, although I don't know what version or commit of glslang started to require it, the earliest record I have of this issue is july 5th.
On Mon, Aug 17, 2020 at 16:21:23 -0700, Philip Langdale wrote: > The latest builds of glslang introduce new libraries that need to be > linked for all symbols to be fully resolved. > > Presumably, requiring these new libraries breaks building against > older glslang releases? What range are we committing to supporting? I know nothing about glslang, but: This is the commit that introduced these new libraries on June 30 2020: https://github.com/KhronosGroup/glslang/commit/b8c3386ec00b9de2925732c0a29c588d60f8c8fd I'm also sure your change will break build against glslang older than that commit. glslang didn't put any (internal or external) version bump into this commit, and hasn't released it. There does exist a GLSLANG_PATCH_LEVEL, perhaps you can test against that, or just test whether the configure tests fails with those new libs, and fall back to using only the old list. Just speculation, Moritz
diff --git a/configure b/configure index 07e07850e8..4bff8d53ce 100755 --- a/configure +++ b/configure @@ -6343,7 +6343,7 @@ enabled fontconfig && enable libfontconfig enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info -enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ +enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ enabled libgme && { check_pkg_config libgme 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
The latest builds of glslang introduce new libraries that need to be linked for all symbols to be fully resolved. Presumably, requiring these new libraries breaks building against older glslang releases? What range are we committing to supporting? Signed-off-by: Philip Langdale <philipl@overt.org> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)