ports/opt (3.5): glslang: 7.12.3352 -> 7.13.3496
commit 161f4f96f0b6daadbf291ae18f3b2d40da831fda Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Nov 23 18:47:50 2019 +1100 glslang: 7.12.3352 -> 7.13.3496 diff --git a/glslang/.footprint b/glslang/.footprint index 41858ee2c..db1888fce 100644 --- a/glslang/.footprint +++ b/glslang/.footprint @@ -3,23 +3,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/glslangValidator -rwxr-xr-x root/root usr/bin/spirv-remap drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/SPIRV/ --rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.AMD.h --rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.EXT.h --rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.KHR.h --rw-r--r-- root/root usr/include/SPIRV/GLSL.ext.NV.h --rw-r--r-- root/root usr/include/SPIRV/GLSL.std.450.h --rw-r--r-- root/root usr/include/SPIRV/GlslangToSpv.h --rw-r--r-- root/root usr/include/SPIRV/Logger.h --rw-r--r-- root/root usr/include/SPIRV/SPVRemapper.h --rw-r--r-- root/root usr/include/SPIRV/SpvBuilder.h --rw-r--r-- root/root usr/include/SPIRV/SpvTools.h --rw-r--r-- root/root usr/include/SPIRV/bitutils.h --rw-r--r-- root/root usr/include/SPIRV/disassemble.h --rw-r--r-- root/root usr/include/SPIRV/doc.h --rw-r--r-- root/root usr/include/SPIRV/hex_float.h --rw-r--r-- root/root usr/include/SPIRV/spirv.hpp --rw-r--r-- root/root usr/include/SPIRV/spvIR.h drwxr-xr-x root/root usr/include/glslang/ drwxr-xr-x root/root usr/include/glslang/Include/ -rw-r--r-- root/root usr/include/glslang/Include/BaseTypes.h @@ -56,7 +39,43 @@ drwxr-xr-x root/root usr/include/glslang/MachineIndependent/preprocessor/ -rw-r--r-- root/root usr/include/glslang/MachineIndependent/reflection.h drwxr-xr-x root/root usr/include/glslang/Public/ -rw-r--r-- root/root usr/include/glslang/Public/ShaderLang.h +drwxr-xr-x root/root usr/include/glslang/SPIRV/ +-rw-r--r-- root/root usr/include/glslang/SPIRV/GLSL.ext.AMD.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/GLSL.ext.EXT.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/GLSL.ext.KHR.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/GLSL.ext.NV.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/GLSL.std.450.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/GlslangToSpv.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/Logger.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/SPVRemapper.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/SpvBuilder.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/SpvTools.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/bitutils.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/disassemble.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/doc.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/hex_float.h +-rw-r--r-- root/root usr/include/glslang/SPIRV/spirv.hpp +-rw-r--r-- root/root usr/include/glslang/SPIRV/spvIR.h drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/cmake/ +-rw-r--r-- root/root usr/lib/cmake/HLSLTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/HLSLTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets.cmake -rw-r--r-- root/root usr/lib/libHLSL.a -rwxr-xr-x root/root usr/lib/libHLSL.so lrwxrwxrwx root/root usr/lib/libHLSL.so.0 -> libHLSL.so @@ -68,8 +87,7 @@ lrwxrwxrwx root/root usr/lib/libSPIRV.so.0 -> libSPIRV.so -rw-r--r-- root/root usr/lib/libSPVRemapper.a -rwxr-xr-x root/root usr/lib/libSPVRemapper.so lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.0 -> libSPVRemapper.so --rwxr-xr-x root/root usr/lib/libglslang-default-resource-limits.so -lrwxrwxrwx root/root usr/lib/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so +-rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a -rw-r--r-- root/root usr/lib/libglslang.a -rwxr-xr-x root/root usr/lib/libglslang.so lrwxrwxrwx root/root usr/lib/libglslang.so.0 -> libglslang.so diff --git a/glslang/.signature b/glslang/.signature index 93495e7c2..769456c21 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,6 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Sg5KlrHswWUMt55cON/wslr+lpO5bRyuGwQmyYprr2EoAMTmNAUDmFpHDvks3UrLKZxsOM6FIFoY/yz3gpu1Aw= -SHA256 (Pkgfile) = b76e4aeec44d6710f56a654385ed581ddfc1cefd144c27b3199fda8850b76163 -SHA256 (.footprint) = b90552690b53fdf57ea6da5448d7e9e18ddabc8bba8ff7fd3fcef7b58c1bed1c -SHA256 (glslang-7.12.3352.tar.gz) = 4ecce011b73dd7196a5114f66776d5a4c4c3674fc9bc6f39ad3c1ee15a8abbe1 -SHA256 (0001-pkg-config-compatibility.patch) = efd22887303f1c6cdaacd31d6049438502bc7d699859fd501d075b8ab6f3ae42 +RWSE3ohX2g5d/QLlhAuukp7tLTpJ+I0EvN41ktsooVirif6a6+Xg7I76jyz0TclpB6FsxrjiV5/Lh8itd8Hv0CLylOm8jhK40gI= +SHA256 (Pkgfile) = 98a0bd7ba0420990cdc80178aa9d9b75545d64604ec82c5d534bda0aeb71c1a3 +SHA256 (.footprint) = 1c4f2f5e13c17a3df141b874e8ded6a7ec4c3aed19413ccd65adb87d7e5dc250 +SHA256 (glslang-7.13.3496.tar.gz) = 170d1538a670af4cae300e875d7cda9744b1acee1ab7252ecf7c4004186bb922 +SHA256 (glslang-default-resource-limits_staticlib.patch) = 1aa1538d9ef5f57153530df8c0f37d471c119e14c6d4ed1efe1bfec80d6b1b83 +SHA256 (glslang-lib-install.patch) = 0eacb3ab34de86f324384b5723ebb8854c213604ad5ac7859368562fdb2fe9bc +SHA256 (0001-pkg-config-compatibility.patch) = 735e14abb5a6fd6acf9315ed173c901f67785de7862f5d0d491ef2016d2b6f58 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 55b5f2de1..85937ec63 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -4,14 +4,19 @@ # Depends on: spirv-tools name=glslang -version=7.12.3352 +version=7.13.3496 release=1 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.... + glslang-default-resource-limits_staticlib.patch + glslang-lib-install.patch 0001-pkg-config-compatibility.patch) build() { cd $name-$version + patch -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch + patch -p1 -i $SRC/glslang-lib-install.patch + # Patch to build against system spirv-tools patch -p1 -i $SRC/0001-pkg-config-compatibility.patch diff --git a/glslang/glslang-default-resource-limits_staticlib.patch b/glslang/glslang-default-resource-limits_staticlib.patch new file mode 100644 index 000000000..a04c2aa87 --- /dev/null +++ b/glslang/glslang-default-resource-limits_staticlib.patch @@ -0,0 +1,9 @@ +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(glslang-default-resource-limits ++add_library(glslang-default-resource-limits STATIC + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) + set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) + set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) + diff --git a/glslang/glslang-lib-install.patch b/glslang/glslang-lib-install.patch new file mode 100644 index 000000000..8838a9780 --- /dev/null +++ b/glslang/glslang-lib-install.patch @@ -0,0 +1,105 @@ +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +index af4ab587..e0096743 100644 +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -11,5 +11,5 @@ endif(WIN32) + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OGLCompiler EXPORT OGLCompilerTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake) ++ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL) +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index e25ec0a1..364f04cc 100644 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + +- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake) +- install(EXPORT SPIRVTargets DESTINATION lib/cmake) ++ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) ++ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) + endif(ENABLE_GLSLANG_INSTALL) +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 0878965c..d9d71d1a 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL) + install(TARGETS spirv-remap EXPORT spirv-remapTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + +- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake) +- install(EXPORT spirv-remapTargets DESTINATION lib/cmake) ++ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) ++ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + + if(BUILD_SHARED_LIBS) + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake) ++ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif() + endif(ENABLE_GLSLANG_INSTALL) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index 42df1d1e..446cabb9 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL) + install(TARGETS glslang EXPORT glslangTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() +- install(EXPORT glslangTargets DESTINATION lib/cmake) ++ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL) + + if(ENABLE_GLSLANG_INSTALL) +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +index 91fb45a7..9994314f 100644 +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -22,5 +22,5 @@ endif() + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OSDependent EXPORT OSDependentTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(EXPORT OSDependentTargets DESTINATION lib/cmake) ++ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL) +diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt +index f6bd4e9d..c050ef61 100644 +--- a/glslang/OSDependent/Windows/CMakeLists.txt ++++ b/glslang/OSDependent/Windows/CMakeLists.txt +@@ -17,5 +17,5 @@ endif(WIN32) + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OSDependent EXPORT OSDependentTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(EXPORT OSDependentTargets DESTINATION lib/cmake) ++ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL) +diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt +index 77d217f1..aadf9a54 100644 +--- a/gtests/CMakeLists.txt ++++ b/gtests/CMakeLists.txt +@@ -33,7 +33,7 @@ if(BUILD_TESTING) + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS glslangtests EXPORT glslangtestsTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +- install(EXPORT glslangtestsTargets DESTINATION lib/cmake) ++ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL) + + set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test") +diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt +index 44f9d6a2..ae0d4d4e 100644 +--- a/hlsl/CMakeLists.txt ++++ b/hlsl/CMakeLists.txt +@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL) + install(TARGETS HLSL EXPORT HLSLTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() +- install(EXPORT HLSLTargets DESTINATION lib/cmake) ++ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif(ENABLE_GLSLANG_INSTALL)
participants (1)
-
crux＠crux.nu