From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8CD8D4893F for ; Mon, 22 Jan 2024 12:20:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DFD5E68CCFE; Mon, 22 Jan 2024 14:20:40 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50B0A68BE60 for ; Mon, 22 Jan 2024 14:20:34 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 40MCKXFO024355-40MCKXFP024355 for ; Mon, 22 Jan 2024 14:20:33 +0200 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 1A958A1482 for ; Mon, 22 Jan 2024 14:20:32 +0200 (EET) Date: Mon, 22 Jan 2024 14:20:28 +0200 (EET) From: =?ISO-8859-15?Q?Martin_Storsj=F6?= To: FFmpeg development discussions and patches In-Reply-To: <54626366-fd2c-41c4-ab5a-05d4b41f091d@rothenpieler.org> Message-ID: <69fee92-3969-d1a3-59e6-5a7d5baada1@martin.st> References: <20240122075000.1137a42c@pineapple> <54626366-fd2c-41c4-ab5a-05d4b41f091d@rothenpieler.org> MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH] configure: autodetect libglslang ldflags 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, 22 Jan 2024, Timo Rothenpieler wrote: > On 22/01/2024 07:51, Matthew White via ffmpeg-devel wrote: >> Since glslang 14.0.0, OGLCompiler and HLSL stub libraries have been >> fully removed from the build. >> >> This fixes the configuration by detecting if the stub libraries are >> still present (glslang releases before version 14.0.0). >> >> ffbuild/config.log: >> /usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: >> cannot find -lOSDependent: No such file or directory >> /usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: >> cannot find -lHLSL: No such file or directory >> /usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: >> cannot find -lOGLCompiler: No such file or directory >> >> Addresses https://trac.ffmpeg.org/ticket/10713 >> See https://bugs.gentoo.org/show_bug.cgi?id=918989 >> Should fix >> https://ffmpeg.org/pipermail/ffmpeg-devel/2023-August/313666.html >> >> Signed-off-by: Matthew White >> --- >> configure | 23 +++++++++++++++++++++-- >> 1 file changed, 21 insertions(+), 2 deletions(-) >> >> diff --git a/configure b/configure >> index c8ae0a061d..abff488dc0 100755 >> --- a/configure >> +++ b/configure >> @@ -2626,6 +2626,7 @@ CMDLINE_SET=" >> ignore_tests >> install >> ld >> + libglslang_ldflags >> ln_s >> logfile >> malloc_prefix >> @@ -6652,6 +6653,24 @@ if enabled_all libglslang libshaderc; then >> die "ERROR: libshaderc and libglslang are mutually exclusive, if in >> doubt, disable libglslang" >> fi >> +if enabled libglslang; then >> + if [ -x "$(command -v glslang)" ]; then >> + # https://github.com/KhronosGroup/glslang >> + # commit 6be56e45e574b375d759b89dad35f780bbd4792f: Remove >> `OGLCompiler` and `HLSL` stub libraries from build >> + # StandAlone/StandAlone.cpp: >> "SpirvGeneratorVersion:GLSLANG_VERSION_MAJOR.GLSLANG_VERSION_MINOR.GLSLANG_VERSION_PATCH >> GLSLANG_VERSION_FLAVOR" >> + glslang_version="$(glslang -dumpversion)" >> + glslang_major="${glslang_version%%.*}" >> + glslang_major="${glslang_major#*:}" >> + if test ${glslang_major} -le 13; then >> + libglslang_ldflags=" -lOSDependent -lHLSL -lOGLCompiler" >> + elif ! [[ ${glslang_major} =~ ^[0-9]+$ ]]; then >> + die "ERROR: glslang's computed major version isn't a number: >> '${glslang_major}'" >> + fi >> + else >> + die "ERROR: glslang binary not found, impossible to determine >> installed glslang's version" >> + fi >> +fi >> + > > Does that library really not have a sane pkg-config file? > This kind of guesswork in configure is extremely ugly. Also, how does this work when cross compiling - won't the "glslang" binary be for the foreign cross target? Or is it something like the sdl-config script which is a local shell script that can give relevant build flags (a design preceding pkg-config)? // Martin _______________________________________________ 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".