From patchwork Sat Oct 14 16:38:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 44260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b15:b0:15d:8365:d4b8 with SMTP id fp21csp1674059pzb; Sat, 14 Oct 2023 09:38:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+2FP+pd0b+0RmtTVZV97Px8fiWDIGXwkpFL9mz1MxoAb2X5U+0fFkB+aojFhadglPSZaD X-Received: by 2002:a17:907:6ea5:b0:9bd:f3b0:c090 with SMTP id sh37-20020a1709076ea500b009bdf3b0c090mr3766038ejc.2.1697301523057; Sat, 14 Oct 2023 09:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697301523; cv=none; d=google.com; s=arc-20160816; b=EotGQg7nJ+JsK315K25pSTyJf4EPb423Jzj2T8hePzLaNnRKQSTU/kGT3676CkkZDy kkdt0n73z910+bOjBSZnS7KFCYcFTL7nWapHNg7HMKf/yOFWh8F3B35GQyRftuFcNK47 /lzbOEpdhHxQIrgNm7bSmrMUtctrCs9619vVGrI2BHsM/GLGJBCK85ruANO1vxP6z6GN TjCUZFxU3n6VrM+3jrF1NbkjH+BqSpn4Ub96NTNOOF+prA5rGAcIiK6Oj3d9V11KnB3l 6WxmhEvasmVvmnx74XKNq6mAnM+de0IhvLLaWvxwehDZb3gMTnA/kAK4YQYEA9gGJSRJ sQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=NMLaid4I+X9jUFxiYf2I8J6I6fkJV3LpMi7k9DZtg2s=; fh=Q46kXK7oI5D1Jhi90JBr53c7NIaTxGaU4KPeRZyM/hI=; b=o1DM1q5p8NwM7p64XigzYGZ8qrHhFVn51TAVKFcS80tpeVuCvpik2CWftg1aOr6Npw W9iUgcw//o+TGV2mrx4cOtZwS3fZj1Q3aSdC80Lstb662BH+LkzjI9IhZoUZHL9vz3rh bwGsAS6MaUUJH/ZYx5WogkEYhjbI++RRVMLBQJGnmxFa02v6F7A/K5lEt1evmSdYMC4B QaM4Q6ojrsu5r/Nzn27kVpsUrybQ+NeDNaIT/0Rwl7g3ZtXTfMNlcRAakN0kwviZRcuN o9xiuA0NT3i89hIpVcrBiDgAeB92paLCDtVlFigkuTG+n3LL2s/nFJPpFB4w9vor0FuP T2Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=aHISP6Ps; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q27-20020a170906145b00b0099bbed21b65si923553ejc.1014.2023.10.14.09.38.42; Sat, 14 Oct 2023 09:38:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=aHISP6Ps; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A50F68C6DE; Sat, 14 Oct 2023 19:38:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A45C068C3D6 for ; Sat, 14 Oct 2023 19:38:32 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 571AF10600DF for ; Sat, 14 Oct 2023 16:38:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1697301511; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=dTs+6BDRxhGw85SOjatuRMS/8uhdtA8+G+EJSJvbPTQ=; b=aHISP6Ps9I8UW3z4ma5dNINu1/oeBagdR+HmUYECKmHC0rDg93MP9RIB7m+E+ooI pyBBISCcF0vLtLdFl4eZgBc2S/DCxmc19NgCPl2uB+sLyBHqtMX/EtX7v3OF+eLwOU0 NE1jEALjkRgFeL2syQBA2BuvfCtVrmqa8q0/VI8WXlt/E8330skJBNzcjgVDa1YkUao v15czfQjV8BXgWh37o5IALVjtOMw/yYGFnxuWWj6qtObTIzaMkqshI5q0jOlqEwC7Uf I+W0E1VjbAss7eY1DuG+cmkZv8D8F2xgX+yqi67ZXcME5pQZ3WQw99Lxk4wzqjZeQYr lbFME2RDUg== Date: Sat, 14 Oct 2023 18:38:31 +0200 (CEST) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: disable libglslang/libshaderc if the vulkan is disabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F4d23qOhB3L8 Fixes build failures when the Vulkan headers are too old and libglslang or libshaderc are enabled. Patch attached. Tested-by: Tristan Matthews From b47d5d3759f9c3de15846ae0fa184f1fa93f2c9a Mon Sep 17 00:00:00 2001 From: Lynne 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