Index: head/graphics/glslang/Makefile =================================================================== --- head/graphics/glslang/Makefile (revision 559201) +++ head/graphics/glslang/Makefile (revision 559202) @@ -1,22 +1,23 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 8.13.3743 +DISTVERSIONPREFIX= 10- +DISTVERSION= 11.0.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenGL and OpenGL ES shader front end and validator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKDIR}/LICENSE USES= cmake compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= KhronosGroup post-extract: ${SED} '/^$$/,$$d' ${WRKSRC}/${PORTNAME}/Include/Types.h \ >${WRKDIR}/LICENSE .include Index: head/graphics/glslang/distinfo =================================================================== --- head/graphics/glslang/distinfo (revision 559201) +++ head/graphics/glslang/distinfo (revision 559202) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589409209 -SHA256 (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 639ebec56f1a7402f2fa094469a5ddea1eceecfaf2e9efe361376a0f73a7ee2f -SIZE (KhronosGroup-glslang-8.13.3743_GH0.tar.gz) = 3183453 +TIMESTAMP = 1603744150 +SHA256 (KhronosGroup-glslang-10-11.0.0_GH0.tar.gz) = 30c12243574d38407d137ea4581743732b893c8246b687e589bf5a6b02e83172 +SIZE (KhronosGroup-glslang-10-11.0.0_GH0.tar.gz) = 3246205 Index: head/graphics/glslang/pkg-plist =================================================================== --- head/graphics/glslang/pkg-plist (revision 559201) +++ head/graphics/glslang/pkg-plist (revision 559202) @@ -1,91 +1,84 @@ bin/glslangValidator bin/spirv-remap -include/SPIRV/GLSL.ext.AMD.h -include/SPIRV/GLSL.ext.EXT.h -include/SPIRV/GLSL.ext.KHR.h -include/SPIRV/GLSL.ext.NV.h -include/SPIRV/GLSL.std.450.h -include/SPIRV/GlslangToSpv.h -include/SPIRV/Logger.h -include/SPIRV/NonSemanticDebugPrintf.h -include/SPIRV/SPVRemapper.h -include/SPIRV/SpvBuilder.h -include/SPIRV/SpvTools.h -include/SPIRV/bitutils.h -include/SPIRV/disassemble.h -include/SPIRV/doc.h -include/SPIRV/hex_float.h -include/SPIRV/spirv.hpp -include/SPIRV/spvIR.h +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/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/Include/revision.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/ShaderLang.h include/glslang/SPIRV/GLSL.ext.AMD.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/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_BUILD_TYPE%%.cmake lib/cmake/HLSLTargets.cmake lib/cmake/OGLCompilerTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OGLCompilerTargets.cmake lib/cmake/OSDependentTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/OSDependentTargets.cmake lib/cmake/SPIRVTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SPIRVTargets.cmake lib/cmake/SPVRemapperTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/SPVRemapperTargets.cmake lib/cmake/glslangTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/glslangTargets.cmake lib/cmake/glslangValidatorTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/glslangValidatorTargets.cmake lib/cmake/spirv-remapTargets-%%CMAKE_BUILD_TYPE%%.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.a Index: head/graphics/vulkan-validation-layers/Makefile =================================================================== --- head/graphics/vulkan-validation-layers/Makefile (revision 559201) +++ head/graphics/vulkan-validation-layers/Makefile (revision 559202) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= vulkan-validation-layers DISTVERSIONPREFIX= v DISTVERSION= 1.2.162 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Validation layers for the Vulkan graphics API LICENSE= APACHE20 # NOTE: keep spirv-tools and glslang up to date when updating Vulkan BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \ - ${LOCALBASE}/include/SPIRV/spirv.hpp:graphics/glslang + ${LOCALBASE}/include/glslang/SPIRV/spirv.hpp:graphics/glslang USES= cmake compiler:c++11-lib pkgconfig python:3.4+,build USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-ValidationLayers GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers # WSI_* in here are leftover from when all of Vulkan SDK was in one repo CMAKE_OFF= BUILD_TESTS ${WAYLAND XCB XLIB:L:C/.*/BUILD_WSI_&_SUPPORT/} CMAKE_ON= BUILD_LAYER_SUPPORT_FILES CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \ -DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}" .include Index: head/multimedia/ffmpeg/files/patch-glslang-11 =================================================================== --- head/multimedia/ffmpeg/files/patch-glslang-11 (nonexistent) +++ head/multimedia/ffmpeg/files/patch-glslang-11 (revision 559202) @@ -0,0 +1,24 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/98ea1a662ee1 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/4dab04622a6c + +--- configure.orig 2020-06-15 18:54:23 UTC ++++ configure +@@ -6347,7 +6347,7 @@ enabled fontconfig && enable libfontconfig + enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit + enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType + enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info +-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ ++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ + 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 +--- libavfilter/glslang.cpp.orig 2020-07-11 10:39:30 UTC ++++ libavfilter/glslang.cpp +@@ -24,7 +24,6 @@ extern "C" { + } + + #include +-#include + #include + #include + Property changes on: head/multimedia/ffmpeg/files/patch-glslang-11 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property