diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 9654237228cc..68b483a630e6 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,30 +1,40 @@
 --- configure.orig	2024-08-01 23:22:54 UTC
 +++ configure
 @@ -3956,13 +3956,7 @@ host_os=$target_os_default
  host_os=$target_os_default
  
  # machine
 -if test "$target_os_default" = aix; then
 -    arch_default=$(uname -p)
 -    strip_default="strip -X32_64"
 -    nm_default="nm -g -X32_64"
 -else
 -    arch_default=$(uname -m)
 -fi
 +arch_default=$(uname -p)
  cpu="generic"
  intrinsics="none"
  
-@@ -6715,10 +6709,10 @@ enabled libglslang && { check_lib spirv_compiler glsla
+@@ -6714,12 +6708,17 @@ enabled libharfbuzz       && require_pkg_config libhar
+ 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 \
+-enabled libglslang && { check_lib 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 ||
++
++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 -lOSDependent -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 -lOSDependent -lHLSL -lOGLCompiler \
+-                            -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
 +                            -lglslang -lOSDependent \
-                             -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