The branch, release/7.1 has been updated
via 292b30bbe01d9aedd02adfe4d8516537a215c5ca (commit)
from f65fc0b13754c94d6185b1b18e604b8129d4f774 (commit)
- Log -----------------------------------------------------------------
commit 292b30bbe01d9aedd02adfe4d8516537a215c5ca
Author: Gyan Doshi <[email protected]>
AuthorDate: Sun Sep 28 13:20:23 2025 +0530
Commit: Marvin Scholz <[email protected]>
CommitDate: Mon Dec 1 16:49:31 2025 +0100
configure: unbreak glslang build
Don't unconditionally link to libSPVRemapper which was removed in 16.0 in
3a7f787
diff --git a/configure b/configure
index 98b582a5d5..32b920240f 100755
--- a/configure
+++ b/configure
@@ -6917,12 +6917,16 @@ enabled libfontconfig && require_pkg_config
libfontconfig fontconfig "fontco
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 libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h
hb_buffer_create
-enabled libglslang && { check_lib spirv_compiler
glslang/Include/glslang_c_interface.h glslang_initialize_process \
+if enabled libglslang; then
+ spvremap="-lSPVRemapper"
+ require_headers "glslang/build_info.h" && { test_cpp_condition
glslang/build_info.h "GLSLANG_VERSION_MAJOR >= 16" && spvremap="" ; }
+ check_lib spirv_compiler glslang/Include/glslang_c_interface.h
glslang_initialize_process \
-lglslang -lMachineIndependent -lGenericCodeGen \
- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt
-lSPIRV-Tools -lpthread -lstdc++ -lm ||
+ ${spvremap} -lSPIRV -lSPIRV-Tools-opt
-lSPIRV-Tools -lpthread -lstdc++ -lm ||
require spirv_compiler
glslang/Include/glslang_c_interface.h glslang_initialize_process \
-lglslang -lMachineIndependent -lOSDependent
-lHLSL -lOGLCompiler -lGenericCodeGen \
- -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt
-lSPIRV-Tools -lpthread -lstdc++ -lm ; }
+ ${spvremap} -lSPIRV -lSPIRV-Tools-opt
-lSPIRV-Tools -lpthread -lstdc++ -lm ;
+fi
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
-----------------------------------------------------------------------
Summary of changes:
configure | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
