Message ID | 5fcf45e6-2604-1a9c-5d86-46ab9a923969@bonslack.org |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel] Build failed with newer glslang | expand |
Context | Check | Description |
---|---|---|
yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
andriy/configure_x86 | warning | Failed to apply patch |
On date Tuesday 2023-08-29 11:33:43 +0200, Luca Bonissi wrote: > Newer glslang does no more provide static libraries libOSDependent.a and > libOGLCompiler.a. > These libraries are only used in configure's test to detect spirv_compiler, > but are no more necessary even with older glslang. > > The following patch fixes the build issue. > > Signed-off-by: Luca Bonissi <ffmpeg@bonslack.org> > -- > > --- ffmpeg-5.1.3/configure.orig 2023-03-26 16:21:00.000000000 +0200 > +++ ffmpeg-5.1.3/configure 2023-08-29 10:50:29.433307045 +0200 Please use git format-patch and send a patch against current mainline (also the patch below seems mangled): https://ffmpeg.org/developer.html#Submitting-patches
--- ffmpeg-5.1.3/configure.orig 2023-03-26 16:21:00.000000000 +0200 +++ ffmpeg-5.1.3/configure 2023-08-29 10:50:29.433307045 +0200 @@ -6551,10 +6551,10 @@ 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 && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ - -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \ + -lglslang -lMachineIndependent -lHLSL -lGenericCodeGen \ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm || require spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
Newer glslang does no more provide static libraries libOSDependent.a and libOGLCompiler.a. These libraries are only used in configure's test to detect spirv_compiler, but are no more necessary even with older glslang. The following patch fixes the build issue. Signed-off-by: Luca Bonissi <ffmpeg@bonslack.org> -- - -lglslang -lOSDependent -lHLSL -lOGLCompiler \ + -lglslang -lHLSL \ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; } enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }