diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile index fb809eacb740..5f0a8cd4ac55 100644 --- a/graphics/glslang/Makefile +++ b/graphics/glslang/Makefile @@ -1,17 +1,17 @@ PORTNAME= glslang -DISTVERSION= 12.2.0 +DISTVERSION= 12.3.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenGL and OpenGL ES shader front end and validator WWW= https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ LICENSE= APACHE20 BSD2CLAUSE BSD3CLAUSE GPLv3+ MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= cmake:testing compiler:c++11-lib python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup .include diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo index 1ddceb243441..fe4d8ee0e236 100644 --- a/graphics/glslang/distinfo +++ b/graphics/glslang/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684356476 -SHA256 (KhronosGroup-glslang-12.2.0_GH0.tar.gz) = 870d17030fda7308c1521fb2e01a9e93cbe4b130bc8274e90d00e127432ab6f6 -SIZE (KhronosGroup-glslang-12.2.0_GH0.tar.gz) = 3706316 +TIMESTAMP = 1689793027 +SHA256 (KhronosGroup-glslang-12.3.0_GH0.tar.gz) = 45e0c7efad184206495aa1888c9008e168628fd1d3867a6975a7cd61dd11f53f +SIZE (KhronosGroup-glslang-12.3.0_GH0.tar.gz) = 3718594 diff --git a/graphics/glslang/files/patch-StandAlone_CMakeLists.txt b/graphics/glslang/files/patch-StandAlone_CMakeLists.txt new file mode 100644 index 000000000000..71df7ac264e5 --- /dev/null +++ b/graphics/glslang/files/patch-StandAlone_CMakeLists.txt @@ -0,0 +1,11 @@ +--- StandAlone/CMakeLists.txt.orig 2023-07-19 18:57:07 UTC ++++ StandAlone/CMakeLists.txt +@@ -117,7 +117,7 @@ if(ENABLE_GLSLANG_INSTALL) + # Create the same symlink at install time + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${legacy_glslang_name} \ +- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") ++ WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") + + if(ENABLE_SPVREMAPPER) + install(TARGETS spirv-remap EXPORT glslang-targets) diff --git a/graphics/glslang/pkg-plist b/graphics/glslang/pkg-plist index 5318ccae0e43..9121ca68067a 100644 --- a/graphics/glslang/pkg-plist +++ b/graphics/glslang/pkg-plist @@ -1,87 +1,88 @@ +bin/glslang bin/glslangValidator bin/spirv-remap include/glslang/HLSL/hlslAttributes.h include/glslang/HLSL/hlslGrammar.h include/glslang/HLSL/hlslOpMap.h include/glslang/HLSL/hlslParseHelper.h include/glslang/HLSL/hlslParseables.h include/glslang/HLSL/hlslScanContext.h include/glslang/HLSL/hlslTokenStream.h include/glslang/HLSL/hlslTokens.h include/glslang/Include/BaseTypes.h include/glslang/Include/Common.h include/glslang/Include/ConstantUnion.h include/glslang/Include/InfoSink.h include/glslang/Include/InitializeGlobals.h include/glslang/Include/PoolAlloc.h include/glslang/Include/ResourceLimits.h include/glslang/Include/ShHandle.h include/glslang/Include/SpirvIntrinsics.h include/glslang/Include/Types.h include/glslang/Include/arrays.h include/glslang/Include/glslang_c_interface.h include/glslang/Include/glslang_c_shader_types.h include/glslang/Include/intermediate.h include/glslang/MachineIndependent/Initialize.h include/glslang/MachineIndependent/LiveTraverser.h include/glslang/MachineIndependent/ParseHelper.h include/glslang/MachineIndependent/RemoveTree.h include/glslang/MachineIndependent/Scan.h include/glslang/MachineIndependent/ScanContext.h include/glslang/MachineIndependent/SymbolTable.h include/glslang/MachineIndependent/Versions.h include/glslang/MachineIndependent/attribute.h include/glslang/MachineIndependent/gl_types.h include/glslang/MachineIndependent/glslang_tab.cpp.h include/glslang/MachineIndependent/iomapper.h include/glslang/MachineIndependent/localintermediate.h include/glslang/MachineIndependent/parseVersions.h include/glslang/MachineIndependent/preprocessor/PpContext.h include/glslang/MachineIndependent/preprocessor/PpTokens.h include/glslang/MachineIndependent/propagateNoContraction.h include/glslang/MachineIndependent/reflection.h include/glslang/Public/ResourceLimits.h include/glslang/Public/ShaderLang.h include/glslang/Public/resource_limits_c.h include/glslang/SPIRV/GLSL.ext.AMD.h include/glslang/SPIRV/GLSL.ext.ARM.h include/glslang/SPIRV/GLSL.ext.EXT.h include/glslang/SPIRV/GLSL.ext.KHR.h include/glslang/SPIRV/GLSL.ext.NV.h include/glslang/SPIRV/GLSL.std.450.h include/glslang/SPIRV/GlslangToSpv.h include/glslang/SPIRV/Logger.h include/glslang/SPIRV/NonSemanticDebugPrintf.h include/glslang/SPIRV/NonSemanticShaderDebugInfo100.h include/glslang/SPIRV/SPVRemapper.h include/glslang/SPIRV/SpvBuilder.h include/glslang/SPIRV/SpvTools.h include/glslang/SPIRV/bitutils.h include/glslang/SPIRV/disassemble.h include/glslang/SPIRV/doc.h include/glslang/SPIRV/hex_float.h include/glslang/SPIRV/spirv.hpp include/glslang/SPIRV/spvIR.h include/glslang/build_info.h lib/cmake/HLSLTargets.cmake lib/cmake/OGLCompilerTargets.cmake lib/cmake/OSDependentTargets.cmake lib/cmake/SPIRVTargets.cmake lib/cmake/SPVRemapperTargets.cmake lib/cmake/glslang-default-resource-limitsTargets.cmake +lib/cmake/glslang-standaloneTargets.cmake lib/cmake/glslang/glslang-config-version.cmake lib/cmake/glslang/glslang-config.cmake lib/cmake/glslang/glslang-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/glslang/glslang-targets.cmake lib/cmake/glslangTargets.cmake -lib/cmake/glslangValidatorTargets.cmake lib/cmake/spirv-remapTargets.cmake lib/libGenericCodeGen.a lib/libHLSL.a lib/libMachineIndependent.a lib/libOGLCompiler.a lib/libOSDependent.a lib/libSPIRV.a lib/libSPVRemapper.a lib/libglslang-default-resource-limits.a lib/libglslang.a