June 2020 - crux-commits

ports/compat-32 (3.5): vulkan-validation-layers-32: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 81192ef768bf14c11bbbac9c36de31aec7d05cb1 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 18:42:30 2020 +1000 vulkan-validation-layers-32: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index bf5cab2..a70d664 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXdB/zGHTSniRwuTQ4eIzZVNWhqVT1r0+xO8r81WygSwslWQM+iE4v9yTEGj/yOpEtlJ91GL85VfhAe7lFxmIHgw= -SHA256 (Pkgfile) = 5f2b41e866d3251565f2634038abe2a4c9ccd62edc54727dd2c88f2b2922b7b4 +RWSwxGo/zH7eXauBwYMYk/UotchmGgIPj4jWCx3FpSpKw2hyQKtC51m2gzBATrAXLM2PStNdTKz6eVQmZn8j1szCWqpLXESExwE= +SHA256 (Pkgfile) = 4befdc67df61b908bd758810edb456172d4d2002530596e5801d9cb2c2def5e0 SHA256 (.footprint) = 5c3e1cb61d0d5070cc1d278ec445757e1913b70cdec30985988d48c2f6ded070 -SHA256 (Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz) = 8a7ea6a7aed1fb7de58638448c8fda8f4681554cad98f3f1c6e3a6e023f08c39 +SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3 SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index 06effe2..68c7442 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -4,35 +4,29 @@ # Depends on: spirv-tools-32 vulkan-loader-32 vulkan-validation-layers name=vulkan-validation-layers-32 -version=1.1.126.0 +version=1.2.135.0 release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk… fix_shared.patch) build() { - cd Vulkan-ValidationLayers-sdk-$version + patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch - patch -p1 -i $SRC/fix_shared.patch - - mkdir build - cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ + cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='lib32' \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=True \ -DBUILD_TESTS=False \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/vulkan/ \ + -DGLSLANG_INSTALL_DIR='/usr' \ + -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ -DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ - -GNinja + -DBUILD_WSI_WAYLAND_SUPPORT=OFF - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install rm -r $PKG/usr/{include,share} }

1 0

ports/contrib (3.5): shaderc: 2019.0 -> 2019.1
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 2bbdc5ea1f5014bf905b952c1ab6ce9ce4282417 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 17:49:26 2020 +1000 shaderc: 2019.0 -> 2019.1 diff --git a/shaderc/.signature b/shaderc/.signature index 7e3a5ebdc..11920acc1 100644 --- a/shaderc/.signature +++ b/shaderc/.signature @@ -1,12 +1,13 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33uPF6q8MoPfL5jMw6KuZ8It9Gg37DfTl0thyKxPM7Z8cpaBCZ0BqHy1sYBHw5XWrCO5wLyvUQf751U5iFK7JAQ= -SHA256 (Pkgfile) = 0f67ffd28f0e306782b2548dd0c7e70d2dd3958dd9949e8829cf2b902103a9b1 +RWSagIOpLGJF34VFFW8tPfRHrLsUhv0dp0nn/PZfidA0BWiagUi3lkmLQadM1GSx/Ly9AYm5HavmmEOhB0qoZ1bkHgxt2G8WrwQ= +SHA256 (Pkgfile) = 16b01fe6d7192c44fcc758c12cfe7642aa6714e3254b32686a1d996c0eb41a9a SHA256 (.footprint) = a55f4db9a8f36310df010a88256abef6d13753f525ff212c4e7dcb390e6c1e66 -SHA256 (shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4.tar.gz) = d0b9c52c545a07b94fa6dc5caaa6bba3df7e9edd73cb3ea9ab3519fbb267e7ca +SHA256 (shaderc-f76bb2f09f858c3014b329961d836964e515095d.tar.gz) = 0e97ab6af99f7531366ecb87f8976fa15f216c4a0d3b107f3d862c4fb4e54ad8 SHA256 (glslc.1) = 74007de30e2a7654e399d8c67c03d817eb847112e5d95e407d81754334d333c6 SHA256 (spvc.1) = a2f1c0158a73556080f2c7a8ae9027aa6c054da88ee3a5bb588bb9514021012d SHA256 (glslc-asciidoc.patch) = 685d97223af4fcd169921ee5f9b2c49a2df3d84b7bf7df7dd1f6def4361321a6 SHA256 (spvc-asciidoc.patch) = fd0c682186be4231fab5c83bf7625678f3b7905c980e3f7c9ae6cd5e212f9563 -SHA256 (fix-glslang-link-order.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea -SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 0ca9f01b8665d90cc2dc4a7eca23d58e2b4d41a46ed7735f205e2680a5e7d55c -SHA256 (shaderc-2019.0-fix-build-against-new-glslang.patch) = 7c7fe10c4e88e70a299b014cd52f2106cb07a6760feb5e12119cc576f022052e +SHA256 (0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch) = 92b52212ef9251271ddbe1004e5635b6cffb06179befd4870de5794386c4b5fd +SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 9127adf6f94ababfa8d7aaa10ec8a8f0731a4e074f14b3a431174986dc8b4226 +SHA256 (0001-Fix-SPIRV-includes-location.patch) = 199b05634800acbb89e1a188db2b0e6e5bea9941db2cc7f4a42e7611a48ae053 +SHA256 (0001-Handle-new-Glslang-profile-enum-in-switch.patch) = 276ebeb7ab36b006b084f69700090c167476b34ead529baa990247f246d00cb4 diff --git a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 32ea680ab..189afe10b 100644 --- a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,7 +1,7 @@ -diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt ---- shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle 2019-06-10 00:30:41.954316517 +0200 -+++ shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt 2019-06-10 01:10:11.672758769 +0200 -@@ -70,7 +70,6 @@ endif(MSVC) +diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt +--- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 ++++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 +@@ -92,7 +92,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -9,16 +9,15 @@ diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundl if(SHADERC_ENABLE_SPVC) add_subdirectory(libshaderc_spvc) -@@ -81,12 +80,6 @@ add_subdirectory(libshaderc) +@@ -103,11 +102,6 @@ add_subdirectory(libshaderc) add_subdirectory(glslc) add_subdirectory(examples) -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") -- + function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL - COMMAND ${CMAKE_COMMAND} diff --git a/shaderc/0001-Fix-SPIRV-includes-location.patch b/shaderc/0001-Fix-SPIRV-includes-location.patch new file mode 100644 index 000000000..1b9307fb8 --- /dev/null +++ b/shaderc/0001-Fix-SPIRV-includes-location.patch @@ -0,0 +1,73 @@ +From eb3e5917134ec42590e6a27dea7b75b870b22d38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com> +Date: Sun, 2 Feb 2020 23:03:53 +0100 +Subject: [PATCH] Fix SPIRV includes location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +SPIRV includes have been moved under glslang/ in the latest version. + +Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> +--- + libshaderc/src/shaderc.cc | 2 +- + libshaderc/src/shaderc_cpp_test.cc | 2 +- + libshaderc/src/shaderc_test.cc | 2 +- + libshaderc_util/src/compiler.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc +index fe57c76..82c47ef 100644 +--- a/libshaderc/src/shaderc.cc ++++ b/libshaderc/src/shaderc.cc +@@ -20,7 +20,7 @@ + #include <sstream> + #include <vector> + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + + #include "libshaderc_util/compiler.h" + #include "libshaderc_util/counting_includer.h" +diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc +index 407d8f4..addb347 100644 +--- a/libshaderc/src/shaderc_cpp_test.cc ++++ b/libshaderc/src/shaderc_cpp_test.cc +@@ -18,7 +18,7 @@ + #include <thread> + #include <unordered_map> + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + #include "spirv-tools/libspirv.hpp" + + #include "common_shaders_for_test.h" +diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc +index a54b87c..cab5224 100644 +--- a/libshaderc/src/shaderc_test.cc ++++ b/libshaderc/src/shaderc_test.cc +@@ -18,7 +18,7 @@ + #include <thread> + #include <unordered_map> + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + + #include "common_shaders_for_test.h" + #include "shaderc/shaderc.h" +diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc +index 1809eab..a485b12 100644 +--- a/libshaderc_util/src/compiler.cc ++++ b/libshaderc_util/src/compiler.cc +@@ -19,7 +19,7 @@ + #include <sstream> + #include <tuple> + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" +-- +2.24.1 + diff --git a/shaderc/fix-glslang-link-order.patch b/shaderc/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch similarity index 93% rename from shaderc/fix-glslang-link-order.patch rename to shaderc/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch index a404c8583..d24314487 100644 --- a/shaderc/fix-glslang-link-order.patch +++ b/shaderc/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch @@ -15,7 +15,7 @@ Additionally, libshaderc_util also depends on SPIRV-Tools 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index acf6fb0b..0f5d8886 100644 +index acf6fb0..0f5d888 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(glslc STATIC @@ -28,10 +28,10 @@ index acf6fb0b..0f5d8886 100644 add_executable(glslc_exe src/main.cc) diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 873540ab..6d0c465c 100644 +index 873540a..6d0c465 100644 --- a/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt -@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) +@@ -32,8 +32,8 @@ add_definitions(-DENABLE_HLSL) find_package(Threads) target_link_libraries(shaderc_util PRIVATE diff --git a/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch b/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch new file mode 100644 index 000000000..4400bac52 --- /dev/null +++ b/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch @@ -0,0 +1,22 @@ +From 3d99fad173cc0c00d370eeb6663784fc67efd480 Mon Sep 17 00:00:00 2001 +From: David Neto <dneto(a)google.com> +Date: Fri, 24 Jan 2020 15:41:21 -0500 +Subject: [PATCH] Handle new Glslang profile enum in switch (#973) + +* Handle new Glslang profile enum in switch +--- + libshaderc/src/shaderc.cc | 1 + + 1 files changed, 1 insertions(+), 0 deletion(-) + +diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc +index abbab548..fe57c76b 100644 +--- a/libshaderc/src/shaderc.cc ++++ b/libshaderc/src/shaderc.cc +@@ -779,6 +779,7 @@ bool shaderc_parse_version_profile(const char* str, int* version, + *profile = shaderc_profile_none; + return true; + case EBadProfile: ++ case EProfileCount: + return false; + } + diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile index d7178abc5..b844f355c 100644 --- a/shaderc/Pkgfile +++ b/shaderc/Pkgfile @@ -5,16 +5,17 @@ # Optional: asciidoctor name=shaderc -version=2019.0 -commit=34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4 -release=3 +version=2019.1 +commit=f76bb2f09f858c3014b329961d836964e515095d +release=1 source=( https://github.com/google/shaderc/archive/$commit.tar.gz#/$name-$commit.tar… #https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz glslc.1 spvc.1 glslc-asciidoc.patch spvc-asciidoc.patch - fix-glslang-link-order.patch + 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch 0001-Drop-third-party-code-in-CMakeLists.txt.patch - shaderc-2019.0-fix-build-against-new-glslang.patch) + 0001-Fix-SPIRV-includes-location.patch + 0001-Handle-new-Glslang-profile-enum-in-switch.patch) build() { cd $name-$commit @@ -23,9 +24,10 @@ build() { patch -d glslc -p0 -i $SRC/glslc-asciidoc.patch patch -d spvc -p0 -i $SRC/spvc-asciidoc.patch - patch -p1 -i $SRC/fix-glslang-link-order.patch + patch -p1 -i $SRC/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch patch -p1 -i $SRC/0001-Drop-third-party-code-in-CMakeLists.txt.patch - patch -p1 -i $SRC/shaderc-2019.0-fix-build-against-new-glslang.patch + patch -p1 -i $SRC/0001-Fix-SPIRV-includes-location.patch + patch -p1 -i $SRC/0001-Handle-new-Glslang-profile-enum-in-switch.patch # de-vendor libs and disable git versioning sed '/examples/d;/third_party/d' -i CMakeLists.txt diff --git a/shaderc/shaderc-2019.0-fix-build-against-new-glslang.patch b/shaderc/shaderc-2019.0-fix-build-against-new-glslang.patch deleted file mode 100644 index 807540cf6..000000000 --- a/shaderc/shaderc-2019.0-fix-build-against-new-glslang.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc -index 3c3c3de..b5fc6cb 100644 ---- a/libshaderc/src/shaderc.cc -+++ b/libshaderc/src/shaderc.cc -@@ -20,7 +20,7 @@ - #include <sstream> - #include <vector> - --#include "SPIRV/spirv.hpp" -+#include "glslang/SPIRV/spirv.hpp" - - #include "libshaderc_util/compiler.h" - #include "libshaderc_util/counting_includer.h" -diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index ef7867f..acc172b 100644 ---- a/libshaderc_util/src/compiler.cc -+++ b/libshaderc_util/src/compiler.cc -@@ -26,7 +26,7 @@ - #include "libshaderc_util/string_piece.h" - #include "libshaderc_util/version_profile.h" - --#include "SPIRV/GlslangToSpv.h" -+#include "glslang/SPIRV/GlslangToSpv.h" - - namespace { - using shaderc_util::string_piece; -@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile( - bases[static_cast<int>(UniformKind::StorageBuffer)]); - shader.setShiftUavBinding( - bases[static_cast<int>(UniformKind::UnorderedAccessView)]); -- shader.setHlslIoMapping(hlsl_iomap_); - shader.setResourceSetBinding( - hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]); - shader.setEnvClient(target_client_info.client, - target_client_info.client_version); - shader.setEnvTarget(target_client_info.target_language, - target_client_info.target_language_version); -- if (hlsl_functionality1_enabled_) { -- shader.setEnvTargetHlslFunctionality1(); -- } -- - const EShMessages rules = GetMessageRules(target_env_, source_language_, - hlsl_offsets_, - generate_debug_info_); -@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader( - } - shader.setEnvClient(target_client_info.client, - target_client_info.client_version); -- if (hlsl_functionality1_enabled_) { -- shader.setEnvTargetHlslFunctionality1(); -- } - - // The preprocessor might be sensitive to the target environment. - // So combine the existing rules with the just-give-me-preprocessor-output

1 0

ports/opt (3.5): vulkan-validation-layers: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 6d4ef33f0220574cfa1e23c6490418cad70f71ef Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 18:01:27 2020 +1000 vulkan-validation-layers: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-validation-layers/.footprint b/vulkan-validation-layers/.footprint index 312c7c855..2c61499d1 100644 --- a/vulkan-validation-layers/.footprint +++ b/vulkan-validation-layers/.footprint @@ -24,6 +24,8 @@ drwxr-xr-x root/root usr/include/vulkan/ -rw-r--r-- root/root usr/include/vulkan/vk_safe_struct.h -rw-r--r-- root/root usr/include/vulkan/vk_typemap_helper.h -rw-r--r-- root/root usr/include/vulkan/vk_validation_error_messages.h +-rw-r--r-- root/root usr/include/vulkan/xxhash.c +-rw-r--r-- root/root usr/include/vulkan/xxhash.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libVkLayer_khronos_validation.so -rwxr-xr-x root/root usr/lib/libVkLayer_utils.so @@ -31,4 +33,3 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/vulkan/ drwxr-xr-x root/root usr/share/vulkan/explicit_layer.d/ -rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json --rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_standard_validation.json diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index f95f227aa..5c0014ef2 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aHsTPCILVzW9hMt62eOZKebMArTdFy1+zkKm8dK86FDa2JPDifvqi51WErBBsrYYQCFUb/9uFvSex/p4WrvHw4= -SHA256 (Pkgfile) = 66ac8fa7fcb93ec0e087fbe2a0df196a96dc272fe2b0343b3e5e4bfb60a84fbb -SHA256 (.footprint) = 276e01962e8061926594f0062928e4a6c25f009fed407a7584a902b532eaf164 -SHA256 (Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz) = 8a7ea6a7aed1fb7de58638448c8fda8f4681554cad98f3f1c6e3a6e023f08c39 +RWSE3ohX2g5d/R2+i0fMep51//ArIHE/Tlt5P6Sl+1vkDHw3Pw8qu4obnhn5conOa4afQUnBH9figoKMDi2S6VvG23+YKDttnwU= +SHA256 (Pkgfile) = 68a2992eda19e46119cdf36c69731f5936417a1e2be9eb09d3d6270c061bbf9d +SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f +SHA256 (Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3 SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index eedd10a6f..f827d9092 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -4,33 +4,27 @@ # Depends on: glslang vulkan-loader name=vulkan-validation-layers -version=1.1.126.0 -release=2 +version=1.2.135.0 +release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk… fix_shared.patch) build() { - cd Vulkan-ValidationLayers-sdk-$version + patch -d Vulkan-ValidationLayers-sdk-$version -p1 -i $SRC/fix_shared.patch - patch -p1 -i $SRC/fix_shared.patch - - mkdir build - cd build - - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ + cmake -SVulkan-ValidationLayers-sdk-$version -Bbuild -GNinja \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='lib' \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=True \ - -DBUILD_TESTS=False \ - -DGLSLANG_INSTALL_DIR=/usr \ - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/vulkan/ \ + -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TESTS=OFF \ + -DGLSLANG_INSTALL_DIR='/usr' \ + -DCMAKE_INSTALL_INCLUDEDIR='/usr/include/vulkan/' \ -DBUILD_LAYER_SUPPORT_FILES=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ - -DBUILD_WSI_WAYLAND_SUPPORT=$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF) \ - -GNinja + -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }

1 0

ports/opt (3.5): vulkan-tools: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 08fc11c42ca1041d2d00d00e2424daf6a881b73d Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 18:00:50 2020 +1000 vulkan-tools: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-tools/.signature b/vulkan-tools/.signature index 0666e2f5a..337f4f8ee 100644 --- a/vulkan-tools/.signature +++ b/vulkan-tools/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WLLC0Yh3nQGetzQfw4z+90A7fh6+iqwkSyKIjV65WZP49oxR7Xb1Whd7lKSKqw555U2u5GEPUPWM8yXehkmUwE= -SHA256 (Pkgfile) = 268238e5fdc72c2485f51b146eb755a39d7e37e02ebcf04ddeaa3649f5801cc1 +RWSE3ohX2g5d/eGCvOs6jjnqHdUmb17jtQhmGCF3CoyL1famNRpYjQdRitMpqLTXhdwkJlqw1PO2kivrrabL4rD3wgY+gy4+jQs= +SHA256 (Pkgfile) = 8a632a4592a4cf407da55338078d2c24d8ef8c16fb2e22660e0493aac8e34fde SHA256 (.footprint) = 2193acbc7cabcf79829a7caf3821d84e01bc4e695a36a948b8eb4379bbf8150f -SHA256 (Vulkan-Tools-sdk-1.1.126.0.tar.gz) = 830330144f31c1711ea8cf4d7640421e3dbd025a854cb5f097973719fdf671fd +SHA256 (Vulkan-Tools-sdk-1.2.135.0.tar.gz) = 83add7b6390ab1eb9b71106b50d7f5ae6afb74374762f0028afc9fdef5380c83 diff --git a/vulkan-tools/Pkgfile b/vulkan-tools/Pkgfile index 25832c287..d6ce80407 100644 --- a/vulkan-tools/Pkgfile +++ b/vulkan-tools/Pkgfile @@ -4,19 +4,13 @@ # Depends on: glslang vulkan-loader name=vulkan-tools -version=1.1.126.0 -release=2 +version=1.2.135.0 +release=1 source=(https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$version/V… build() { - cd Vulkan-Tools-sdk-$version - - mkdir build - cd build - - cmake .. \ + cmake -SVulkan-Tools-sdk-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DGLSLANG_INSTALL_DIR=/usr \ -DBUILD_CUBE=True \ @@ -24,10 +18,9 @@ build() { -DCUBE_WSI_SELECTION='XCB' \ -DBUILD_WSI_XCB_SUPPORT=True \ -DBUILD_WSI_XLIB_SUPPORT=True \ - -DBUILD_WSI_WAYLAND_SUPPORT=$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF) \ - -DBUILD_ICD=OFF \ - -GNinja + -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" \ + -DBUILD_ICD=OFF - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }

1 0

ports/opt (3.5): vulkan-loader: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit e09d52bf76639fb71b1068f3e11b2d50df5a64d7 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 18:00:40 2020 +1000 vulkan-loader: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-loader/.footprint b/vulkan-loader/.footprint index 4da0697e8..2cbad34d1 100644 --- a/vulkan-loader/.footprint +++ b/vulkan-loader/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libvulkan.so -> libvulkan.so.1 -lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.1.126 --rwxr-xr-x root/root usr/lib/libvulkan.so.1.1.126 +lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.135 +-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.135 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vulkan.pc diff --git a/vulkan-loader/.signature b/vulkan-loader/.signature index 0d2b19e47..cd071c1e8 100644 --- a/vulkan-loader/.signature +++ b/vulkan-loader/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZY5xyZqNEpY3oyLjlX5ru3DFGwEFJpA2+OPm9Yi0cLGT2BMOeSM9pOg7u6y4KKLS9tKrnEJMTbywkMGnOR/Ew4= -SHA256 (Pkgfile) = 34927c301002c83b5b5cdc93bb560c7171e60f433ea22e4a07f098269e8254b7 -SHA256 (.footprint) = e52409101b96b9f05f27ce51ff2c5189c9e16fb909eb1b8256ce7c8fa02554cd -SHA256 (Vulkan-Loader-sdk-1.1.126.0.tar.gz) = 25ad9d068e1f9bbfc3a86dcabb989a0a1c2610201b61e8e142eed149c23e2fb0 +RWSE3ohX2g5d/Q6Sa1ZgzL4kG2tQGtJQJeJbVu10bBV1dyEfeWr1Vqt/qwC0jfhu/PzDUl66ktRWrj+w9+d3NhmSOh3EN3z52A0= +SHA256 (Pkgfile) = 60e452d38ef649f979adedfccf374319355c292e1e2c568bebba917c08e090e4 +SHA256 (.footprint) = 01e527684a81046fa0558665d3c5c978e03e41e6ab724db45756c525ce6d8336 +SHA256 (Vulkan-Loader-sdk-1.2.135.0.tar.gz) = 98cd19e4603ca6acc5427686516d0abbf5026acf519d9e40f8136acf809cd117 diff --git a/vulkan-loader/Pkgfile b/vulkan-loader/Pkgfile index b1944f5f3..5a0088b34 100644 --- a/vulkan-loader/Pkgfile +++ b/vulkan-loader/Pkgfile @@ -4,17 +4,12 @@ # Depends on: vulkan-headers xorg-libxrandr name=vulkan-loader -version=1.1.126.0 -release=2 +version=1.2.135.0 +release=1 source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$version/… build() { - cd Vulkan-Loader-sdk-$version - - mkdir build - cd build - - cmake .. \ + cmake -SVulkan-Loader-sdk-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ @@ -23,9 +18,8 @@ build() { -DBUILD_LOADER=True \ -DBUILD_WSI_XCB_SUPPORT=True \ -DBUILD_WSI_XLIB_SUPPORT=True \ - -DBUILD_WSI_WAYLAND_SUPPORT=$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF) \ - -GNinja + -DBUILD_WSI_WAYLAND_SUPPORT="$(prt-get isinst wayland &> /dev/null && echo ON || echo OFF)" - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }

1 0

ports/opt (3.5): vulkan-headers: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit ff46535502adc397e0c30c0bebeedddd04fe99bf Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 18:00:11 2020 +1000 vulkan-headers: 1.1.126.0 -> 1.2.135.0 diff --git a/vulkan-headers/.footprint b/vulkan-headers/.footprint index 8dd5b1177..bbe83d859 100644 --- a/vulkan-headers/.footprint +++ b/vulkan-headers/.footprint @@ -8,6 +8,7 @@ drwxr-xr-x root/root usr/include/vulkan/ -rw-r--r-- root/root usr/include/vulkan/vulkan.h -rw-r--r-- root/root usr/include/vulkan/vulkan.hpp -rw-r--r-- root/root usr/include/vulkan/vulkan_android.h +-rw-r--r-- root/root usr/include/vulkan/vulkan_beta.h -rw-r--r-- root/root usr/include/vulkan/vulkan_core.h -rw-r--r-- root/root usr/include/vulkan/vulkan_fuchsia.h -rw-r--r-- root/root usr/include/vulkan/vulkan_ggp.h diff --git a/vulkan-headers/.signature b/vulkan-headers/.signature index a7357b887..bfe9eae76 100644 --- a/vulkan-headers/.signature +++ b/vulkan-headers/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VD4extJBl3PshB4lbOPGWik3ibI9KK2RCwcok2JcHk300u0TvrNDilgOgwjFxrLDbxGPuLPvF83niLsbwDTvQQ= -SHA256 (Pkgfile) = 652aec8291e46db771e0b38669f1d65dfbd3ab9f981fb2eca106214137247b61 -SHA256 (.footprint) = ee7bbd4ee1a3e7f1c89117b987e7987b732b320dc759a0f865de29aa52a4bb31 -SHA256 (Vulkan-Headers-sdk-1.1.126.0.tar.gz) = 34a9a6d3e3bf0745e901f75a08f57d4ff388c7e1c59a8dad0dc8437c54236a13 +RWSE3ohX2g5d/VTYnwVrJ2iw1nuGLSiVVzkpxHV0x4XvixZYhPmP5nDZlOARG50mskS5fUSItNyDeYLnFQdEdpu7xGCdgARcsQU= +SHA256 (Pkgfile) = c60deb748d8e3d5c30f0346eafe59115b999a4c9aaf7562f4a1162aeff0cc872 +SHA256 (.footprint) = 8798999fbe998f2d60c201205b903868330fd8c654376c6b56e2c9231aeadf97 +SHA256 (Vulkan-Headers-sdk-1.2.135.0.tar.gz) = befc69991e1e268db75921c577be32a3f315d01d78b39b74ef87ba6908787b63 diff --git a/vulkan-headers/Pkgfile b/vulkan-headers/Pkgfile index 505e36a11..44a20f5e9 100644 --- a/vulkan-headers/Pkgfile +++ b/vulkan-headers/Pkgfile @@ -4,26 +4,16 @@ # Depends on: cmake ninja name=vulkan-headers -version=1.1.126.0 +version=1.2.135.0 release=1 -source=( - #https://github.com/KhronosGroup/Vulkan-Headers/archive/v$version/ulkan-Headers-v$version.tar.gz - https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version/Vulkan-… -) +source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version/Vulkan-Headers-sdk-$version.tar.gz) build() { - #cd Vulkan-Headers-$version - cd Vulkan-Headers-sdk-$version - - mkdir build - cd build - - cmake .. \ + cmake -SVulkan-Headers-sdk-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja + -DCMAKE_BUILD_TYPE=Release - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }

1 0

ports/opt (3.5): glslang: 7.13.3496 -> 8.13.3559
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 54802ea9382bc87de06fcce4c2556aed12d9fec2 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 17:59:41 2020 +1000 glslang: 7.13.3496 -> 8.13.3559 diff --git a/glslang/.footprint b/glslang/.footprint index db1888fce..5712402ca 100644 --- a/glslang/.footprint +++ b/glslang/.footprint @@ -15,6 +15,8 @@ drwxr-xr-x root/root usr/include/glslang/Include/ -rw-r--r-- root/root usr/include/glslang/Include/ShHandle.h -rw-r--r-- root/root usr/include/glslang/Include/Types.h -rw-r--r-- root/root usr/include/glslang/Include/arrays.h +-rw-r--r-- root/root usr/include/glslang/Include/glslang_c_interface.h +-rw-r--r-- root/root usr/include/glslang/Include/glslang_c_shader_types.h -rw-r--r-- root/root usr/include/glslang/Include/intermediate.h -rw-r--r-- root/root usr/include/glslang/Include/revision.h drwxr-xr-x root/root usr/include/glslang/MachineIndependent/ @@ -47,6 +49,7 @@ drwxr-xr-x root/root usr/include/glslang/SPIRV/ -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/NonSemanticDebugPrintf.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 diff --git a/glslang/.signature b/glslang/.signature index 4b5f9b11d..6b5b87a7e 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,9 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Wl4yOBeuZLcrkeqGse0s+C9tXDgSP5B2SGK8yCbXxgnumxicHhthITipqYJQ//WEfXz4MPIisIXoKxnbaKl0QM= -SHA256 (Pkgfile) = d874f9a7bf9103dace28c86de50040eebdab965b888222b1975224ba8ccf419c -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 -SHA256 (glslang-7.12.3353_pre20191027-fix-relative-includes.patch) = 8af4205a290890d6b30718a947800cf72082c0008193acd77f50123fe9a2c89b +RWSE3ohX2g5d/eeRG/zf5ZMeiUjAj4ofso9jz5/sA3aZG2cUp33oyGa2A3oWtbsnr8UIB6EyFJLhjWuA3pb8BkOR2GCl08sLqgE= +SHA256 (Pkgfile) = b73809b0fc0b42ddaa426f73d06ac709923e11480ede8f6c1044b3078c87183f +SHA256 (.footprint) = 0b6ab83e6d184389c19fd8f4387966507f71ef6e9b889fa616270809880e38eb +SHA256 (glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3.tar.gz) = 649430895fcdf3791872efe6eb4b352bdd50bc05a309d5bea00adfb9688926dd +SHA256 (glslang-default-resource-limits_staticlib.patch) = 364506f9e31433fcd76d0237cd6bf95db567b525f686ff4c4500918bae7d316d +SHA256 (0001-pkg-config-compatibility.patch) = f5b4de977a8829018359807b069218d967d5cb69b0e59f48155f88b7685647cb diff --git a/glslang/0001-pkg-config-compatibility.patch b/glslang/0001-pkg-config-compatibility.patch index e9ab32d46..87433b63f 100644 --- a/glslang/0001-pkg-config-compatibility.patch +++ b/glslang/0001-pkg-config-compatibility.patch @@ -1,7 +1,7 @@ -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt 2019-11-13 15:06:21.418739152 +1000 -@@ -69,6 +69,13 @@ endmacro(glslang_pch) +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/CMakeLists.txt 2020-04-22 12:26:12.717875341 +1000 +@@ -87,6 +87,13 @@ endmacro(glslang_pch) project(glslang) @@ -15,7 +15,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls if(ENABLE_CTEST) include(CTest) endif() -@@ -163,11 +170,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA +@@ -178,11 +185,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA add_subdirectory(External) endif() @@ -28,9 +28,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/CMakeLists.txt.dma gls message(STATUS "optimizer enabled") add_definitions(-DENABLE_OPT=1) else() -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.txt 2019-11-13 15:06:21.418739152 +1000 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/External/CMakeLists.txt 2020-04-22 12:26:12.718875368 +1000 @@ -35,10 +35,3 @@ if(BUILD_TESTING) endif() endif() @@ -42,10 +42,10 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/External/CMakeLists.tx - endif() -endif() - -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt 2019-11-13 15:07:16.046291974 +1000 -@@ -76,6 +76,7 @@ set(HEADERS +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/CMakeLists.txt 2020-04-22 12:26:38.647579382 +1000 +@@ -80,6 +80,7 @@ set(HEADERS MachineIndependent/preprocessor/PpContext.h MachineIndependent/preprocessor/PpTokens.h) @@ -53,20 +53,18 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/CMakeLists.txt glslang_pch(SOURCES MachineIndependent/pch.cpp) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -112,7 +113,9 @@ if(ENABLE_GLSLANG_INSTALL) +@@ -116,6 +117,8 @@ if(ENABLE_GLSLANG_INSTALL) install(TARGETS glslang EXPORT glslangTargets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() -- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif(ENABLE_GLSLANG_INSTALL) - if(ENABLE_GLSLANG_INSTALL) -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in.dma 2019-11-13 15:06:21.419739162 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cmake.in 2019-11-13 15:06:21.419739162 +1000 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in.dma 2020-04-22 12:26:12.718875368 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/glslang/glslang.pc.cmake.in 2020-04-22 12:26:12.718875368 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -80,10 +78,10 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/glslang/glslang.pc.cma + Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt 2019-11-13 15:06:21.438739355 +1000 -@@ -40,6 +40,10 @@ target_include_directories(SPIRV PUBLIC +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/CMakeLists.txt 2020-04-22 12:26:12.719875396 +1000 +@@ -41,6 +41,10 @@ target_include_directories(SPIRV PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) @@ -94,7 +92,7 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.d if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -@@ -53,15 +57,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) +@@ -54,15 +58,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) endif() endif() @@ -120,18 +118,19 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/CMakeLists.txt.d else() target_link_libraries(SPIRV glslang) endif(ENABLE_OPT) -@@ -94,5 +104,8 @@ if(ENABLE_GLSLANG_INSTALL) - install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) +@@ -98,6 +108,9 @@ if(ENABLE_GLSLANG_INSTALL) + + install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + # spirv.pc Configuration + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif(ENABLE_GLSLANG_INSTALL) -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in.dma 2019-11-13 15:06:21.438739355 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.in 2019-11-13 15:06:21.438739355 +1000 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in.dma 2020-04-22 12:26:12.719875396 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/spirv.pc.cmake.in 2020-04-22 12:26:12.719875396 +1000 @@ -0,0 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ @@ -145,9 +144,9 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/spirv.pc.cmake.i + Libs: -L${libdir} -lSPIRV + Cflags: -I${includedir} \ No newline at end of file -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma 2019-11-02 02:51:21.000000000 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp 2019-11-13 15:06:21.438739355 +1000 +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp.dma 2020-04-21 23:06:12.000000000 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/SPIRV/SpvTools.cpp 2020-04-22 12:26:12.719875396 +1000 @@ -43,8 +43,8 @@ #include <iostream> @@ -159,12 +158,12 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/SPIRV/SpvTools.cpp.dma namespace glslang { -diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt ---- glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt.dma 2019-11-13 15:06:05.678579864 +1000 -+++ glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists.txt 2019-11-13 15:06:21.439739365 +1000 -@@ -24,6 +24,14 @@ set(LIBRARIES - SPVRemapper - glslang-default-resource-limits) +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 12:26:04.596654834 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 12:26:12.719875396 +1000 +@@ -24,6 +24,14 @@ if(ENABLE_SPVREMAPPER) + set(LIBRARIES ${LIBRARIES} SPVRemapper) + endif() +if(BUILD_SHARED_LIBS) + set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) @@ -177,13 +176,13 @@ diff -up glslang-7f77b2e8669ae06acbee9c9867be8b13e4054f9c/StandAlone/CMakeLists. if(WIN32) set(LIBRARIES ${LIBRARIES} psapi) elseif(UNIX) -@@ -34,9 +42,6 @@ endif(WIN32) +@@ -33,9 +41,6 @@ elseif(UNIX) + endif(WIN32) target_link_libraries(glslangValidator ${LIBRARIES}) - target_link_libraries(spirv-remap ${LIBRARIES}) --target_include_directories(glslangValidator PUBLIC -- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) +-target_include_directories(glslangValidator PUBLIC +- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> +- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) - if(WIN32) - source_group("Source" FILES ${SOURCES}) + if(ENABLE_SPVREMAPPER) + set(REMAPPER_SOURCES spirv-remap.cpp) diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 393867aa8..33523f04a 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -4,44 +4,40 @@ # Depends on: spirv-tools name=glslang -version=7.13.3496 -release=2 -source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz +version=8.13.3559 +commit=c9b28b9f3388c607ea5506f5e6197b7150238ad3 +release=1 +source=( + #https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz + https://github.com/KhronosGroup/glslang/archive/$commit.tar.gz#/$name-$comm… glslang-default-resource-limits_staticlib.patch - glslang-lib-install.patch - 0001-pkg-config-compatibility.patch - glslang-7.12.3353_pre20191027-fix-relative-includes.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 -p1 -i $SRC/glslang-7.12.3353_pre20191027-fix-relative-includes.patch + patch -d $name-$commit -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch # Patch to build against system spirv-tools - patch -p1 -i $SRC/0001-pkg-config-compatibility.patch - - mkdir -p build-{shared,static} + patch -d $name-$commit -p1 -i $SRC/0001-pkg-config-compatibility.patch local config=" +-S$name-$commit \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ +-DCMAKE_SKIP_RPATH:BOOL=yes \ -GNinja" - (cd build-shared - cmake .. $config -DBUILD_SHARED_LIBS=ON - ninja -j ${JOBS:-1} - ) - - (cd build-static - cmake .. $config -DBUILD_SHARED_LIBS=OFF - ninja -j ${JOBS:-1} - ) - - DESTDIR=$PKG ninja -C build-shared install - DESTDIR=$PKG ninja -C build-static install + cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF + cmake --build build-static + + cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON + cmake --build build-shared + + DESTDIR=$PKG cmake --build build-static --target install + DESTDIR=$PKG cmake --build build-shared --target install + + # we don't want them in here + rm -rf $PKG/usr/include/SPIRV cd $PKG/usr/lib for lib in *.so; do diff --git a/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch deleted file mode 100644 index 4c44cfbbb..000000000 --- a/glslang/glslang-7.12.3353_pre20191027-fix-relative-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h -index 86e1c23b..3907be43 100755 ---- a/SPIRV/GlslangToSpv.h -+++ b/SPIRV/GlslangToSpv.h -@@ -40,7 +40,7 @@ - #endif - - #include "SpvTools.h" --#include "../glslang/Include/intermediate.h" -+#include "glslang/Include/intermediate.h" - - #include <string> - #include <vector> -diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h -index 7422d012..59c914da 100644 ---- a/SPIRV/SpvTools.h -+++ b/SPIRV/SpvTools.h -@@ -46,7 +46,7 @@ - #include <ostream> - #endif - --#include "../glslang/MachineIndependent/localintermediate.h" -+#include "glslang/MachineIndependent/localintermediate.h" - #include "Logger.h" - - namespace glslang { diff --git a/glslang/glslang-default-resource-limits_staticlib.patch b/glslang/glslang-default-resource-limits_staticlib.patch index a04c2aa87..c5a0013bf 100644 --- a/glslang/glslang-default-resource-limits_staticlib.patch +++ b/glslang/glslang-default-resource-limits_staticlib.patch @@ -1,9 +1,9 @@ ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt +diff -up glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt +--- glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt.dma 2020-04-22 11:00:58.685198803 +1000 ++++ glslang-c9b28b9f3388c607ea5506f5e6197b7150238ad3/StandAlone/CMakeLists.txt 2020-04-22 11:01:12.559574492 +1000 @@ -1,4 +1,4 @@ -add_library(glslang-default-resource-limits +add_library(glslang-default-resource-limits STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.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 deleted file mode 100644 index 8838a9780..000000000 --- a/glslang/glslang-lib-install.patch +++ /dev/null @@ -1,105 +0,0 @@ -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)

1 0

ports/opt (3.5): spirv-tools: 2019.4 -> 2019.5
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit d1253d1ff0119abae463b37da9173a9da5e0f375 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 17:53:19 2020 +1000 spirv-tools: 2019.4 -> 2019.5 diff --git a/spirv-tools/.signature b/spirv-tools/.signature index 5592767f9..2eb6d9097 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/W7iAWbJRY7s0gXw72Yql9ud7Mo516RxX3hGpzk2+cwKJYHkhOcOSs/E6kJktaI4bfhyQpSn2trQIhGQ3j81yQo= -SHA256 (Pkgfile) = 291ce6699df3bb33da7687fe0e734d5fdde64659dd471c9eb1cf0141c5263245 +RWSE3ohX2g5d/VPsT8EO7NXKcbPf7t9nmP6O3QCJxlM7QIim3M2x5ciP6kIT0Bmz68U6d/ou2uLxFnIeoXJQtUsotveqLAME5wY= +SHA256 (Pkgfile) = 0d7d20f483e06fef702bfdeb4e7ba482111fa2a328e4b5754e7ca544b7dd37bd SHA256 (.footprint) = 8476f7a6f9f52a2c6ba3951bddd566aa9862560df47eae928c6d4cf16ecdf05b -SHA256 (spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz) = c0738c9a8d2f7c91fc264b3bb4095bbab5478972f003b8d2d3f4aa8ac4be3f9a -SHA256 (fix-cmake-install.patch) = 2ece687f65ae274476b5bda7ad404aadc8cbd34b4528cd636bdbba29d4055733 +SHA256 (spirv-tools-67f4838659f475d618c120e13d1a196d7e00ba4b.tar.gz) = d14511a752b4ac8848eccf1ddeca0c52061e9c6fb111dc6fa88c2a1d8a05bb0c diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index a0af1bcc1..2d04f5f03 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -1,27 +1,23 @@ # Description: API and commands for processing SPIR-V modules # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: python3 spirv-headers +# Depends on: spirv-headers name=spirv-tools -version=2019.4 -commit=3e4abc9ac382b6fc7a88316a700652404b6fb9f7 -release=3 +version=2019.5 +commit=67f4838659f475d618c120e13d1a196d7e00ba4b +release=1 source=( #https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz https://github.com/KhronosGroup/SPIRV-Tools/archive/$commit.tar.gz#/$name-$… - fix-cmake-install.patch ) build() { # cd SPIRV-Tools-$version - cd SPIRV-Tools-$commit - - patch -p1 -i $SRC/fix-cmake-install.patch - - mkdir build-{shared,static} +# cd SPIRV-Tools-$commit local config=" +-SSPIRV-Tools-$commit \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ @@ -30,16 +26,12 @@ build() { -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -GNinja" - (cd build-static - cmake .. $config -DBUILD_SHARED_LIBS=OFF - ninja -j ${JOBS:-1} - ) + cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF + cmake --build build-static - (cd build-shared - cmake .. $config -DBUILD_SHARED_LIBS=ON - ninja -j ${JOBS:-1} - ) + cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON + cmake --build build-static - DESTDIR=$PKG ninja -C build-static install - DESTDIR=$PKG ninja -C build-shared install + DESTDIR=$PKG cmake --build build-static --target install + DESTDIR=$PKG cmake --build build-shared --target install } diff --git a/spirv-tools/fix-cmake-install.patch b/spirv-tools/fix-cmake-install.patch deleted file mode 100644 index abc912e0e..000000000 --- a/spirv-tools/fix-cmake-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt ---- SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma 2019-11-12 13:58:34.347573658 +1000 -+++ SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt 2019-11-12 13:58:47.166919110 +1000 -@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - endmacro() - else() - macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} lib/cmake/${TARGET}) -+ set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}) - endmacro() - endif() -

1 0

ports/opt (3.5): spirv-headers: af64a9e826bf5bb5fcd2434dd71be1e41e922563 -> 2ad0492fb00919d99500f1da74abf5ad3c870e4e
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 9905ab9a17865f33ffc5f65399d1dd3ea1dcc367 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 17:51:31 2020 +1000 spirv-headers: af64a9e826bf5bb5fcd2434dd71be1e41e922563 -> 2ad0492fb00919d99500f1da74abf5ad3c870e4e diff --git a/spirv-headers/.footprint b/spirv-headers/.footprint index 1c2de331b..ff2c0fdb2 100644 --- a/spirv-headers/.footprint +++ b/spirv-headers/.footprint @@ -42,10 +42,24 @@ drwxr-xr-x root/root usr/include/spirv/1.2/ -rw-r--r-- root/root usr/include/spirv/1.2/spirv.py -rw-r--r-- root/root usr/include/spirv/spir-v.xml drwxr-xr-x root/root usr/include/spirv/unified1/ +-rw-r--r-- root/root usr/include/spirv/unified1/AMD_gcn_shader.h +-rw-r--r-- root/root usr/include/spirv/unified1/AMD_shader_ballot.h +-rw-r--r-- root/root usr/include/spirv/unified1/AMD_shader_explicit_vertex_parameter.h +-rw-r--r-- root/root usr/include/spirv/unified1/AMD_shader_trinary_minmax.h +-rw-r--r-- root/root usr/include/spirv/unified1/DebugInfo.h -rw-r--r-- root/root usr/include/spirv/unified1/GLSL.std.450.h +-rw-r--r-- root/root usr/include/spirv/unified1/NonSemanticDebugPrintf.h -rw-r--r-- root/root usr/include/spirv/unified1/OpenCL.std.h +-rw-r--r-- root/root usr/include/spirv/unified1/OpenCLDebugInfo100.h +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.debuginfo.grammar.json -rw-r--r-- root/root usr/include/spirv/unified1/extinst.glsl.std.450.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.nonsemantic.debugprintf.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json -rw-r--r-- root/root usr/include/spirv/unified1/extinst.opencl.std.100.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json +-rw-r--r-- root/root usr/include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json -rw-r--r-- root/root usr/include/spirv/unified1/spirv.core.grammar.json -rw-r--r-- root/root usr/include/spirv/unified1/spirv.cs -rw-r--r-- root/root usr/include/spirv/unified1/spirv.h diff --git a/spirv-headers/.signature b/spirv-headers/.signature index d0b5f3f55..4c547c376 100644 --- a/spirv-headers/.signature +++ b/spirv-headers/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/R1os/WwLNVoekZyJN7CYNQU/H/GoW9jge/oXcG3UQ4KvekMzNDYyKOVZUUd7YLkZHWL3t782kAV2l6RQ+e1RgE= -SHA256 (Pkgfile) = c17edfa9d8913e8a3caa85cccc24e01909cbf1a54ca3b7549c8422fe60f09aff -SHA256 (.footprint) = 57a7e097bb08027c92c5b320002aa765ac7a452a91765a19c07f875a4999848e -SHA256 (spirv-headers-af64a9e826bf5bb5fcd2434dd71be1e41e922563.tar.gz) = e0522545b4fbf4c7ee50c1f31b883c275e5ba829141c9ebfa62fd96c08755966 +RWSE3ohX2g5d/bZ8wsMOgCp8II9yt74L1eRVpIgGVUZyKJ3zDIzutWhzSjrySvhzG7cz6WGsno0E/SiX2N/GTqyXah3TmPOqFg0= +SHA256 (Pkgfile) = 730d1397b299fc03569fbd807b64856eec66364a3bbbdb637c43f8e7107250d3 +SHA256 (.footprint) = 24829e1b094986dd7021f7ac3082b328a3baf6688964509a117222df08ee76f4 +SHA256 (spirv-headers-2ad0492fb00919d99500f1da74abf5ad3c870e4e.tar.gz) = ab33bbded496d399f6f0bb048043041d832e203100ddd664466e390d912fae7d diff --git a/spirv-headers/Pkgfile b/spirv-headers/Pkgfile index 653b38868..5677841bf 100644 --- a/spirv-headers/Pkgfile +++ b/spirv-headers/Pkgfile @@ -5,7 +5,7 @@ name=spirv-headers version=1.5.1 -commit=af64a9e826bf5bb5fcd2434dd71be1e41e922563 +commit=2ad0492fb00919d99500f1da74abf5ad3c870e4e release=1 source=( #https://github.com/KhronosGroup/SPIRV-Headers/archive/$version/SPIRV-Headers-$version.tar.gz @@ -14,18 +14,15 @@ source=( build() { # cd SPIRV-Headers-$version - cd SPIRV-Headers-$commit +# cd SPIRV-Headers-$commit - mkdir build - cd build - - cmake .. \ + cmake -SSPIRV-Headers-$commit -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ -GNinja - ninja -j ${JOBS:-1} - DESTDIR=$PKG ninja install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }

1 0

ports/opt (3.5): [notify] protobuf: 3.11.4 -> 3.12.3 ABI change rebuild affected ports
by crux＠crux.nu 07 Jun '20

07 Jun '20

commit 1b1a0d2ef3474fd9356bd226ece5bf98c6af8b78 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 11:46:52 2020 +1000 [notify] protobuf: 3.11.4 -> 3.12.3 ABI change rebuild affected ports diff --git a/protobuf/.footprint b/protobuf/.footprint index 0cfd64cd0..44eb1f18c 100644 --- a/protobuf/.footprint +++ b/protobuf/.footprint @@ -135,19 +135,19 @@ drwxr-xr-x root/root usr/include/google/protobuf/util/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libprotobuf-lite.a -rwxr-xr-x root/root usr/lib/libprotobuf-lite.la -lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so -> libprotobuf-lite.so.22.0.4 -lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so.22 -> libprotobuf-lite.so.22.0.4 --rwxr-xr-x root/root usr/lib/libprotobuf-lite.so.22.0.4 +lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so -> libprotobuf-lite.so.23.0.3 +lrwxrwxrwx root/root usr/lib/libprotobuf-lite.so.23 -> libprotobuf-lite.so.23.0.3 +-rwxr-xr-x root/root usr/lib/libprotobuf-lite.so.23.0.3 -rw-r--r-- root/root usr/lib/libprotobuf.a -rwxr-xr-x root/root usr/lib/libprotobuf.la -lrwxrwxrwx root/root usr/lib/libprotobuf.so -> libprotobuf.so.22.0.4 -lrwxrwxrwx root/root usr/lib/libprotobuf.so.22 -> libprotobuf.so.22.0.4 --rwxr-xr-x root/root usr/lib/libprotobuf.so.22.0.4 +lrwxrwxrwx root/root usr/lib/libprotobuf.so -> libprotobuf.so.23.0.3 +lrwxrwxrwx root/root usr/lib/libprotobuf.so.23 -> libprotobuf.so.23.0.3 +-rwxr-xr-x root/root usr/lib/libprotobuf.so.23.0.3 -rw-r--r-- root/root usr/lib/libprotoc.a -rwxr-xr-x root/root usr/lib/libprotoc.la -lrwxrwxrwx root/root usr/lib/libprotoc.so -> libprotoc.so.22.0.4 -lrwxrwxrwx root/root usr/lib/libprotoc.so.22 -> libprotoc.so.22.0.4 --rwxr-xr-x root/root usr/lib/libprotoc.so.22.0.4 +lrwxrwxrwx root/root usr/lib/libprotoc.so -> libprotoc.so.23.0.3 +lrwxrwxrwx root/root usr/lib/libprotoc.so.23 -> libprotoc.so.23.0.3 +-rwxr-xr-x root/root usr/lib/libprotoc.so.23.0.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/protobuf-lite.pc -rw-r--r-- root/root usr/lib/pkgconfig/protobuf.pc diff --git a/protobuf/.signature b/protobuf/.signature index 61ae4126e..2a97a6ed7 100644 --- a/protobuf/.signature +++ b/protobuf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f41sBRiZB+2hNQmY17AbQK34FpvWulp+XXe9pLiyr1lugudgnTk7weURyXuxyNIEj0DbIdmSpNRfWzbiNTRWQk= -SHA256 (Pkgfile) = d7606f805576567c3fded20cf24a702631cda0f55b2e1938649c46d2115b21da -SHA256 (.footprint) = 2c6b792b99931a566e5f1a1edf7e48c2c382b5fd15e587abb3c3c0cf0bab5f42 -SHA256 (protobuf-3.11.4.tar.gz) = a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9 +RWSE3ohX2g5d/agP/HJtp77f7mcEDtHiiHu5XEeHD1WGJKmjb758Lnsjvkgs71xLaYQmJYTNOCaXA5RfBPFJN/WuU0rAluvStgE= +SHA256 (Pkgfile) = b5914f26ee86acab19f7ff14a97ead264d5b6581968e3730fa9745f06a14db75 +SHA256 (.footprint) = 3ce08e13227a1d92d75c17fe95341a6ca1747838192818cb134aac07f205adbe +SHA256 (protobuf-3.12.3.tar.gz) = 71030a04aedf9f612d2991c1c552317038c3c5a2b578ac4745267a45e7037c29 diff --git a/protobuf/Pkgfile b/protobuf/Pkgfile index fa3909e78..f001a7ce3 100644 --- a/protobuf/Pkgfile +++ b/protobuf/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=protobuf -version=3.11.4 +version=3.12.3 release=1 source=(https://github.com/google/$name/archive/v$version/$name-$version.ta…

1 0