diff mbox series

[FFmpeg-devel] configure: fix compilation with glslang 14

Message ID NpVMiKG--3-9@lynne.ee
State New
Headers show
Series [FFmpeg-devel] configure: fix compilation with glslang 14 | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Lynne Jan. 31, 2024, 4:34 p.m. UTC 
The configure check already had fallback for the previous version
of glslang, which had different requirements for flags.
This commit simply moves the flags needed for glslang 13 to the
fallback, while first trying to use new flags for glslang 14.

This drops support for ~3 year old glslang versions, which
I'm not sure had the complete C API we're using anyway.

Patch attached.

Comments

Philip Langdale Feb. 3, 2024, 6:19 a.m. UTC | #1 
On Wed, 31 Jan 2024 17:34:08 +0100 (CET)
Lynne <dev@lynne.ee> wrote:

> The configure check already had fallback for the previous version
> of glslang, which had different requirements for flags.
> This commit simply moves the flags needed for glslang 13 to the
> fallback, while first trying to use new flags for glslang 14.
> 
> This drops support for ~3 year old glslang versions, which
> I'm not sure had the complete C API we're using anyway.
> 
> Patch attached.
> 

LGTM.


--phil
diff mbox series

Patch

From 2c33a103832901579cc90a4da2d6eb17e233d9da Mon Sep 17 00:00:00 2001
From: Lynne <dev@lynne.ee>
Date: Wed, 31 Jan 2024 17:28:56 +0100
Subject: [PATCH] configure: fix compilation with glslang 14

The configure check already had fallback for the previous version
of glslang, which had different requirements for flags.
This commit simply moves the flags needed for glslang 13 to the
fallback, while first trying to use new flags for glslang 14.

This drops support for ~3 year old glslang versions, which
I'm not sure had the complete C API we're using anyway.
---
 configure | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 68f675a4bc..421d182c97 100755
--- a/configure
+++ b/configure
@@ -6772,11 +6772,11 @@  enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.
 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 \
-                            -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+                            -lglslang -lMachineIndependent -lGenericCodeGen \
                             -lSPVRemapper -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 -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+                            -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++; }
 enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-- 
2.43.0.381.gb435a96ce8