From patchwork Wed Jan 31 16:34:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 45936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:8786:b0:199:de12:6fa6 with SMTP id ph6csp2949668pzb; Wed, 31 Jan 2024 08:34:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHmijhgOAsqJuxz8uOa4RcE1RLup2zhltKf0d989vT9o7gPKDdZNjnAjmCxTddxlG92bti X-Received: by 2002:a05:6402:291:b0:55f:5e7b:7c7c with SMTP id l17-20020a056402029100b0055f5e7b7c7cmr1483516edv.29.1706718859418; Wed, 31 Jan 2024 08:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706718859; cv=none; d=google.com; s=arc-20160816; b=sN854bY2E+Vpjtm/z2fCDmjKUw1mPv3O30yp7030Yuba2Q2/mA5FjyiT/FEAQ+0DkR QrIrS0o44qO+eyIQs46827FQI0RMgEhLV3DRvSxHzd9PHc8A+cu/EveRqw44WXxtyGbO QIhmpF+V+EGOGwSJ1oTVHHMIjGgJvWpvhItffNeJcyoqFeFGSKc25mPqmzdIPHO4cYGR hp+T+C0ZTnJEa3aAC/3aK2wBAtcAEkcnktM1HQ82/t7PMYc1ExB3rajU5mInTP5KZ53j YbOMCipQOCSs+ORW14rynx0IlLBZgSUZY/fhikKXTpooQ/xuYTdpPg+JBBrnJt6pzJa/ +Nqw== 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=qy+3+DsMSeaP9U/BT2GpOr1//3DpAPWQdEOXlg/odK4=; fh=Q46kXK7oI5D1Jhi90JBr53c7NIaTxGaU4KPeRZyM/hI=; b=jdoGdLquR9ea/5f0KLWsqd7N5r77c/OMeNOn/oa8tQIXcTTpGFFEmF74Vnz6GunkyK RSwnjN/VzGQi6w6564JVpZ8F0EwCD/7DuhA/oO+DuOgRpQumlMOGqLKwBJKWWUpPXPc3 nYVQm+VoMt+DDZ+u30oYKZGQlHnU8DH9wLsNnOXvUYvviARIWBiYfkb9ve4BeWEim9fn E+u6LVKV8D5mk2NVfbkLjPrOD4E7XOpxqb7LjVwlFwZXgT9LvxcMD+zVp/nk/w/UV+44 6h82B0t2LkMF/jCM7eYNui9Ug6d5sBBNRzriTQypjMIZjKz1FTMA5/HIThLsg9ilKTTy 9OBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=acUyssEl; 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 k17-20020a056402341100b0055ef3bf39bfsi3409576edc.186.2024.01.31.08.34.18; Wed, 31 Jan 2024 08:34:19 -0800 (PST) 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=acUyssEl; 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 6C91568CE06; Wed, 31 Jan 2024 18:34:15 +0200 (EET) 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 1DC5668CE06 for ; Wed, 31 Jan 2024 18:34:09 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id ABE2F10600E8 for ; Wed, 31 Jan 2024 16:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1706718848; 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=4agZLfykAkC2tLwCuzXLX9+Q2csiTsy/lDtwkCeGNOc=; b=acUyssElqYy35ZkMA7kLYP6UHfaFjKHpIIHltuAtSjFAz2BkXzDKX1MrqG1hEmCh JQirBbpdGLe6I8HWbuayK5K1A7zEg2QgEPGz4CEwijFPE/KxOZ/+zm5IgXlr+EhWeoS ktMbGxK83SQK9SLkFi+7U+c7p+cWO3WWT2iNKCRy9LEUc34p8EOCHdsmGw7qbHdxyNg IZzPZWF0lpIgDiqE+SS0KQ2RndbvdcnvZeoVyZe/E3kJQyHqrmrPTmwx6UbjxfJOge0 Yc/iju0bBM2duaa+jAIZsUwcjjm8PsCbvSB+Xo3mo8ZlGTjoQQ/j4JDYguGo7I6n+iO VlnqHOe+lg== Date: Wed, 31 Jan 2024 17:34:08 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: fix compilation with glslang 14 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: IbucUeoLjITH 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. From 2c33a103832901579cc90a4da2d6eb17e233d9da Mon Sep 17 00:00:00 2001 From: Lynne 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