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 1B60A48938 for ; Mon, 22 Jan 2024 12:17:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9436D68CCFE; Mon, 22 Jan 2024 14:17:40 +0200 (EET) Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AD7C68A9EA for ; Mon, 22 Jan 2024 14:17:34 +0200 (EET) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 65EA328A8E08C for ; Mon, 22 Jan 2024 13:17:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1705925853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VWxH6m/gepIfaAWL/s0k/Xln4HBvVLAV/5UH/tXPNOo=; b=rmVLFn7PwpIJoyWEw3iv6AQ+zifL2izXchiD9lWU0qPikYodDZtWHD1rXYcH4wyvb87gvX rorYLa2Oaizctxszv+OSxjSIxMrU4lU7rNgUb1u4GtBq13a1WHKvfzwg7OygBxyPoj19dp RuP7U4luVv+VF1MPjXdabUe+UHbceltRK7Lk4VXNHvk5p5h/qvOruP0vVzdIarhVXvehFs wyn7M9SbO0r2wgTnSUwAWfmeup12W+WnA1wl0gddjfjr7S8GApmB4G9SwYOh1jOUXrlpr1 3FqsqfTPfJ8IATbWMZqKdzPKHE78UqM63Sp9XEyumpqeNCympgdym1tAalcUcQ== Message-ID: <54626366-fd2c-41c4-ab5a-05d4b41f091d@rothenpieler.org> Date: Mon, 22 Jan 2024 13:17:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240122075000.1137a42c@pineapple> Content-Language: en-US, de-DE From: Timo Rothenpieler In-Reply-To: <20240122075000.1137a42c@pineapple> 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 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. > check_cpp_condition winrt windows.h "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" > > if ! disabled w32threads && ! enabled pthreads; then > @@ -6771,10 +6790,10 @@ 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 "${libglslang_ldflags}" -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 \ > + -lglslang "${libglslang_ldflags}" \ > -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++; } > > > _______________________________________________ > 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". _______________________________________________ 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".