June 2020 - crux-commits

ports/opt (3.6): [notify] libspiro: 0.5.20150702 -> 20200505 ABI change check with revdep
by crux＠crux.nu 10 Jun '20

10 Jun '20

commit 15bc98927938a0618c2637e1d3450f6cc444dbe6 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Jun 7 19:24:43 2020 +1000 [notify] libspiro: 0.5.20150702 -> 20200505 ABI change check with revdep diff --git a/libspiro/.footprint b/libspiro/.footprint index d86622c84..fcb76817e 100644 --- a/libspiro/.footprint +++ b/libspiro/.footprint @@ -7,8 +7,12 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libspiro.a -rwxr-xr-x root/root usr/lib/libspiro.la -lrwxrwxrwx root/root usr/lib/libspiro.so -> libspiro.so.0.0.5 -lrwxrwxrwx root/root usr/lib/libspiro.so.0 -> libspiro.so.0.0.5 --rwxr-xr-x root/root usr/lib/libspiro.so.0.0.5 +lrwxrwxrwx root/root usr/lib/libspiro.so -> libspiro.so.1.0.1 +lrwxrwxrwx root/root usr/lib/libspiro.so.1 -> libspiro.so.1.0.1 +-rwxr-xr-x root/root usr/lib/libspiro.so.1.0.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libspiro.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/libspiro.3.gz diff --git a/libspiro/.signature b/libspiro/.signature index df0a9924d..107fc0d20 100644 --- a/libspiro/.signature +++ b/libspiro/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cg4G4yeBCHkhb6wyFVuRO7uPx6y8nZHKmEy/pN/Oc2qi9iUsehRxTZu8M2qAJ2ZqRuCgbw9CCTX9UJKCLguawE= -SHA256 (Pkgfile) = 5db51005a6e276d0beb959f03f3901f1b5dad066e952d7581073251025577efc -SHA256 (.footprint) = d99466f73218abb65e5d4726f0e5b9a99b0510ddee393ef00f71b252f423005c -SHA256 (0.5.20150702.tar.gz) = 14f761d83c7fa6be31c4e0317251ed1201b367dc5b2a8678e2da179d74938fc7 +RWSE3ohX2g5d/Q1ohZ90TbT+Y356Iu2/TUNUYU8c4uzliOx6J1TEPKW9Hf6kiapSsl4Rh3t3n0oRnsZKFn8bhqzaxSAOVAXukAg= +SHA256 (Pkgfile) = 95dc49021a50c144d5da192520f496f914b8edca5b4ed1532d2b0abf5715bac7 +SHA256 (.footprint) = 04a21fbe1c83872ba0fccea7be31ca0ac18068969184625414dcbad0dd971f38 +SHA256 (libspiro-dist-20200505.tar.gz) = 06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49 diff --git a/libspiro/Pkgfile b/libspiro/Pkgfile index 4e8bfe261..9856e3912 100644 --- a/libspiro/Pkgfile +++ b/libspiro/Pkgfile @@ -1,12 +1,11 @@ # Description: Simplifies the drawing of beautiful curves. # URL: https://github.com/fontforge/libspiro # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me name=libspiro -version=0.5.20150702 +version=20200505 release=1 -source=(https://github.com/fontforge/libspiro/archive/$version.tar.gz) +source=(https://github.com/fontforge/libspiro/releases/download/$version/libspiro-dist-$version.tar.gz) build() { cd $name-$version

1 0

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

10 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.6): vulkan-tools: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 10 Jun '20

10 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.6): vulkan-loader: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 10 Jun '20

10 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.6): vulkan-headers: 1.1.126.0 -> 1.2.135.0
by crux＠crux.nu 10 Jun '20

10 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.6): glslang: 7.13.3496 -> 8.13.3559
by crux＠crux.nu 10 Jun '20

10 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/core (3.6): Merge branch '3.5' into 3.6
by crux＠crux.nu 10 Jun '20

10 Jun '20

commit 1556fdc32df4beb9933d7b826d3d551ecc8567d6 Merge: d29d8ba1 dc724d09 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jun 10 08:29:38 2020 +0000 Merge branch '3.5' into 3.6

1 0

ports/core (3.6): man-db: update to 2.9.2
by crux＠crux.nu 10 Jun '20

10 Jun '20

commit dc724d097c378583aea6304fd9a6978b3e8b188e Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jun 10 09:43:28 2020 +0200 man-db: update to 2.9.2 diff --git a/man-db/.footprint b/man-db/.footprint index 9c9779f9..8c942358 100644 --- a/man-db/.footprint +++ b/man-db/.footprint @@ -15,12 +15,12 @@ lrwxrwxrwx root/root usr/bin/apropos -> whatis -rwxr-xr-x root/root usr/bin/whatis drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/man-db/ --rwxr-xr-x root/root usr/lib/man-db/libman-2.9.1.so +-rwxr-xr-x root/root usr/lib/man-db/libman-2.9.2.so -rwxr-xr-x root/root usr/lib/man-db/libman.la -lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.9.1.so --rwxr-xr-x root/root usr/lib/man-db/libmandb-2.9.1.so +lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.9.2.so +-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.9.2.so -rwxr-xr-x root/root usr/lib/man-db/libmandb.la -lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.9.1.so +lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.9.2.so drwxr-xr-x root/root usr/lib/man-db/man-db/ -rwxr-xr-x root/root usr/lib/man-db/man-db/globbing -rwxr-xr-x root/root usr/lib/man-db/man-db/manconv diff --git a/man-db/.signature b/man-db/.signature index 5c8c6369..1609b809 100644 --- a/man-db/.signature +++ b/man-db/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqoeoVqZXN4Xv2SYolIumZF6tK5xvlXh7peWvUn79Q9dQj4XWtrbiKfBqAD/OBEoqn4ga5dWa3cx+ql73Zou+Iw0= -SHA256 (Pkgfile) = 2e88e0250b3ab2dae344813075a2076b9ed7b0d9879d6175653bb23406e8542b -SHA256 (.footprint) = 5c1f2bf26b9ba738cd9abb717912f305a2782bd217d93301537743f5032ea31e -SHA256 (man-db-2.9.1.tar.xz) = ba3d8afc5c09a7265a8dabfa0e7c1f4b3ab97df9abf1f6810faa8f301056c74f +RWRJc1FUaeVeqsJ/2Y38CAaOSupOx8PIb19JrG6ZQNbCGFz/aNHV6Y5vms3wCho2vtM9Yjcaw7XZ/BLpX9sduNFdDZ9hnYD+lwQ= +SHA256 (Pkgfile) = 92a5d54a8c0efe83a05c30b0cd7903b92e0a098ec1cbad6e6fee07546f7fa0f3 +SHA256 (.footprint) = ad75b8fdce5d00a41547355e245aa58b836f058d5a20f4401db0784d05be37ce +SHA256 (man-db-2.9.2.tar.xz) = 7b383f26c67525205f96a4a3bfb27993396992794adda6fe05ad565f369f047c SHA256 (mandb.cron) = f2e9f1210bf6b7c3335cc6f3a9551651812428109ea8c4adc9cd5cf73461e0f1 diff --git a/man-db/Pkgfile b/man-db/Pkgfile index a5ea6ccf..1c6e9a53 100644 --- a/man-db/Pkgfile +++ b/man-db/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib gdbm libpipeline name=man-db -version=2.9.1 +version=2.9.2 release=1 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.… \ mandb.cron)

1 0

ports/core (3.6): iptables: update to 1.8.5
by crux＠crux.nu 10 Jun '20

10 Jun '20

commit c53cd21ff3883d5c74e4485b24678fa6ddef9741 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jun 10 09:33:34 2020 +0200 iptables: update to 1.8.5 diff --git a/iptables/.footprint b/iptables/.footprint index f9e87dff..b98dc422 100644 --- a/iptables/.footprint +++ b/iptables/.footprint @@ -25,9 +25,9 @@ lrwxrwxrwx root/root usr/lib/libipq.so -> libipq.so.0.0.0 lrwxrwxrwx root/root usr/lib/libipq.so.0 -> libipq.so.0.0.0 -rwxr-xr-x root/root usr/lib/libipq.so.0.0.0 -rwxr-xr-x root/root usr/lib/libxtables.la -lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.12.2.0 -lrwxrwxrwx root/root usr/lib/libxtables.so.12 -> libxtables.so.12.2.0 --rwxr-xr-x root/root usr/lib/libxtables.so.12.2.0 +lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.12.3.0 +lrwxrwxrwx root/root usr/lib/libxtables.so.12 -> libxtables.so.12.3.0 +-rwxr-xr-x root/root usr/lib/libxtables.so.12.3.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libip4tc.pc -rw-r--r-- root/root usr/lib/pkgconfig/libip6tc.pc @@ -145,6 +145,7 @@ lrwxrwxrwx root/root usr/lib/xtables/libxt_state.so -> libxt_conntrack.so -rwxr-xr-x root/root usr/lib/xtables/libxt_udp.so drwxr-xr-x root/root usr/sbin/ lrwxrwxrwx root/root usr/sbin/ip6tables -> xtables-legacy-multi +lrwxrwxrwx root/root usr/sbin/ip6tables-apply -> iptables-apply lrwxrwxrwx root/root usr/sbin/ip6tables-legacy -> xtables-legacy-multi lrwxrwxrwx root/root usr/sbin/ip6tables-legacy-restore -> xtables-legacy-multi lrwxrwxrwx root/root usr/sbin/ip6tables-legacy-save -> xtables-legacy-multi @@ -174,9 +175,11 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/ipq_set_verdict.3.gz -rw-r--r-- root/root usr/share/man/man3/libipq.3.gz drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/ip6tables-apply.8.gz -rw-r--r-- root/root usr/share/man/man8/ip6tables-restore.8.gz -rw-r--r-- root/root usr/share/man/man8/ip6tables-save.8.gz -rw-r--r-- root/root usr/share/man/man8/ip6tables.8.gz +-rw-r--r-- root/root usr/share/man/man8/iptables-apply.8.gz -rw-r--r-- root/root usr/share/man/man8/iptables-extensions.8.gz -rw-r--r-- root/root usr/share/man/man8/iptables-restore.8.gz -rw-r--r-- root/root usr/share/man/man8/iptables-save.8.gz diff --git a/iptables/.signature b/iptables/.signature index 23e3a08c..dcaafa84 100644 --- a/iptables/.signature +++ b/iptables/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVequAIgoCtuAjlIDAdLXDoDr+3VV2DIKDrmYPhJLUG3Hbs88Wb228ttY01ev4C8vq7mC25heUqUBUsWN3isnV8kgQ= -SHA256 (Pkgfile) = d652319d484fee2a7032f9695b87e02e1056bc03010cd14933d6414303a6887a -SHA256 (.footprint) = bcba7a0b42a6ad13e9eb7ba4cd78abaa0236a7c1c615995c0f30e8b42689a74d -SHA256 (iptables-1.8.4.tar.bz2) = 993a3a5490a544c2cbf2ef15cf7e7ed21af1845baf228318d5c36ef8827e157c +RWRJc1FUaeVeqhqn50Xt7Tw6+iFLgs47AefemErY3IJzH8XZ8bfK3a+rfPFqEnTYE8cYsLDyRPIB+x69yFz2HOqmDbTp+EacpQQ= +SHA256 (Pkgfile) = e65f6cc1392e047b805c48547ccfbd006f9eb1b8e3d0caabb9f00bcfc7bebf53 +SHA256 (.footprint) = bbb2b8a21b1b13db473b8db6a0be57ad534778868e8ed26b9b3471d6036ed439 +SHA256 (iptables-1.8.5.tar.bz2) = d457d74512e63aa3f50336e0597d4023c0e3c6845594d38532efb6ebcb294309 diff --git a/iptables/Pkgfile b/iptables/Pkgfile index d5eb4396..9c1bb9d3 100644 --- a/iptables/Pkgfile +++ b/iptables/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=iptables -version=1.8.4 +version=1.8.5 release=1 source=(https://netfilter.org/projects/$name/files/$name-$version.tar.bz2)

1 0

ports/opt (3.5): strace: update to 5.7
by crux＠crux.nu 10 Jun '20

10 Jun '20

commit 14fac675058a372d7c70e7b47603195dff470e83 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Jun 10 10:27:11 2020 +0200 strace: update to 5.7 diff --git a/strace/.signature b/strace/.signature index d42644cd7..27aba5a25 100644 --- a/strace/.signature +++ b/strace/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ebnuugUvSzuworEo5YD3s3UFt3Q5x8NLSVXxraBk2o4f3Tp6gKCWKtiRAtd9kni2UhMtN5XF8p36M6gOxMkPQM= -SHA256 (Pkgfile) = d1406b712de0e82f4691281ca9f38a0eeaa9d8f043abf7d42c138341a2e7e1d8 +RWSE3ohX2g5d/d8EOVwAgD/LYav56KyRK2O2g8jFo7wVHUt9yazmaIgCoShk5W/6qMbVpoiGt8eUmqb9bajjMc2ViylSBr4K0Qc= +SHA256 (Pkgfile) = 62c86de3fbae306909e7b3febd20953ab09dc9104cd73eafd65c78355550d1f2 SHA256 (.footprint) = dbb0265f75ba6fea56f69b1a1cf5d46fdb6bfab8fdf78be1f66144c29294f71e -SHA256 (strace-5.6.tar.xz) = 189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01 +SHA256 (strace-5.7.tar.xz) = b284b59f9bcd95b9728cea5bd5c0edc5ebe360af73dc76fbf6334f11c777ccd8 diff --git a/strace/Pkgfile b/strace/Pkgfile index d95815777..db2b8449a 100644 --- a/strace/Pkgfile +++ b/strace/Pkgfile @@ -4,7 +4,7 @@ # Depends on: elfutils name=strace -version=5.6 +version=5.7 release=1 source=(https://github.com/strace/strace/releases/download/v$version/$name-…

1 0