diff mbox series

[FFmpeg-devel] configure: disable libglslang/libshaderc if the vulkan is disabled

Message ID Ngj2Qmx--3-9@lynne.ee
State New
Headers show
Series [FFmpeg-devel] configure: disable libglslang/libshaderc if the vulkan is disabled | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Lynne Oct. 14, 2023, 4:38 p.m. UTC 
Fixes build failures when the Vulkan headers are too old and libglslang
or libshaderc are enabled.

Patch attached.

Comments

Tristan Matthews Oct. 15, 2023, 1:47 p.m. UTC | #1 
On Sat, Oct 14, 2023 at 12:38 PM Lynne <dev@lynne.ee> wrote:
>
> Fixes build failures when the Vulkan headers are too old and libglslang
> or libshaderc are enabled.

This fixes https://trac.ffmpeg.org/ticket/10596

Tested-by: Tristan Matthews <tmatth@videolan.org>

>
> Patch attached.
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Lynne Oct. 15, 2023, 3:12 p.m. UTC | #2 
Oct 15, 2023, 15:47 by tmatth@videolan.org:

> On Sat, Oct 14, 2023 at 12:38 PM Lynne <dev@lynne.ee> wrote:
>
>>
>> Fixes build failures when the Vulkan headers are too old and libglslang
>> or libshaderc are enabled.
>>
>
> This fixes https://trac.ffmpeg.org/ticket/10596
>
> Tested-by: Tristan Matthews <tmatth@videolan.org>
>

Thanks, pushed
diff mbox series

Patch

From b47d5d3759f9c3de15846ae0fa184f1fa93f2c9a Mon Sep 17 00:00:00 2001
From: Lynne <dev@lynne.ee>
Date: Sat, 14 Oct 2023 18:36:46 +0200
Subject: [PATCH] configure: disable libglslang/libshaderc if the vulkan is
 disabled

Fixes build failures when the Vulkan headers are too old and libglslang
or libshaderc are enabled.
---
 configure | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure b/configure
index fc7263bf59..582525db30 100755
--- a/configure
+++ b/configure
@@ -7155,6 +7155,10 @@  if enabled vulkan; then
         check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 255)"
 fi
 
+if disabled vulkan; then
+    disable libglslang libshaderc spirv_compiler
+fi
+
 if enabled x86; then
     case $target_os in
         mingw32*|mingw64*|win32|win64|linux|cygwin*)
-- 
2.42.0