Date: Fri, 25 Dec 2020 00:31:35 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559202 - in head: graphics/glslang graphics/vulkan-validation-layers multimedia/ffmpeg/files Message-ID: <202012250031.0BP0VZdB040642@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Dec 25 00:31:35 2020 New Revision: 559202 URL: https://svnweb.freebsd.org/changeset/ports/559202 Log: graphics/glslang: update to 11.0.0 Changes: https://github.com/KhronosGroup/glslang/compare/8.13.3743...10-11.0.0 Added: head/multimedia/ffmpeg/files/patch-glslang-11 (contents, props changed) Modified: head/graphics/glslang/Makefile (contents, props changed) head/graphics/glslang/distinfo (contents, props changed) head/graphics/glslang/pkg-plist (contents, props changed) head/graphics/vulkan-validation-layers/Makefile (contents, props changed) Modified: head/graphics/glslang/Makefile ============================================================================== --- head/graphics/glslang/Makefile Thu Dec 24 23:16:42 2020 (r559201) +++ head/graphics/glslang/Makefile Fri Dec 25 00:31:35 2020 (r559202) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= glslang -DISTVERSION= 8.13.3743 +DISTVERSIONPREFIX= 10- +DISTVERSION= 11.0.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org Modified: head/graphics/glslang/distinfo ============================================================================== --- head/graphics/glslang/distinfo Thu Dec 24 23:16:42 2020 (r559201) +++ head/graphics/glslang/distinfo Fri Dec 25 00:31:35 2020 (r559202) @@ -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 Modified: head/graphics/glslang/pkg-plist ============================================================================== --- head/graphics/glslang/pkg-plist Thu Dec 24 23:16:42 2020 (r559201) +++ head/graphics/glslang/pkg-plist Fri Dec 25 00:31:35 2020 (r559202) @@ -1,22 +1,13 @@ 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 @@ -30,7 +21,6 @@ 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 @@ -67,6 +57,7 @@ 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 @@ -83,7 +74,9 @@ lib/cmake/glslangValidatorTargets-%%CMAKE_BUILD_TYPE%% 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 Modified: head/graphics/vulkan-validation-layers/Makefile ============================================================================== --- head/graphics/vulkan-validation-layers/Makefile Thu Dec 24 23:16:42 2020 (r559201) +++ head/graphics/vulkan-validation-layers/Makefile Fri Dec 25 00:31:35 2020 (r559202) @@ -13,7 +13,7 @@ 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 Added: head/multimedia/ffmpeg/files/patch-glslang-11 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/ffmpeg/files/patch-glslang-11 Fri Dec 25 00:31:35 2020 (r559202) @@ -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 <glslang/Include/ResourceLimits.h> +-#include <glslang/Include/revision.h> + #include <glslang/Public/ShaderLang.h> + #include <glslang/SPIRV/GlslangToSpv.h> +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012250031.0BP0VZdB040642>