Source: glslang Version: 11.11.0-1 Followup-For: Bug #1021009 Hi,
> Thanks. Apparently, pkgconf doesn’t accept .pc files indented > by spaces, which spirv.pc and glslang.pc are. As far as I can see, > ruby-pkg-config accepts those, so probably pkgconf should too. Turns out the indented pkg-config files come from a Debian patch, so it’s easy to fix even before the upstream pkgconf is fixed. Please see the attached patch. -- Cheers, Andrej
>From 1cb70969ebce8d6a972866ab6f434f50d5fa9021 Mon Sep 17 00:00:00 2001 From: Andrej Shadura <andrew.shad...@collabora.co.uk> Date: Fri, 30 Sep 2022 15:47:17 +0200 Subject: [PATCH] Unindent .pc files to make them compatible with pkgconf Bug: https://github.com/pkgconf/pkgconf/issues/265 Bug-Debian: https://bugs.debian.org/1016922 --- .../0001-pkg-config-compatibility.patch | 47 +++++++++---------- ...ng-default-resource-limits_staticlib.patch | 10 ++++ .../glslang.pc-Add-missing-libraries.patch | 22 ++++----- ...endencies-on-SPIRV-Tools-and-glslang.patch | 21 ++++----- 4 files changed, 53 insertions(+), 47 deletions(-) diff --git a/debian/patches/0001-pkg-config-compatibility.patch b/debian/patches/0001-pkg-config-compatibility.patch index 275c233b5ee4..a63a6297714c 100644 --- a/debian/patches/0001-pkg-config-compatibility.patch +++ b/debian/patches/0001-pkg-config-compatibility.patch @@ -14,7 +14,7 @@ if(ENABLE_CTEST) include(CTest) endif() -@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -319,11 +326,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) add_subdirectory(External) endif() @@ -56,18 +56,17 @@ --- /dev/null +++ b/glslang/glslang.pc.cmake.in @@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @PROJECT_NAME@ -+ Description: OpenGL and OpenGL ES shader front end and validator -+ Requires: -+ Version: @VERSION@ -+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -+ Cflags: -I${includedir} -\ No newline at end of file ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++Name: @PROJECT_NAME@ ++Description: OpenGL and OpenGL ES shader front end and validator ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++Cflags: -I${includedir} --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC @@ -120,17 +119,17 @@ --- /dev/null +++ b/SPIRV/spirv.pc.cmake.in @@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @SPIRV_NAME@ -+ Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan -+ Requires: -+ Version: @SPIRV_VERSION@ -+ Libs: -L${libdir} -lSPIRV -+ Cflags: -I${includedir} ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++Name: @SPIRV_NAME@ ++Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan ++Requires: ++Version: @SPIRV_VERSION@ ++Libs: -L${libdir} -lSPIRV ++Cflags: -I${includedir} --- a/SPIRV/SpvTools.cpp +++ b/SPIRV/SpvTools.cpp @@ -43,7 +43,7 @@ diff --git a/debian/patches/glslang-default-resource-limits_staticlib.patch b/debian/patches/glslang-default-resource-limits_staticlib.patch index 5fc7c0ddb3be..22eeb1eae054 100644 --- a/debian/patches/glslang-default-resource-limits_staticlib.patch +++ b/debian/patches/glslang-default-resource-limits_staticlib.patch @@ -1,3 +1,13 @@ +From: Debian X Strike Force <debia...@lists.debian.org> +Date: Fri, 30 Sep 2022 15:53:22 +0200 +Subject: glslang-default-resource-limits_staticlib + +--- + StandAlone/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 0275750..e7e6b87 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -47,7 +47,7 @@ add_custom_command( diff --git a/debian/patches/glslang.pc-Add-missing-libraries.patch b/debian/patches/glslang.pc-Add-missing-libraries.patch index b3fa7b4f9ef0..df96fbcc0863 100644 --- a/debian/patches/glslang.pc-Add-missing-libraries.patch +++ b/debian/patches/glslang.pc-Add-missing-libraries.patch @@ -7,19 +7,17 @@ Subject: glslang.pc: Add missing libraries Signed-off-by: Simon McVittie <s...@collabora.com> --- - glslang/glslang.pc.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + glslang/glslang.pc.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in -index 921497e..8c49e0c 100644 +index 1f7cd86..b05c945 100644 --- a/glslang/glslang.pc.cmake.in +++ b/glslang/glslang.pc.cmake.in -@@ -7,5 +7,5 @@ - Description: OpenGL and OpenGL ES shader front end and validator - Requires: - Version: @VERSION@ -- Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -- Cflags: -I${includedir} -\ No newline at end of file -+ Libs: -L${libdir} -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lpthread -+ Cflags: -I${includedir} +@@ -7,5 +7,5 @@ Name: @PROJECT_NAME@ + Description: OpenGL and OpenGL ES shader front end and validator + Requires: + Version: @VERSION@ +-Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++Libs: -L${libdir} -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lpthread + Cflags: -I${includedir} diff --git a/debian/patches/spirv.pc-Add-dependencies-on-SPIRV-Tools-and-glslang.patch b/debian/patches/spirv.pc-Add-dependencies-on-SPIRV-Tools-and-glslang.patch index 160832d68549..1d7c8506b96c 100644 --- a/debian/patches/spirv.pc-Add-dependencies-on-SPIRV-Tools-and-glslang.patch +++ b/debian/patches/spirv.pc-Add-dependencies-on-SPIRV-Tools-and-glslang.patch @@ -23,16 +23,15 @@ Signed-off-by: Simon McVittie <s...@collabora.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPIRV/spirv.pc.cmake.in b/SPIRV/spirv.pc.cmake.in -index dfcad94..d47d427 100644 +index 5a2b926..496d415 100644 --- a/SPIRV/spirv.pc.cmake.in +++ b/SPIRV/spirv.pc.cmake.in -@@ -5,7 +5,7 @@ - - Name: @SPIRV_NAME@ - Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan -- Requires: -+ Requires: SPIRV-Tools, glslang - Version: @SPIRV_VERSION@ - Libs: -L${libdir} -lSPIRV - Cflags: -I${includedir} -\ No newline at end of file +@@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ + + Name: @SPIRV_NAME@ + Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan +-Requires: ++Requires: SPIRV-Tools, glslang + Version: @SPIRV_VERSION@ + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} -- 2.35.1
