From 616339b7f26fafbbbcfd9f5e6282d1bce89e0f2a Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 24 Nov 2023 20:52:02 +0000 Subject: [PATCH] Fri Nov 24 20:52:02 UTC 2023 a/openssl-solibs-3.2.0-x86_64-1.txz: Upgraded. ap/sqlite-3.44.2-x86_64-1.txz: Upgraded. ap/vim-9.0.2127-x86_64-1.txz: Upgraded. Fixed security issues. Thanks to marav for the heads-up. For more information, see: https://www.cve.org/CVERecord?id=CVE-2023-48231 https://www.cve.org/CVERecord?id=CVE-2023-48232 https://www.cve.org/CVERecord?id=CVE-2023-48233 https://www.cve.org/CVERecord?id=CVE-2023-48234 https://www.cve.org/CVERecord?id=CVE-2023-48235 https://www.cve.org/CVERecord?id=CVE-2023-48236 https://www.cve.org/CVERecord?id=CVE-2023-48237 (* Security fix *) d/parallel-20231122-noarch-1.txz: Upgraded. l/cfitsio-4.3.1-x86_64-1.txz: Upgraded. l/ffmpeg-5.1.4-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.268.0. n/openssl-3.2.0-x86_64-1.txz: Upgraded. OpenSSL 3.2.0 is a feature release adding significant new functionality. This release incorporates the following potentially significant or incompatible changes: * The default SSL/TLS security level has been changed from 1 to 2. * The `x509`, `ca`, and `req` apps now always produce X.509v3 certificates. * Subject or issuer names in X.509 objects are now displayed as UTF-8 strings by default. x/vulkan-sdk-1.3.268.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. xap/vim-gvim-9.0.2127-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 43 ++- ChangeLog.txt | 31 ++ FILELIST.TXT | 184 +++++---- recompress.sh | 2 - source/l/ffmpeg/ffmpeg.SlackBuild | 2 +- ...irectXShaderCompiler-dump-reflection.patch | 279 -------------- .../DirectXShaderCompiler-gcc13.patch | 142 ------- source/x/vulkan-sdk/VERSION | 2 +- source/x/vulkan-sdk/fetch-sources.sh | 14 +- source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 357 +++++++++--------- 10 files changed, 356 insertions(+), 700 deletions(-) delete mode 100644 source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch delete mode 100644 source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 9c27036c6..d6cea5133 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,48 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Thu, 23 Nov 2023 17:14:23 GMT - Thu, 23 Nov 2023 18:00:07 GMT + Fri, 24 Nov 2023 20:52:02 GMT + Fri, 24 Nov 2023 21:28:33 GMT maintain_current_git.sh v 1.17 + + Fri, 24 Nov 2023 20:52:02 GMT + Fri, 24 Nov 2023 20:52:02 GMT + https://git.slackware.nl/current/tag/?h=20231124205202 + 20231124205202 + + +a/openssl-solibs-3.2.0-x86_64-1.txz: Upgraded. +ap/sqlite-3.44.2-x86_64-1.txz: Upgraded. +ap/vim-9.0.2127-x86_64-1.txz: Upgraded. + Fixed security issues. + Thanks to marav for the heads-up. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2023-48231 + https://www.cve.org/CVERecord?id=CVE-2023-48232 + https://www.cve.org/CVERecord?id=CVE-2023-48233 + https://www.cve.org/CVERecord?id=CVE-2023-48234 + https://www.cve.org/CVERecord?id=CVE-2023-48235 + https://www.cve.org/CVERecord?id=CVE-2023-48236 + https://www.cve.org/CVERecord?id=CVE-2023-48237 + (* Security fix *) +d/parallel-20231122-noarch-1.txz: Upgraded. +l/cfitsio-4.3.1-x86_64-1.txz: Upgraded. +l/ffmpeg-5.1.4-x86_64-2.txz: Rebuilt. + Recompiled against vulkan-sdk-1.3.268.0. +n/openssl-3.2.0-x86_64-1.txz: Upgraded. + OpenSSL 3.2.0 is a feature release adding significant new functionality. + This release incorporates the following potentially significant or + incompatible changes: + * The default SSL/TLS security level has been changed from 1 to 2. + * The `x509`, `ca`, and `req` apps now always produce X.509v3 certificates. + * Subject or issuer names in X.509 objects are now displayed as UTF-8 strings + by default. +x/vulkan-sdk-1.3.268.0-x86_64-1.txz: Upgraded. + Shared library .so-version bump. +xap/vim-gvim-9.0.2127-x86_64-1.txz: Upgraded. + ]]> + + Thu, 23 Nov 2023 17:14:23 GMT Thu, 23 Nov 2023 17:14:23 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index a429618f6..5f93a1e08 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,34 @@ +Fri Nov 24 20:52:02 UTC 2023 +a/openssl-solibs-3.2.0-x86_64-1.txz: Upgraded. +ap/sqlite-3.44.2-x86_64-1.txz: Upgraded. +ap/vim-9.0.2127-x86_64-1.txz: Upgraded. + Fixed security issues. + Thanks to marav for the heads-up. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2023-48231 + https://www.cve.org/CVERecord?id=CVE-2023-48232 + https://www.cve.org/CVERecord?id=CVE-2023-48233 + https://www.cve.org/CVERecord?id=CVE-2023-48234 + https://www.cve.org/CVERecord?id=CVE-2023-48235 + https://www.cve.org/CVERecord?id=CVE-2023-48236 + https://www.cve.org/CVERecord?id=CVE-2023-48237 + (* Security fix *) +d/parallel-20231122-noarch-1.txz: Upgraded. +l/cfitsio-4.3.1-x86_64-1.txz: Upgraded. +l/ffmpeg-5.1.4-x86_64-2.txz: Rebuilt. + Recompiled against vulkan-sdk-1.3.268.0. +n/openssl-3.2.0-x86_64-1.txz: Upgraded. + OpenSSL 3.2.0 is a feature release adding significant new functionality. + This release incorporates the following potentially significant or + incompatible changes: + * The default SSL/TLS security level has been changed from 1 to 2. + * The `x509`, `ca`, and `req` apps now always produce X.509v3 certificates. + * Subject or issuer names in X.509 objects are now displayed as UTF-8 strings + by default. +x/vulkan-sdk-1.3.268.0-x86_64-1.txz: Upgraded. + Shared library .so-version bump. +xap/vim-gvim-9.0.2127-x86_64-1.txz: Upgraded. ++--------------------------+ Thu Nov 23 17:14:23 UTC 2023 a/lvm2-2.03.23-x86_64-1.txz: Upgraded. l/nodejs-20.10.0-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 57904425e..c34c27ba4 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Nov 23 17:17:47 UTC 2023 +Fri Nov 24 20:56:31 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-11-23 17:14 . +drwxr-xr-x 12 root root 4096 2023-11-24 20:52 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1126920 2023-11-22 19:33 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-22 19:33 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1126924 2023-11-23 17:18 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-23 17:18 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 867804 2023-11-23 17:14 ./ChangeLog.txt +-rw-r--r-- 1 root root 869218 2023-11-24 20:52 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-11-20 21:46 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-11-20 21:46 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1470741 2023-11-22 19:33 ./FILELIST.TXT +-rw-r--r-- 1 root root 1470745 2023-11-23 17:17 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 886377 2023-11-23 17:17 ./PACKAGES.TXT +-rw-r--r-- 1 root root 886377 2023-11-24 20:56 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-11-20 21:34 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -666,13 +666,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-11-23 17:17 ./slackware64 --rw-r--r-- 1 root root 345076 2023-11-23 17:17 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-23 17:17 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 427705 2023-11-23 17:16 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4345893 2023-11-23 17:16 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-11-24 20:56 ./slackware64 +-rw-r--r-- 1 root root 345076 2023-11-24 20:56 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-24 20:56 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 427705 2023-11-24 20:55 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4345441 2023-11-24 20:55 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 32768 2023-11-23 17:16 ./slackware64/a +drwxr-xr-x 2 root root 32768 2023-11-24 20:55 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -929,9 +929,9 @@ drwxr-xr-x 2 root root 32768 2023-11-23 17:16 ./slackware64/a -rw-r--r-- 1 root root 461 2021-02-13 11:12 ./slackware64/a/nvi-1.81.6-x86_64-3.txt -rw-r--r-- 1 root root 338324 2021-02-13 11:12 ./slackware64/a/nvi-1.81.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 11:12 ./slackware64/a/nvi-1.81.6-x86_64-3.txz.asc --rw-r--r-- 1 root root 623 2023-10-24 19:04 ./slackware64/a/openssl-solibs-3.1.4-x86_64-1.txt --rw-r--r-- 1 root root 2026672 2023-10-24 19:04 ./slackware64/a/openssl-solibs-3.1.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-10-24 19:04 ./slackware64/a/openssl-solibs-3.1.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 623 2023-11-24 19:22 ./slackware64/a/openssl-solibs-3.2.0-x86_64-1.txt +-rw-r--r-- 1 root root 2203904 2023-11-24 19:22 ./slackware64/a/openssl-solibs-3.2.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:22 ./slackware64/a/openssl-solibs-3.2.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 654 2023-09-11 20:00 ./slackware64/a/openssl11-solibs-1.1.1w-x86_64-1.txt -rw-r--r-- 1 root root 1363772 2023-09-11 20:00 ./slackware64/a/openssl11-solibs-1.1.1w-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-09-11 20:00 ./slackware64/a/openssl11-solibs-1.1.1w-x86_64-1.txz.asc @@ -1062,7 +1062,7 @@ drwxr-xr-x 2 root root 32768 2023-11-23 17:16 ./slackware64/a -rw-r--r-- 1 root root 540 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txt -rw-r--r-- 1 root root 56160 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz.asc -drwxr-xr-x 2 root root 20480 2023-11-22 19:31 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2023-11-24 20:55 ./slackware64/ap -rw-r--r-- 1 root root 291 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txt -rw-r--r-- 1 root root 653716 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txz.asc @@ -1274,9 +1274,9 @@ drwxr-xr-x 2 root root 20480 2023-11-22 19:31 ./slackware64/ap -rw-r--r-- 1 root root 293 2022-11-19 19:14 ./slackware64/ap/sox-14.4.2-x86_64-9.txt -rw-r--r-- 1 root root 388900 2022-11-19 19:14 ./slackware64/ap/sox-14.4.2-x86_64-9.txz -rw-r--r-- 1 root root 163 2022-11-19 19:14 ./slackware64/ap/sox-14.4.2-x86_64-9.txz.asc --rw-r--r-- 1 root root 483 2023-11-22 19:10 ./slackware64/ap/sqlite-3.44.1-x86_64-1.txt --rw-r--r-- 1 root root 1384056 2023-11-22 19:10 ./slackware64/ap/sqlite-3.44.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-22 19:10 ./slackware64/ap/sqlite-3.44.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 483 2023-11-24 19:27 ./slackware64/ap/sqlite-3.44.2-x86_64-1.txt +-rw-r--r-- 1 root root 1383896 2023-11-24 19:27 ./slackware64/ap/sqlite-3.44.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:27 ./slackware64/ap/sqlite-3.44.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 584 2023-03-28 18:23 ./slackware64/ap/squashfs-tools-4.6.1-x86_64-1.txt -rw-r--r-- 1 root root 198020 2023-03-28 18:23 ./slackware64/ap/squashfs-tools-4.6.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-03-28 18:23 ./slackware64/ap/squashfs-tools-4.6.1-x86_64-1.txz.asc @@ -1305,9 +1305,9 @@ drwxr-xr-x 2 root root 20480 2023-11-22 19:31 ./slackware64/ap -rw-r--r-- 1 root root 375 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txt -rw-r--r-- 1 root root 14756 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txz.asc --rw-r--r-- 1 root root 407 2023-11-21 18:58 ./slackware64/ap/vim-9.0.2116-x86_64-1.txt --rw-r--r-- 1 root root 8509156 2023-11-21 18:58 ./slackware64/ap/vim-9.0.2116-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-21 18:58 ./slackware64/ap/vim-9.0.2116-x86_64-1.txz.asc +-rw-r--r-- 1 root root 407 2023-11-24 18:53 ./slackware64/ap/vim-9.0.2127-x86_64-1.txt +-rw-r--r-- 1 root root 8507260 2023-11-24 18:53 ./slackware64/ap/vim-9.0.2127-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 18:53 ./slackware64/ap/vim-9.0.2127-x86_64-1.txz.asc -rw-r--r-- 1 root root 604 2023-03-05 21:21 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-4.txt -rw-r--r-- 1 root root 178980 2023-03-05 21:21 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-4.txz -rw-r--r-- 1 root root 163 2023-03-05 21:21 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-4.txz.asc @@ -1320,7 +1320,7 @@ drwxr-xr-x 2 root root 20480 2023-11-22 19:31 ./slackware64/ap -rw-r--r-- 1 root root 506 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txt -rw-r--r-- 1 root root 3156392 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2023-11-21 21:10 ./slackware64/d +drwxr-xr-x 2 root root 20480 2023-11-24 20:55 ./slackware64/d -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txt -rw-r--r-- 1 root root 2416392 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txz.asc @@ -1481,9 +1481,9 @@ drwxr-xr-x 2 root root 20480 2023-11-21 21:10 ./slackware64/d -rw-r--r-- 1 root root 529 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txt -rw-r--r-- 1 root root 327656 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txz.asc --rw-r--r-- 1 root root 398 2023-10-24 18:57 ./slackware64/d/parallel-20231022-noarch-1.txt --rw-r--r-- 1 root root 514076 2023-10-24 18:57 ./slackware64/d/parallel-20231022-noarch-1.txz --rw-r--r-- 1 root root 163 2023-10-24 18:57 ./slackware64/d/parallel-20231022-noarch-1.txz.asc +-rw-r--r-- 1 root root 398 2023-11-24 19:20 ./slackware64/d/parallel-20231122-noarch-1.txt +-rw-r--r-- 1 root root 514560 2023-11-24 19:20 ./slackware64/d/parallel-20231122-noarch-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:20 ./slackware64/d/parallel-20231122-noarch-1.txz.asc -rw-r--r-- 1 root root 469 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txt -rw-r--r-- 1 root root 94892 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txz.asc @@ -2754,7 +2754,7 @@ drwxr-xr-x 2 root root 86016 2023-11-18 19:32 ./slackware64/kde -rw-r--r-- 1 root root 517 2023-11-09 19:14 ./slackware64/kde/zanshin-23.08.3-x86_64-1.txt -rw-r--r-- 1 root root 684544 2023-11-09 19:14 ./slackware64/kde/zanshin-23.08.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-11-09 19:14 ./slackware64/kde/zanshin-23.08.3-x86_64-1.txz.asc -drwxr-xr-x 2 root root 86016 2023-11-23 17:16 ./slackware64/l +drwxr-xr-x 2 root root 86016 2023-11-24 20:55 ./slackware64/l -rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt -rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz -rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc @@ -2854,9 +2854,9 @@ drwxr-xr-x 2 root root 86016 2023-11-23 17:16 ./slackware64/l -rw-r--r-- 1 root root 401 2023-02-13 19:48 ./slackware64/l/cairomm-1.14.4-x86_64-1.txt -rw-r--r-- 1 root root 105172 2023-02-13 19:48 ./slackware64/l/cairomm-1.14.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-13 19:48 ./slackware64/l/cairomm-1.14.4-x86_64-1.txz.asc --rw-r--r-- 1 root root 333 2023-07-26 17:19 ./slackware64/l/cfitsio-4.3.0-x86_64-1.txt --rw-r--r-- 1 root root 724880 2023-07-26 17:19 ./slackware64/l/cfitsio-4.3.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-07-26 17:19 ./slackware64/l/cfitsio-4.3.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 333 2023-11-24 19:07 ./slackware64/l/cfitsio-4.3.1-x86_64-1.txt +-rw-r--r-- 1 root root 724024 2023-11-24 19:07 ./slackware64/l/cfitsio-4.3.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:07 ./slackware64/l/cfitsio-4.3.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 471 2021-02-13 06:20 ./slackware64/l/chmlib-0.40-x86_64-5.txt -rw-r--r-- 1 root root 31836 2021-02-13 06:20 ./slackware64/l/chmlib-0.40-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 06:20 ./slackware64/l/chmlib-0.40-x86_64-5.txz.asc @@ -2926,9 +2926,9 @@ drwxr-xr-x 2 root root 86016 2023-11-23 17:16 ./slackware64/l -rw-r--r-- 1 root root 315 2021-02-13 06:27 ./slackware64/l/farstream-0.2.9-x86_64-3.txt -rw-r--r-- 1 root root 268080 2021-02-13 06:27 ./slackware64/l/farstream-0.2.9-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 06:27 ./slackware64/l/farstream-0.2.9-x86_64-3.txz.asc --rw-r--r-- 1 root root 490 2023-11-10 02:49 ./slackware64/l/ffmpeg-5.1.4-x86_64-1.txt --rw-r--r-- 1 root root 10438764 2023-11-10 02:49 ./slackware64/l/ffmpeg-5.1.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-10 02:49 ./slackware64/l/ffmpeg-5.1.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 490 2023-11-24 19:51 ./slackware64/l/ffmpeg-5.1.4-x86_64-2.txt +-rw-r--r-- 1 root root 10439572 2023-11-24 19:51 ./slackware64/l/ffmpeg-5.1.4-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:51 ./slackware64/l/ffmpeg-5.1.4-x86_64-2.txz.asc -rw-r--r-- 1 root root 502 2023-10-05 20:05 ./slackware64/l/fftw-3.3.10-x86_64-2.txt -rw-r--r-- 1 root root 2323336 2023-10-05 20:05 ./slackware64/l/fftw-3.3.10-x86_64-2.txz -rw-r--r-- 1 root root 163 2023-10-05 20:05 ./slackware64/l/fftw-3.3.10-x86_64-2.txz.asc @@ -3978,7 +3978,7 @@ drwxr-xr-x 2 root root 86016 2023-11-23 17:16 ./slackware64/l -rw-r--r-- 1 root root 403 2023-07-06 17:30 ./slackware64/l/zxing-cpp-2.1.0-x86_64-1.txt -rw-r--r-- 1 root root 754048 2023-07-06 17:30 ./slackware64/l/zxing-cpp-2.1.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-07-06 17:30 ./slackware64/l/zxing-cpp-2.1.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2023-11-23 17:16 ./slackware64/n +drwxr-xr-x 2 root root 36864 2023-11-24 20:55 ./slackware64/n -rw-r--r-- 1 root root 357 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txt -rw-r--r-- 1 root root 1517848 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz.asc @@ -4316,9 +4316,9 @@ drwxr-xr-x 2 root root 36864 2023-11-23 17:16 ./slackware64/n -rw-r--r-- 1 root root 672 2023-10-04 19:05 ./slackware64/n/openssh-9.5p1-x86_64-1.txt -rw-r--r-- 1 root root 1082156 2023-10-04 19:05 ./slackware64/n/openssh-9.5p1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-04 19:05 ./slackware64/n/openssh-9.5p1-x86_64-1.txz.asc --rw-r--r-- 1 root root 559 2023-10-24 19:04 ./slackware64/n/openssl-3.1.4-x86_64-1.txt --rw-r--r-- 1 root root 4742208 2023-10-24 19:04 ./slackware64/n/openssl-3.1.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-10-24 19:04 ./slackware64/n/openssl-3.1.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 559 2023-11-24 19:22 ./slackware64/n/openssl-3.2.0-x86_64-1.txt +-rw-r--r-- 1 root root 5513012 2023-11-24 19:22 ./slackware64/n/openssl-3.2.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:22 ./slackware64/n/openssl-3.2.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 583 2023-09-11 20:00 ./slackware64/n/openssl11-1.1.1w-x86_64-1.txt -rw-r--r-- 1 root root 1782356 2023-09-11 20:00 ./slackware64/n/openssl11-1.1.1w-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-09-11 20:00 ./slackware64/n/openssl11-1.1.1w-x86_64-1.txz.asc @@ -4488,7 +4488,7 @@ drwxr-xr-x 2 root root 4096 2023-11-01 23:47 ./slackware64/tcl -rw-r--r-- 1 root root 227 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txt -rw-r--r-- 1 root root 1802760 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2023-11-21 21:10 ./slackware64/x +drwxr-xr-x 2 root root 65536 2023-11-24 20:55 ./slackware64/x -rw-r--r-- 1 root root 440 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txt -rw-r--r-- 1 root root 644060 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txz.asc @@ -5031,9 +5031,9 @@ drwxr-xr-x 2 root root 65536 2023-11-21 21:10 ./slackware64/x -rw-r--r-- 1 root root 338 2022-10-15 19:51 ./slackware64/x/viewres-1.0.7-x86_64-1.txt -rw-r--r-- 1 root root 26808 2022-10-15 19:51 ./slackware64/x/viewres-1.0.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-15 19:51 ./slackware64/x/viewres-1.0.7-x86_64-1.txz.asc --rw-r--r-- 1 root root 527 2023-08-28 20:54 ./slackware64/x/vulkan-sdk-1.3.250.0-x86_64-1.txt --rw-r--r-- 1 root root 29204104 2023-08-28 20:54 ./slackware64/x/vulkan-sdk-1.3.250.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-08-28 20:54 ./slackware64/x/vulkan-sdk-1.3.250.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 527 2023-11-24 19:45 ./slackware64/x/vulkan-sdk-1.3.268.0-x86_64-1.txt +-rw-r--r-- 1 root root 28565824 2023-11-24 19:45 ./slackware64/x/vulkan-sdk-1.3.268.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 19:45 ./slackware64/x/vulkan-sdk-1.3.268.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 551 2023-04-04 19:08 ./slackware64/x/wayland-1.22.0-x86_64-1.txt -rw-r--r-- 1 root root 132912 2023-04-04 19:08 ./slackware64/x/wayland-1.22.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-04 19:08 ./slackware64/x/wayland-1.22.0-x86_64-1.txz.asc @@ -5373,7 +5373,7 @@ drwxr-xr-x 2 root root 65536 2023-11-21 21:10 ./slackware64/x -rw-r--r-- 1 root root 213 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txt -rw-r--r-- 1 root root 25896 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz.asc -drwxr-xr-x 2 root root 16384 2023-11-22 19:31 ./slackware64/xap +drwxr-xr-x 2 root root 16384 2023-11-24 20:55 ./slackware64/xap -rw-r--r-- 1 root root 625 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txt -rw-r--r-- 1 root root 2750024 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txz.asc @@ -5487,9 +5487,9 @@ drwxr-xr-x 2 root root 16384 2023-11-22 19:31 ./slackware64/xap -rw-r--r-- 1 root root 1351876 2022-10-09 17:57 ./slackware64/xap/ssr-0.4.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-09 17:57 ./slackware64/xap/ssr-0.4.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 676 2021-09-23 19:13 ./slackware64/xap/tagfile --rw-r--r-- 1 root root 527 2023-11-21 19:01 ./slackware64/xap/vim-gvim-9.0.2116-x86_64-1.txt --rw-r--r-- 1 root root 1781336 2023-11-21 19:01 ./slackware64/xap/vim-gvim-9.0.2116-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-21 19:01 ./slackware64/xap/vim-gvim-9.0.2116-x86_64-1.txz.asc +-rw-r--r-- 1 root root 527 2023-11-24 18:54 ./slackware64/xap/vim-gvim-9.0.2127-x86_64-1.txt +-rw-r--r-- 1 root root 1780228 2023-11-24 18:54 ./slackware64/xap/vim-gvim-9.0.2127-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-24 18:54 ./slackware64/xap/vim-gvim-9.0.2127-x86_64-1.txz.asc -rw-r--r-- 1 root root 455 2023-08-08 19:02 ./slackware64/xap/windowmaker-0.96.0-x86_64-1.txt -rw-r--r-- 1 root root 1783948 2023-08-08 19:02 ./slackware64/xap/windowmaker-0.96.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-08-08 19:02 ./slackware64/xap/windowmaker-0.96.0-x86_64-1.txz.asc @@ -5640,11 +5640,11 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y -rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-11-23 17:17 ./source --rw-r--r-- 1 root root 605237 2023-11-23 17:17 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-23 17:17 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 842348 2023-11-23 17:17 ./source/FILE_LIST --rw-r--r-- 1 root root 25113318 2023-11-23 17:17 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-11-24 20:56 ./source +-rw-r--r-- 1 root root 605121 2023-11-24 20:56 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-24 20:56 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 842198 2023-11-24 20:56 ./source/FILE_LIST +-rw-r--r-- 1 root root 25110932 2023-11-24 20:56 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 124 root root 4096 2023-11-20 18:52 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -7276,10 +7276,10 @@ drwxr-xr-x 2 root root 4096 2022-11-19 19:14 ./source/ap/sox -rw-r--r-- 1 root root 744 2018-06-26 22:00 ./source/ap/sox/slack-desc -rw-r--r-- 1 root root 763840 2015-02-22 21:04 ./source/ap/sox/sox-14.4.2.tar.xz -rwxr-xr-x 1 root root 4156 2022-11-19 19:14 ./source/ap/sox/sox.SlackBuild -drwxr-xr-x 2 root root 4096 2023-11-22 19:09 ./source/ap/sqlite +drwxr-xr-x 2 root root 4096 2023-11-24 19:25 ./source/ap/sqlite -rw-r--r-- 1 root root 1684 2008-08-01 05:31 ./source/ap/sqlite/COPYRIGHT.gz -rw-r--r-- 1 root root 937 2018-11-29 19:15 ./source/ap/sqlite/slack-desc --rw-r--r-- 1 root root 7798800 2023-11-22 15:34 ./source/ap/sqlite/sqlite-src-3440100.tar.lz +-rw-r--r-- 1 root root 7804299 2023-11-24 13:49 ./source/ap/sqlite/sqlite-src-3440200.tar.lz -rwxr-xr-x 1 root root 6340 2023-10-10 18:03 ./source/ap/sqlite/sqlite.SlackBuild drwxr-xr-x 2 root root 4096 2023-03-28 18:23 ./source/ap/squashfs-tools -rwxr-xr-x 1 root root 1939 2020-07-09 18:37 ./source/ap/squashfs-tools/get-squashfs-tools.sh @@ -7338,14 +7338,14 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/vbetool -rw-r--r-- 1 root root 24915 2015-12-20 20:37 ./source/ap/vbetool/vbetool-1.2.2.tar.gz -rwxr-xr-x 1 root root 3202 2021-02-13 05:31 ./source/ap/vbetool/vbetool.SlackBuild -rw-r--r-- 1 root root 129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info -drwxr-xr-x 2 root root 4096 2023-11-21 18:51 ./source/ap/vim +drwxr-xr-x 2 root root 4096 2023-11-24 18:53 ./source/ap/vim -rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./source/ap/vim/ctags-5.8.tar.xz -rw-r--r-- 1 root root 2768 2022-02-12 08:11 ./source/ap/vim/ctags.use-conventional-unused-marker.patch.gz -rw-r--r-- 1 root root 505 2022-09-26 18:00 ./source/ap/vim/doinst.sh.gz -rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./source/ap/vim/gvim.png -rw-r--r-- 1 root root 858 2023-08-07 19:00 ./source/ap/vim/slack-desc.vim -rw-r--r-- 1 root root 983 2023-08-07 19:01 ./source/ap/vim/slack-desc.vim-gvim --rw-r--r-- 1 root root 11092272 2023-11-21 18:50 ./source/ap/vim/vim-9.0.2116.tar.lz +-rw-r--r-- 1 root root 11095770 2023-11-24 18:52 ./source/ap/vim/vim-9.0.2127.tar.lz -rwxr-xr-x 1 root root 6486 2023-09-04 19:45 ./source/ap/vim/vim-gvim.SlackBuild -rwxr-xr-x 1 root root 7877 2023-09-04 19:45 ./source/ap/vim/vim.SlackBuild -rw-r--r-- 1 root root 76 2022-12-08 18:30 ./source/ap/vim/vim.url @@ -7676,8 +7676,8 @@ drwxr-xr-x 2 root root 4096 2023-04-15 18:36 ./source/d/pahole -rwxr-xr-x 1 root root 3820 2022-05-23 18:28 ./source/d/pahole/pahole.SlackBuild -rw-r--r-- 1 root root 52 2022-05-23 18:20 ./source/d/pahole/pahole.url -rw-r--r-- 1 root root 1015 2022-05-23 18:32 ./source/d/pahole/slack-desc -drwxr-xr-x 2 root root 4096 2023-10-24 18:57 ./source/d/parallel --rw-r--r-- 1 root root 2020285 2023-10-23 22:34 ./source/d/parallel/parallel-20231022.tar.lz +drwxr-xr-x 2 root root 4096 2023-11-24 19:20 ./source/d/parallel +-rw-r--r-- 1 root root 2021140 2023-11-23 00:45 ./source/d/parallel/parallel-20231122.tar.lz -rwxr-xr-x 1 root root 4535 2022-09-06 18:27 ./source/d/parallel/parallel.SlackBuild -rw-r--r-- 1 root root 857 2018-04-21 03:27 ./source/d/parallel/slack-desc drwxr-xr-x 2 root root 4096 2023-04-24 19:57 ./source/d/patchelf @@ -10034,8 +10034,8 @@ drwxr-xr-x 2 root root 4096 2023-02-13 19:46 ./source/l/cairomm -rw-r--r-- 1 root root 659 2022-09-21 13:37 ./source/l/cairomm/cairomm-1.14.4.tar.xz.asc -rwxr-xr-x 1 root root 3840 2023-02-13 19:48 ./source/l/cairomm/cairomm.SlackBuild -rw-r--r-- 1 root root 888 2018-02-27 06:12 ./source/l/cairomm/slack-desc -drwxr-xr-x 2 root root 4096 2023-07-26 17:19 ./source/l/cfitsio --rw-r--r-- 1 root root 3318820 2023-07-25 21:24 ./source/l/cfitsio/cfitsio-4.3.0.tar.lz +drwxr-xr-x 2 root root 4096 2023-11-24 19:06 ./source/l/cfitsio +-rw-r--r-- 1 root root 3322699 2023-11-20 03:15 ./source/l/cfitsio/cfitsio-4.3.1.tar.lz -rwxr-xr-x 1 root root 4400 2022-09-06 18:27 ./source/l/cfitsio/cfitsio.SlackBuild -rw-r--r-- 1 root root 52 2020-09-28 20:28 ./source/l/cfitsio/cfitsio.url -rw-r--r-- 1 root root 820 2020-11-01 20:04 ./source/l/cfitsio/slack-desc @@ -10176,7 +10176,7 @@ drwxr-xr-x 2 root root 4096 2023-11-10 02:46 ./source/l/ffmpeg -rw-r--r-- 1 root root 542 2022-10-03 17:27 ./source/l/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch.gz -rw-r--r-- 1 root root 10009968 2023-11-09 23:39 ./source/l/ffmpeg/ffmpeg-5.1.4.tar.xz -rw-r--r-- 1 root root 520 2023-11-09 23:41 ./source/l/ffmpeg/ffmpeg-5.1.4.tar.xz.asc --rwxr-xr-x 1 root root 11848 2023-11-10 02:48 ./source/l/ffmpeg/ffmpeg.SlackBuild +-rwxr-xr-x 1 root root 11848 2023-11-24 19:50 ./source/l/ffmpeg/ffmpeg.SlackBuild -rw-r--r-- 1 root root 463 2023-08-29 18:13 ./source/l/ffmpeg/ffmpeg.vulkan.diff.gz -rw-r--r-- 1 root root 944 2018-12-10 19:57 ./source/l/ffmpeg/slack-desc drwxr-xr-x 2 root root 4096 2022-11-21 20:13 ./source/l/fftw @@ -12942,13 +12942,13 @@ drwxr-xr-x 2 root root 4096 2023-10-04 19:04 ./source/n/openssh -rw-r--r-- 1 root root 318 2017-07-18 18:45 ./source/n/openssh/sshd.default -rw-r--r-- 1 root root 1228 2021-09-29 19:00 ./source/n/openssh/sshd.pam -rw-r--r-- 1 root root 271 2021-08-21 03:23 ./source/n/openssh/sshd_config-pam.diff.gz -drwxr-xr-x 2 root root 4096 2023-10-24 18:54 ./source/n/openssl +drwxr-xr-x 2 root root 4096 2023-11-24 19:19 ./source/n/openssl -rw-r--r-- 1 root root 1068 2023-03-09 18:26 ./source/n/openssl/0024-load-legacy-prov.patch.gz -rw-r--r-- 1 root root 1791 2023-08-12 19:52 ./source/n/openssl/certwatch.gz -rw-r--r-- 1 root root 281 2007-06-13 17:20 ./source/n/openssl/doinst.sh-openssl-solibs.gz -rw-r--r-- 1 root root 501 2012-07-12 16:21 ./source/n/openssl/doinst.sh-openssl.gz --rw-r--r-- 1 root root 15569450 2023-10-24 13:59 ./source/n/openssl/openssl-3.1.4.tar.gz --rw-r--r-- 1 root root 833 2023-10-24 13:59 ./source/n/openssl/openssl-3.1.4.tar.gz.asc +-rw-r--r-- 1 root root 17698352 2023-11-23 13:31 ./source/n/openssl/openssl-3.2.0.tar.gz +-rw-r--r-- 1 root root 833 2023-11-23 13:31 ./source/n/openssl/openssl-3.2.0.tar.gz.asc -rwxr-xr-x 1 root root 7737 2023-09-19 21:54 ./source/n/openssl/openssl.SlackBuild -rw-r--r-- 1 root root 1014 2018-02-27 06:13 ./source/n/openssl/slack-desc.openssl -rw-r--r-- 1 root root 1085 2018-02-27 06:13 ./source/n/openssl/slack-desc.openssl-solibs @@ -13337,7 +13337,7 @@ drwxr-xr-x 2 root root 4096 2022-11-23 19:53 ./source/tcl/tk -rwxr-xr-x 1 root root 4429 2022-11-23 19:05 ./source/tcl/tk/tk.SlackBuild -rw-r--r-- 1 root root 48 2021-01-04 23:37 ./source/tcl/tk/tk.url -rw-r--r-- 1 root root 3026044 2022-11-21 19:56 ./source/tcl/tk/tk8.6.13-src.tar.lz -drwxr-xr-x 83 root root 4096 2023-11-12 20:28 ./source/x +drwxr-xr-x 83 root root 4096 2023-11-24 19:33 ./source/x -rw-r--r-- 1 root root 760 2023-05-22 17:51 ./source/x/FTBFSlog drwxr-xr-x 2 root root 4096 2023-10-17 18:02 ./source/x/OpenCC -rw-r--r-- 1 root root 2443652 2023-10-15 11:50 ./source/x/OpenCC/OpenCC-ver.1.1.7.tar.lz @@ -13769,35 +13769,33 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/x/urw-core35-fonts- -rw-r--r-- 1 root root 970 2018-02-27 06:13 ./source/x/urw-core35-fonts-otf/slack-desc -rw-r--r-- 1 root root 1518612 2018-04-27 18:20 ./source/x/urw-core35-fonts-otf/urw-core35-fonts-otf-20170801_91edd6e_git.tar.xz -rwxr-xr-x 1 root root 2525 2021-02-13 05:32 ./source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild -drwxr-xr-x 2 root root 4096 2023-08-12 19:49 ./source/x/vulkan-sdk --rw-r--r-- 1 root root 19380308 2023-08-12 18:59 ./source/x/vulkan-sdk/DirectXShaderCompiler-021f8f3e1267db0f0e3362276cdda95785de0529.tar.lz --rw-r--r-- 1 root root 3351 2023-08-12 11:53 ./source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch.gz --rw-r--r-- 1 root root 1617 2023-08-12 10:44 ./source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch.gz --rw-r--r-- 1 root root 892561 2023-08-12 18:54 ./source/x/vulkan-sdk/SPIRV-Cross-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 150565 2023-08-12 18:54 ./source/x/vulkan-sdk/SPIRV-Headers-268a061764ee69f09a477a695bf6a11ffe311b8d.tar.lz --rw-r--r-- 1 root root 758955 2023-08-12 18:54 ./source/x/vulkan-sdk/SPIRV-Reflect-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 2000695 2023-08-12 18:54 ./source/x/vulkan-sdk/SPIRV-Tools-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 10 2023-08-12 19:00 ./source/x/vulkan-sdk/VERSION --rw-r--r-- 1 root root 532640 2023-08-12 18:57 ./source/x/vulkan-sdk/Vulkan-ExtensionLayer-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 1043327 2023-08-12 18:55 ./source/x/vulkan-sdk/Vulkan-Headers-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 1386449 2023-08-12 18:55 ./source/x/vulkan-sdk/Vulkan-Loader-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 797921 2023-08-12 18:56 ./source/x/vulkan-sdk/Vulkan-Profiles-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 489701 2023-08-12 18:55 ./source/x/vulkan-sdk/Vulkan-Tools-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 19415 2023-08-12 18:57 ./source/x/vulkan-sdk/Vulkan-Utility-Libraries-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 3013992 2023-08-12 18:56 ./source/x/vulkan-sdk/Vulkan-ValidationLayers-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 3549272 2023-08-12 19:00 ./source/x/vulkan-sdk/VulkanCapsViewer-3.30.tar.lz --rw-r--r-- 1 root root 625326 2023-08-12 18:58 ./source/x/vulkan-sdk/VulkanMemoryAllocator-0e89587db3ebee4d463f191bd296374c5fafc8ea.tar.lz --rw-r--r-- 1 root root 4222966 2023-08-12 18:58 ./source/x/vulkan-sdk/VulkanTools-sdk-1.3.250.tar.lz --rwxr-xr-x 1 root root 6761 2023-08-12 18:53 ./source/x/vulkan-sdk/fetch-sources.sh --rw-r--r-- 1 root root 16265521 2023-08-12 18:57 ./source/x/vulkan-sdk/gfxreconstruct-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 1920892 2023-08-12 18:54 ./source/x/vulkan-sdk/glslang-sdk-1.3.250.tar.lz --rw-r--r-- 1 root root 127856 2023-08-12 18:57 ./source/x/vulkan-sdk/jsoncpp-1.9.5.tar.lz --rw-r--r-- 1 root root 135628 2023-08-12 18:56 ./source/x/vulkan-sdk/robin-hood-hashing-3.11.5.tar.lz --rw-r--r-- 1 root root 164436 2023-08-12 19:00 ./source/x/vulkan-sdk/shaderc-45b735dfddefe26a99b77e5a74e30d860713ac64.tar.lz +drwxr-xr-x 2 root root 4096 2023-11-24 19:40 ./source/x/vulkan-sdk +-rw-r--r-- 1 root root 19347999 2023-11-24 19:39 ./source/x/vulkan-sdk/DirectXShaderCompiler-93ad5b31316cfed379a8e83bb6cfbbc8bc886ff9.tar.lz +-rw-r--r-- 1 root root 908959 2023-11-24 19:35 ./source/x/vulkan-sdk/SPIRV-Cross-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 159695 2023-11-24 19:35 ./source/x/vulkan-sdk/SPIRV-Headers-e867c06631767a2d96424cbec530f9ee5e78180f.tar.lz +-rw-r--r-- 1 root root 765868 2023-11-24 19:35 ./source/x/vulkan-sdk/SPIRV-Reflect-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 2013039 2023-11-24 19:35 ./source/x/vulkan-sdk/SPIRV-Tools-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 10 2023-11-24 19:40 ./source/x/vulkan-sdk/VERSION +-rw-r--r-- 1 root root 527201 2023-11-24 19:37 ./source/x/vulkan-sdk/Vulkan-ExtensionLayer-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 1123433 2023-11-24 19:36 ./source/x/vulkan-sdk/Vulkan-Headers-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 1400810 2023-11-24 19:36 ./source/x/vulkan-sdk/Vulkan-Loader-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 799288 2023-11-24 19:37 ./source/x/vulkan-sdk/Vulkan-Profiles-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 481777 2023-11-24 19:36 ./source/x/vulkan-sdk/Vulkan-Tools-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 119232 2023-11-24 19:37 ./source/x/vulkan-sdk/Vulkan-Utility-Libraries-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 3123312 2023-11-24 19:37 ./source/x/vulkan-sdk/Vulkan-ValidationLayers-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 3619703 2023-11-24 19:40 ./source/x/vulkan-sdk/VulkanCapsViewer-3.32.tar.lz +-rw-r--r-- 1 root root 624582 2023-11-24 19:39 ./source/x/vulkan-sdk/VulkanMemoryAllocator-2f382df218d7e8516dee3b3caccb819a62b571a2.tar.lz +-rw-r--r-- 1 root root 3407526 2023-11-24 19:39 ./source/x/vulkan-sdk/VulkanTools-vulkan-sdk-1.3.268.tar.lz +-rwxr-xr-x 1 root root 7270 2023-11-24 05:45 ./source/x/vulkan-sdk/fetch-sources.sh +-rw-r--r-- 1 root root 16930233 2023-11-24 19:38 ./source/x/vulkan-sdk/gfxreconstruct-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 1969742 2023-11-24 19:34 ./source/x/vulkan-sdk/glslang-vulkan-sdk-1.3.268.tar.lz +-rw-r--r-- 1 root root 127655 2023-11-24 19:37 ./source/x/vulkan-sdk/jsoncpp-1.9.5.tar.lz +-rw-r--r-- 1 root root 135224 2023-11-24 19:37 ./source/x/vulkan-sdk/robin-hood-hashing-3.11.5.tar.lz +-rw-r--r-- 1 root root 165148 2023-11-24 19:40 ./source/x/vulkan-sdk/shaderc-2023.7.tar.lz -rw-r--r-- 1 root root 1017 2018-02-27 06:13 ./source/x/vulkan-sdk/slack-desc --rw-r--r-- 1 root root 547160 2023-08-12 18:57 ./source/x/vulkan-sdk/valijson-v1.0.tar.lz --rw-r--r-- 1 root root 31374 2023-08-12 18:58 ./source/x/vulkan-sdk/volk-sdk-1.3.250.tar.lz --rwxr-xr-x 1 root root 31447 2023-08-12 19:49 ./source/x/vulkan-sdk/vulkan-sdk.SlackBuild +-rw-r--r-- 1 root root 547617 2023-11-24 19:37 ./source/x/vulkan-sdk/valijson-v1.0.1.tar.lz +-rw-r--r-- 1 root root 32429 2023-11-24 19:39 ./source/x/vulkan-sdk/volk-vulkan-sdk-1.3.268.tar.lz +-rwxr-xr-x 1 root root 32430 2023-11-24 05:23 ./source/x/vulkan-sdk/vulkan-sdk.SlackBuild drwxr-xr-x 2 root root 4096 2023-04-04 19:07 ./source/x/wayland drwxr-xr-x 2 root root 4096 2023-07-03 18:45 ./source/x/wayland-protocols -rw-r--r-- 1 root root 1063 2020-02-19 20:00 ./source/x/wayland-protocols/slack-desc @@ -15269,7 +15267,7 @@ drwxr-xr-x 2 root root 4096 2021-01-29 18:38 ./source/xap/xpdf/lang -rw-r--r-- 1 root root 381 2019-10-03 18:53 ./source/xap/xpdf/lang/xpdf-chinese-simplified.diff.gz -rw-r--r-- 1 root root 361568 2020-12-22 22:47 ./source/xap/xpdf/lang/xpdf-chinese-simplified.tar.xz -rw-r--r-- 1 root root 361 2019-10-03 18:59 ./source/xap/xpdf/lang/xpdf-chinese-traditional.diff.gz --rw-r--r-- 1 root root 374404 2020-12-22 22:47 ./source/xap/xpdf/lang/xpdf-chinese-traditional.tar.xz +-rw-r--r-- 1 root root 374404 2020-12-22 22:47 ./source/xap/xpdf/lang/xpdf-chinese-traditional.tar.xz -rw-r--r-- 1 root root 1504 2011-08-15 21:28 ./source/xap/xpdf/lang/xpdf-cyrillic-2011-aug-15.tar.xz -rw-r--r-- 1 root root 266 2013-03-28 20:51 ./source/xap/xpdf/lang/xpdf-cyrillic.diff.gz -rw-r--r-- 1 root root 1268 2011-08-15 21:28 ./source/xap/xpdf/lang/xpdf-greek-2011-aug-15.tar.xz diff --git a/recompress.sh b/recompress.sh index 025d72ad3..cf924b7c1 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1058,8 +1058,6 @@ gzip ./source/x/motif/motif-2.3.4-no_demos.patch gzip ./source/x/motif/motif.rgbtxt.patch gzip ./source/x/motif/motif-2.3.4-bindings.patch gzip ./source/x/motif/motif-2.3.4-mwmrc_dir.patch -gzip ./source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch -gzip ./source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch gzip ./source/x/mesa/doinst.sh gzip ./source/x/urw-core35-fonts-otf/doinst.sh gzip ./source/x/ibus-hangul/doinst.sh diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index 2874f9082..10fff805d 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch b/source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch deleted file mode 100644 index 088c976d6..000000000 --- a/source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch +++ /dev/null @@ -1,279 +0,0 @@ -From daf1386161cd6912fbd358f13d74e81466edab8b Mon Sep 17 00:00:00 2001 -From: Xiang Li -Date: Wed, 24 May 2023 13:13:36 -0400 -Subject: [PATCH] [dxa] Add option to dump reflection (#5232) - -* [dxa] Add option to dump reflection - -New option -dumpreflection is added to dump reflection data. -This is to support %D3DReflect test in lit. - -* Move Reflection dump to DxilContainer. ---- - lib/DxilContainer/CMakeLists.txt | 3 + - .../DxilContainer}/D3DReflectionDumper.cpp | 0 - .../DxilContainer}/D3DReflectionStrings.cpp | 0 - .../DxilContainer}/RDATDumper.cpp | 0 - tools/clang/test/DXC/dxa_tests.test | 73 +++++++++++++++++++ - tools/clang/tools/dxa/CMakeLists.txt | 1 - - tools/clang/tools/dxa/dxa.cpp | 72 +++++++++++++++++- - .../unittests/HLSLTestLib/CMakeLists.txt | 3 - - utils/hct/hcttestcmds.cmd | 7 ++ - 9 files changed, 153 insertions(+), 6 deletions(-) - rename {tools/clang/unittests/HLSLTestLib => lib/DxilContainer}/D3DReflectionDumper.cpp (100%) - rename {tools/clang/unittests/HLSLTestLib => lib/DxilContainer}/D3DReflectionStrings.cpp (100%) - rename {tools/clang/unittests/HLSLTestLib => lib/DxilContainer}/RDATDumper.cpp (100%) - -diff --git a/lib/DxilContainer/CMakeLists.txt b/lib/DxilContainer/CMakeLists.txt -index f0ab344d23..a6369a36e6 100644 ---- a/lib/DxilContainer/CMakeLists.txt -+++ b/lib/DxilContainer/CMakeLists.txt -@@ -1,12 +1,15 @@ - # Copyright (C) Microsoft Corporation. All rights reserved. - # This file is distributed under the University of Illinois Open Source License. See LICENSE.TXT for details. - add_llvm_library(LLVMDxilContainer -+ D3DReflectionDumper.cpp -+ D3DReflectionStrings.cpp - DxilContainer.cpp - DxilContainerAssembler.cpp - DxilContainerReader.cpp - DxcContainerBuilder.cpp - DxilRDATBuilder.cpp - DxilRuntimeReflection.cpp -+ RDATDumper.cpp - RDATDxilSubobjects.cpp - - ADDITIONAL_HEADER_DIRS -diff --git a/tools/clang/unittests/HLSLTestLib/D3DReflectionDumper.cpp b/lib/DxilContainer/D3DReflectionDumper.cpp -similarity index 100% -rename from tools/clang/unittests/HLSLTestLib/D3DReflectionDumper.cpp -rename to lib/DxilContainer/D3DReflectionDumper.cpp -diff --git a/tools/clang/unittests/HLSLTestLib/D3DReflectionStrings.cpp b/lib/DxilContainer/D3DReflectionStrings.cpp -similarity index 100% -rename from tools/clang/unittests/HLSLTestLib/D3DReflectionStrings.cpp -rename to lib/DxilContainer/D3DReflectionStrings.cpp -diff --git a/tools/clang/unittests/HLSLTestLib/RDATDumper.cpp b/lib/DxilContainer/RDATDumper.cpp -similarity index 100% -rename from tools/clang/unittests/HLSLTestLib/RDATDumper.cpp -rename to lib/DxilContainer/RDATDumper.cpp -diff --git a/tools/clang/test/DXC/dxa_tests.test b/tools/clang/test/DXC/dxa_tests.test -index a7d8ee5bad..655155941b 100644 ---- a/tools/clang/test/DXC/dxa_tests.test -+++ b/tools/clang/test/DXC/dxa_tests.test -@@ -34,3 +34,76 @@ - // RUN: %dxc -dumpbin %t.rebuilt-container2.cso | FileCheck %s --check-prefix=REBUILD - - // REBUILD:define void @main() -+ -+// RUN: %dxa %t.dxa.cso -dumpreflection | FileCheck %s --check-prefix=REFLECTION -+// REFLECTION: ID3D12ShaderReflection: -+// REFLECTION-NEXT: D3D12_SHADER_DESC: -+// REFLECTION-NEXT: Shader Version: Vertex 6.0 -+// REFLECTION-NEXT: Creator: dxc -+// REFLECTION-NEXT: Flags: 0 -+// REFLECTION-NEXT: ConstantBuffers: 1 -+// REFLECTION-NEXT: BoundResources: 1 -+// REFLECTION-NEXT: InputParameters: 0 -+// REFLECTION-NEXT: OutputParameters: 1 -+// REFLECTION-NEXT: InstructionCount: 10 -+// REFLECTION-NEXT: TempArrayCount: 0 -+// REFLECTION-NEXT: DynamicFlowControlCount: 0 -+// REFLECTION-NEXT: ArrayInstructionCount: 0 -+// REFLECTION-NEXT: TextureNormalInstructions: 0 -+// REFLECTION-NEXT: TextureLoadInstructions: 0 -+// REFLECTION-NEXT: TextureCompInstructions: 0 -+// REFLECTION-NEXT: TextureBiasInstructions: 0 -+// REFLECTION-NEXT: TextureGradientInstructions: 0 -+// REFLECTION-NEXT: FloatInstructionCount: 1 -+// REFLECTION-NEXT: IntInstructionCount: 1 -+// REFLECTION-NEXT: UintInstructionCount: 0 -+// REFLECTION-NEXT: CutInstructionCount: 0 -+// REFLECTION-NEXT: EmitInstructionCount: 0 -+// REFLECTION-NEXT: cBarrierInstructions: 0 -+// REFLECTION-NEXT: cInterlockedInstructions: 0 -+// REFLECTION-NEXT: cTextureStoreInstructions: 0 -+// REFLECTION-NEXT: OutputParameter Elements: 1 -+// REFLECTION-NEXT: D3D12_SIGNATURE_PARAMETER_DESC: SemanticName: SV_POSITION SemanticIndex: 0 -+// REFLECTION-NEXT: Register: 0 -+// REFLECTION-NEXT: SystemValueType: D3D_NAME_POSITION -+// REFLECTION-NEXT: ComponentType: D3D_REGISTER_COMPONENT_FLOAT32 -+// REFLECTION-NEXT: Mask: xyzw (15) -+// REFLECTION-NEXT: ReadWriteMask: ---- (0) (AlwaysReads/NeverWrites) -+// REFLECTION-NEXT: Stream: 0 -+// REFLECTION-NEXT: MinPrecision: D3D_MIN_PRECISION_DEFAULT -+// REFLECTION-NEXT: Constant Buffers: -+// REFLECTION-NEXT: ID3D12ShaderReflectionConstantBuffer: -+// REFLECTION-NEXT: D3D12_SHADER_BUFFER_DESC: Name: $Globals -+// REFLECTION-NEXT: Type: D3D_CT_CBUFFER -+// REFLECTION-NEXT: Size: 16 -+// REFLECTION-NEXT: uFlags: 0 -+// REFLECTION-NEXT: Num Variables: 1 -+// REFLECTION-NEXT: { -+// REFLECTION-NEXT: ID3D12ShaderReflectionVariable: -+// REFLECTION-NEXT: D3D12_SHADER_VARIABLE_DESC: Name: g -+// REFLECTION-NEXT: Size: 4 -+// REFLECTION-NEXT: StartOffset: 0 -+// REFLECTION-NEXT: uFlags: (D3D_SVF_USED) -+// REFLECTION-NEXT: DefaultValue: -+// REFLECTION-NEXT: ID3D12ShaderReflectionType: -+// REFLECTION-NEXT: D3D12_SHADER_TYPE_DESC: Name: int -+// REFLECTION-NEXT: Class: D3D_SVC_SCALAR -+// REFLECTION-NEXT: Type: D3D_SVT_INT -+// REFLECTION-NEXT: Elements: 0 -+// REFLECTION-NEXT: Rows: 1 -+// REFLECTION-NEXT: Columns: 1 -+// REFLECTION-NEXT: Members: 0 -+// REFLECTION-NEXT: Offset: 0 -+// REFLECTION-NEXT: CBuffer: $Globals -+// REFLECTION-NEXT: } -+// REFLECTION-NEXT: Bound Resources: -+// REFLECTION-NEXT: D3D12_SHADER_INPUT_BIND_DESC: Name: $Globals -+// REFLECTION-NEXT: Type: D3D_SIT_CBUFFER -+// REFLECTION-NEXT: uID: 0 -+// REFLECTION-NEXT: BindCount: 1 -+// REFLECTION-NEXT: BindPoint: 0 -+// REFLECTION-NEXT: Space: 0 -+// REFLECTION-NEXT: ReturnType: -+// REFLECTION-NEXT: Dimension: D3D_SRV_DIMENSION_UNKNOWN -+// REFLECTION-NEXT: NumSamples (or stride): 0 -+// REFLECTION-NEXT: uFlags: (D3D_SIF_USERPACKED) -diff --git a/tools/clang/tools/dxa/CMakeLists.txt b/tools/clang/tools/dxa/CMakeLists.txt -index 391ac8b062..33e61ca121 100644 ---- a/tools/clang/tools/dxa/CMakeLists.txt -+++ b/tools/clang/tools/dxa/CMakeLists.txt -@@ -23,7 +23,6 @@ add_clang_executable(dxa - - target_link_libraries(dxa - dxcompiler -- HLSLTestLib - ) - - set_target_properties(dxa PROPERTIES VERSION ${CLANG_EXECUTABLE_VERSION}) -diff --git a/tools/clang/tools/dxa/dxa.cpp b/tools/clang/tools/dxa/dxa.cpp -index dd3a0e64c4..cf9339afdc 100644 ---- a/tools/clang/tools/dxa/dxa.cpp -+++ b/tools/clang/tools/dxa/dxa.cpp -@@ -19,6 +19,7 @@ - #include "dxc/DxilContainer/DxilContainer.h" - #include "dxc/DxilRootSignature/DxilRootSignature.h" - #include "dxc/Test/RDATDumper.h" -+#include "dxc/Test/D3DReflectionDumper.h" - - #include "llvm/Support/CommandLine.h" - #include "llvm/Support//MSFileSystem.h" -@@ -63,6 +64,10 @@ static cl::opt DumpRDAT("dumprdat", - cl::desc("Dump RDAT"), - cl::init(false)); - -+static cl::opt DumpReflection("dumpreflection", -+ cl::desc("Dump reflection"), -+ cl::init(false)); -+ - class DxaContext { - - private: -@@ -80,6 +85,7 @@ class DxaContext { - void ListParts(); - void DumpRS(); - void DumpRDAT(); -+ void DumpReflection(); - }; - - void DxaContext::Assemble() { -@@ -378,6 +384,66 @@ void DxaContext::DumpRDAT() { - printf("%s", ss.str().c_str()); - } - -+void DxaContext::DumpReflection() { -+ CComPtr pSource; -+ ReadFileIntoBlob(m_dxcSupport, StringRefWide(InputFilename), &pSource); -+ -+ CComPtr pReflection; -+ IFT(m_dxcSupport.CreateInstance(CLSID_DxcContainerReflection, &pReflection)); -+ IFT(pReflection->Load(pSource)); -+ -+ UINT32 partCount; -+ IFT(pReflection->GetPartCount(&partCount)); -+ -+ bool blobFound = false; -+ std::ostringstream ss; -+ hlsl::dump::D3DReflectionDumper dumper(ss); -+ -+ CComPtr pShaderReflection; -+ CComPtr pLibraryReflection; -+ for (uint32_t i = 0; i < partCount; ++i) { -+ uint32_t kind; -+ IFT(pReflection->GetPartKind(i, &kind)); -+ if (kind == (uint32_t)hlsl::DxilFourCC::DFCC_DXIL) { -+ blobFound = true; -+ CComPtr pPart; -+ IFT(pReflection->GetPartContent(i, &pPart)); -+ const hlsl::DxilProgramHeader *pProgramHeader = -+ reinterpret_cast(pPart->GetBufferPointer()); -+ IFT(IsValidDxilProgramHeader(pProgramHeader, (uint32_t)pPart->GetBufferSize())); -+ hlsl::DXIL::ShaderKind SK = hlsl::GetVersionShaderType(pProgramHeader->ProgramVersion); -+ if (SK == hlsl::DXIL::ShaderKind::Library) { -+ IFT(pReflection->GetPartReflection(i, -+ IID_PPV_ARGS(&pLibraryReflection))); -+ -+ } else { -+ IFT(pReflection->GetPartReflection(i, -+ IID_PPV_ARGS(&pShaderReflection))); -+ } -+ break; -+ } else if (kind == (uint32_t)hlsl::DxilFourCC::DFCC_RuntimeData) { -+ CComPtr pPart; -+ IFT(pReflection->GetPartContent(i, &pPart)); -+ hlsl::RDAT::DxilRuntimeData rdat(pPart->GetBufferPointer(), -+ pPart->GetBufferSize()); -+ hlsl::dump::DumpContext d(ss); -+ DumpRuntimeData(rdat, d); -+ } -+ } -+ -+ if (!blobFound) { -+ printf("Unable to find DXIL part"); -+ return; -+ } else if (pShaderReflection) { -+ dumper.Dump(pShaderReflection); -+ } else if (pLibraryReflection) { -+ dumper.Dump(pLibraryReflection); -+ } -+ -+ ss.flush(); -+ printf("%s", ss.str().c_str()); -+} -+ - using namespace hlsl::options; - - #ifdef _WIN32 -@@ -439,8 +505,10 @@ int main(int argc, const char **argv) { - } else if (DumpRDAT) { - pStage = "Dump RDAT"; - context.DumpRDAT(); -- } -- else { -+ } else if (DumpReflection) { -+ pStage = "Dump Reflection"; -+ context.DumpReflection(); -+ } else { - pStage = "Assembling"; - context.Assemble(); - } -diff --git a/tools/clang/unittests/HLSLTestLib/CMakeLists.txt b/tools/clang/unittests/HLSLTestLib/CMakeLists.txt -index 0dc937617c..2ade2b3138 100644 ---- a/tools/clang/unittests/HLSLTestLib/CMakeLists.txt -+++ b/tools/clang/unittests/HLSLTestLib/CMakeLists.txt -@@ -8,12 +8,9 @@ include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock/include) - endif(WIN32) - - add_clang_library(HLSLTestLib -- D3DReflectionDumper.cpp -- D3DReflectionStrings.cpp - DxcTestUtils.cpp - FileCheckerTest.cpp - FileCheckForTest.cpp -- RDATDumper.cpp - ) - - add_dependencies(HLSLTestLib TablegenHLSLOptions) diff --git a/source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch b/source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch deleted file mode 100644 index 04e6a95b8..000000000 --- a/source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/include/llvm/Analysis/DxilValueCache.h -+++ a/include/llvm/Analysis/DxilValueCache.h -@@ -52,7 +52,7 @@ struct DxilValueCache : public ImmutablePass { - - private: - -- WeakValueMap ValueMap; -+ WeakValueMap Map; - bool (*ShouldSkipCallback)(Value *V) = nullptr; - - void MarkUnreachable(BasicBlock *BB); -@@ -77,8 +77,8 @@ public: - Value *GetValue(Value *V, DominatorTree *DT=nullptr); - Constant *GetConstValue(Value *V, DominatorTree *DT = nullptr); - ConstantInt *GetConstInt(Value *V, DominatorTree *DT = nullptr); -- void ResetUnknowns() { ValueMap.ResetUnknowns(); } -- void ResetAll() { ValueMap.ResetAll(); } -+ void ResetUnknowns() { Map.ResetUnknowns(); } -+ void ResetAll() { Map.ResetAll(); } - bool IsUnreachable(BasicBlock *BB, DominatorTree *DT=nullptr); - void SetShouldSkipCallback(bool (*Callback)(Value *V)) { ShouldSkipCallback = Callback; }; - }; ---- a/lib/Analysis/DxilValueCache.cpp -+++ a/lib/Analysis/DxilValueCache.cpp -@@ -57,7 +57,7 @@ bool IsEntryBlock(const BasicBlock *BB) { - } - - void DxilValueCache::MarkUnreachable(BasicBlock *BB) { -- ValueMap.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0)); -+ Map.Set(BB, ConstantInt::get(Type::getInt1Ty(BB->getContext()), 0)); - } - - bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) { -@@ -93,7 +93,7 @@ bool DxilValueCache::MayBranchTo(BasicBlock *A, BasicBlock *B) { - } - - bool DxilValueCache::IsUnreachable_(BasicBlock *BB) { -- if (Value *V = ValueMap.Get(BB)) -+ if (Value *V = Map.Get(BB)) - if (IsConstantFalse(V)) - return true; - return false; -@@ -155,7 +155,7 @@ Value *DxilValueCache::ProcessAndSimplify_PHI(Instruction *I, DominatorTree *DT) - // that were computed previously. - if (!Simplified) { - if (SimplifiedNotDominating) -- if (Value *CachedV = ValueMap.Get(SimplifiedNotDominating)) -+ if (Value *CachedV = Map.Get(SimplifiedNotDominating)) - Simplified = CachedV; - } - -@@ -379,7 +379,7 @@ Value *DxilValueCache::SimplifyAndCacheResult(Instruction *I, DominatorTree *DT) - } - - if (Simplified && isa(Simplified)) -- ValueMap.Set(I, Simplified); -+ Map.Set(I, Simplified); - - return Simplified; - } -@@ -500,7 +500,7 @@ void DxilValueCache::WeakValueMap::Set(Value *Key, Value *V) { - // If there's a cached value, return it. Otherwise, return - // the value itself. - Value *DxilValueCache::TryGetCachedValue(Value *V) { -- if (Value *Simplified = ValueMap.Get(V)) -+ if (Value *Simplified = Map.Get(V)) - return Simplified; - return V; - } -@@ -516,7 +516,7 @@ StringRef DxilValueCache::getPassName() const { - Value *DxilValueCache::GetValue(Value *V, DominatorTree *DT) { - if (dyn_cast(V)) - return V; -- if (Value *NewV = ValueMap.Get(V)) -+ if (Value *NewV = Map.Get(V)) - return NewV; - - return ProcessValue(V, DT); -@@ -541,7 +541,7 @@ bool DxilValueCache::IsUnreachable(BasicBlock *BB, DominatorTree *DT) { - - LLVM_DUMP_METHOD - void DxilValueCache::dump() const { -- ValueMap.dump(); -+ Map.dump(); - } - - void DxilValueCache::getAnalysisUsage(AnalysisUsage &AU) const { -@@ -580,15 +580,15 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - - // If we haven't seen this value, go in and push things it depends on - // into the worklist. -- if (!ValueMap.Seen(V)) { -- ValueMap.SetSentinel(V); -+ if (!Map.Seen(V)) { -+ Map.SetSentinel(V); - if (Instruction *I = dyn_cast(V)) { - - for (Use &U : I->operands()) { - Instruction *UseI = dyn_cast(U.get()); - if (!UseI) - continue; -- if (!ValueMap.Seen(UseI)) -+ if (!Map.Seen(UseI)) - WorkList.push_back(UseI); - } - -@@ -596,9 +596,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - for (unsigned i = 0; i < PN->getNumIncomingValues(); i++) { - BasicBlock *BB = PN->getIncomingBlock(i); - TerminatorInst *Term = BB->getTerminator(); -- if (!ValueMap.Seen(Term)) -+ if (!Map.Seen(Term)) - WorkList.push_back(Term); -- if (!ValueMap.Seen(BB)) -+ if (!Map.Seen(BB)) - WorkList.push_back(BB); - } - } -@@ -607,9 +607,9 @@ Value *DxilValueCache::ProcessValue(Value *NewV, DominatorTree *DT) { - for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; PI++) { - BasicBlock *PredBB = *PI; - TerminatorInst *Term = PredBB->getTerminator(); -- if (!ValueMap.Seen(Term)) -+ if (!Map.Seen(Term)) - WorkList.push_back(Term); -- if (!ValueMap.Seen(PredBB)) -+ if (!Map.Seen(PredBB)) - WorkList.push_back(PredBB); - } - } ---- a/tools/clang/include/clang/Basic/Version.h -+++ a/tools/clang/include/clang/Basic/Version.h -@@ -18,7 +18,8 @@ - - #include "clang/Basic/Version.inc" - #include "llvm/ADT/StringRef.h" -- -+// HLSL Change - for uint32_t. -+#include - /// \brief Helper macro for CLANG_VERSION_STRING. - #define CLANG_MAKE_VERSION_STRING2(X) #X - diff --git a/source/x/vulkan-sdk/VERSION b/source/x/vulkan-sdk/VERSION index 71ba6273f..1915db620 100644 --- a/source/x/vulkan-sdk/VERSION +++ b/source/x/vulkan-sdk/VERSION @@ -1 +1 @@ -1.3.250.0 +1.3.268.0 diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 3b18bbbd0..5b791dbaf 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017, 2018, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -157,3 +157,15 @@ echo $VERSION > VERSION rm -f release_notes.html rm -f *.fetched + +# Adding this kludge since 1.3.268 is somehow pulling a bad shaderc (the +# commit referenced can't be found in the repo, and a mostly empty archive +# is produced.) So, if we find an unreasonably small shaderc, just pull a +# recent one. +if [ "$(tar tf shaderc-*.tar.lz | wc -l)" -lt "7" ]; then + rm shaderc-*.tar.lz + lftpget https://github.com/google/shaderc/archive/refs/tags/v2023.7.tar.gz + mv v2023.7.tar.gz shaderc-2023.7.tar.gz + gzip -d shaderc-2023.7.tar.gz + plzip -9 shaderc-2023.7.tar +fi diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 140a77f61..0aae80ebb 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -71,36 +71,39 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-vulkan-sdk -GLSLANG_VERSION=$(echo glslang-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +GLSLANG_VERSION=$(echo glslang-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) SPIRV_HEADERS_VERSION=$(echo SPIRV-Headers-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_HEADERS_VERSION=$(echo Vulkan-Headers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_LOADER_VERSION=$(echo Vulkan-Loader-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_VALIDATIONLAYERS_VERSION=$(echo Vulkan-ValidationLayers-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) ROBIN_HOOD_VERSION=$(echo robin-hood-hashing-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKANTOOLS_VERSION=$(echo VulkanTools-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_TOOLS_VERSION=$(echo Vulkan-Tools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKANTOOLS_VERSION=$(echo VulkanTools-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) SHADERC_VERSION=$(echo shaderc-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +GFXRECONSTRUCT_VERSION=$(echo gfxreconstruct-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) DXC_VERSION=$(echo DirectXShaderCompiler-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_PROFILES_VERSION=$(echo Vulkan-Profiles-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VOLK_VERSION=$(echo volk-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -VULKAN_UTILITY_LIBRARIES_VERSION=$(echo Vulkan-Utility-Libraries-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_PROFILES_VERSION=$(echo Vulkan-Profiles-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VOLK_VERSION=$(echo volk-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VULKAN_UTILITY_LIBRARIES_VERSION=$(echo Vulkan-Utility-Libraries-vulkan-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) VULKAN_CAPS_VIEWER_VERSION=$(echo VulkanCapsViewer-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) VULKAN_MEMORY_ALLOCATOR_VERSION=$(echo VulkanMemoryAllocator-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) VALIJSON_VERSION=$(echo valijson-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) JSONCPP_VERSION=$(echo jsoncpp-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) # upstream builder order: +# NOTE from volkerdi: any magic build order given in the comments is always, by definition, wrong # - SPIRV-Headers # - glslang # - Vulkan-Headers # - Vulkan-Loader +# - Vulkan-Utility-Libraries # - Vulkan-ValidationLayers # - Vulkan-ExtensionLayer +# = valijson # - Vulkan-Tools # - VulkanTools # - shaderc @@ -116,20 +119,20 @@ mkdir -p $TMP $PKG cd $TMP # Clear existing tmp sources: rm -rf SPIRV-Headers-$SPIRV_HEADERS_VERSION \ - glslang-sdk-${GLSLANG_VERSION} \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION \ - VulkanTools-sdk-$VULKANTOOLS_VERSION \ + glslang-vulkan-sdk-${GLSLANG_VERSION} \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION \ shaderc-$SHADERC_VERSION \ - SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION \ DirectXShaderCompiler-$DXC_VERSION \ - SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION \ - Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION \ - volk-sdk-$VOLK_VERSION \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION \ + volk-vulkan-sdk-$VOLK_VERSION \ Vulkan-Utility-Libraries-$VULKAN_UTILITY_LIBRARIES_VERSION \ VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION \ VulkanMemoryAllocator-$VULKAN_MEMORY_ALLOCATOR_VERSION \ @@ -159,15 +162,15 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/glslang-sdk-${GLSLANG_VERSION}.tar.?z || exit 1 -cd glslang-sdk-$GLSLANG_VERSION/External -tar xvf $CWD/SPIRV-Tools-sdk-$SPIRV_TOOLS_VERSION.tar.?z || exit 1 -mv SPIRV-Tools-sdk-$SPIRV_TOOLS_VERSION spirv-tools +tar xvf $CWD/glslang-vulkan-sdk-${GLSLANG_VERSION}.tar.?z || exit 1 +cd glslang-vulkan-sdk-$GLSLANG_VERSION/External +tar xvf $CWD/SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION.tar.?z || exit 1 +mv SPIRV-Tools-vulkan-sdk-$SPIRV_TOOLS_VERSION spirv-tools cd spirv-tools/external tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.?z || exit 1 mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers -cd $TMP/glslang-sdk-${GLSLANG_VERSION} +cd $TMP/glslang-vulkan-sdk-${GLSLANG_VERSION} chown -R root:root . find . \ @@ -191,8 +194,8 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1 -cd Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION +tar xvf $CWD/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION.tar.?z || exit 1 +cd Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION chown -R root:root . find . \ @@ -214,8 +217,8 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION +tar xvf $CWD/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION chown -R root:root . find . \ @@ -261,8 +264,33 @@ cd build make install DESTDIR=$TMP/robin-hood-hashing-$ROBIN_HOOD_VERSION/build/install || exit 1 cd $TMP -tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1 -cd Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION +tar xvf $CWD/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DVulkanHeaders_DIR=$PKG/usr/share/cmake/VulkanHeaders/ \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP +tar xvf $CWD/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1 +cd Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION chown -R root:root . find . \ @@ -296,8 +324,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION +tar xvf $CWD/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION chown -R root:root . find . \ @@ -328,8 +356,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION +tar xvf $CWD/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION chown -R root:root . find . \ @@ -359,8 +387,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/VulkanTools-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1 -cd $TMP/VulkanTools-sdk-$VULKANTOOLS_VERSION +tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.?z || exit 1 +cd jsoncpp-$JSONCPP_VERSION chown -R root:root . find . \ @@ -369,10 +397,54 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# building jsoncpp -cd submodules/jsoncpp - python3 amalgamate.py -cd ../../ +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_OBJECT_LIBS=OFF \ + -DBUILD_STATIC_LIBS=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DJSONCPP_WITH_TESTS=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$TMP/jsoncpp-$JSONCPP_VERSION/build/install || exit 1 + +cd $TMP +tar xvf $CWD/valijson-$VALIJSON_VERSION.tar.?z || exit 1 +cd valijson-$VALIJSON_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$TMP/valijson-$VALIJSON_VERSION/build/install || exit 1 + +cd $TMP +tar xvf $CWD/VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION.tar.?z || exit 1 +cd $TMP/VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ mkdir -p build cd build @@ -386,6 +458,8 @@ cd build -DVULKAN_REGISTRY_PATH_HINT=$PKG/usr \ -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ -DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=$PKG/usr \ + -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \ + -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \ -DBUILD_WSI_WAYLAND_SUPPORT=On \ -DBUILD_TESTS=Off \ -DINSTALL_GTEST=Off \ @@ -427,8 +501,8 @@ cd build -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ -DSHADERC_SKIP_TESTS=On \ -DSHADERC_SKIP_EXAMPLES=On \ - -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION/External/spirv-tools \ - -DSHADERC_GLSLANG_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION \ + -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools \ + -DSHADERC_GLSLANG_DIR=$TMP/glslang-vulkan-sdk-$GLSLANG_VERSION \ -DSKIP_GLSLANG_INSTALL=On \ -DSKIP_SPIRV_TOOLS_INSTALL=On \ -DBUILD_SHARED_LIBS=On \ @@ -436,13 +510,12 @@ cd build -DBUILD_TESTING=Off \ .. - make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION +tar xvf $CWD/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION chown -R root:root . find . \ @@ -472,8 +545,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1 -cd $TMP/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION +tar xvf $CWD/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1 +cd $TMP/gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION chown -R root:root . find . \ @@ -543,8 +616,8 @@ cd build find $PKG/usr/include/dxc -name "CMakeLists.txt" | xargs rm -f cd $TMP -tar xvf $CWD/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION +tar xvf $CWD/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION chown -R root:root . find . \ @@ -572,82 +645,8 @@ cd build $PKG/usr/include/SPIRV-Reflect/include/spirv/unified1/ cd $TMP -tar xvf $CWD/Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ - -DVulkanHeaders_DIR=$PKG/usr/share/cmake/VulkanHeaders/ \ - .. - - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - -cd $TMP -tar xvf $CWD/valijson-$VALIJSON_VERSION.tar.?z || exit 1 -cd valijson-$VALIJSON_VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - - make $NUMJOBS || make || exit 1 - make install DESTDIR=$TMP/valijson-$VALIJSON_VERSION/build/install || exit 1 - -cd $TMP -tar xvf $CWD/jsoncpp-$JSONCPP_VERSION.tar.?z || exit 1 -cd jsoncpp-$JSONCPP_VERSION - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \+ -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \+ - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_OBJECT_LIBS=OFF \ - -DBUILD_STATIC_LIBS=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DJSONCPP_WITH_TESTS=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - .. - - make $NUMJOBS || make || exit 1 - make install DESTDIR=$TMP/jsoncpp-$JSONCPP_VERSION/build/install || exit 1 - -cd $TMP -tar xvf $CWD/Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION +tar xvf $CWD/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION # do not depend on python-jsonschema sed -i "/jsonschema/d" scripts/gen_profiles_solution.py @@ -669,8 +668,8 @@ cd build -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ -DVULKAN_LOADER_INSTALL_DIR=$PKG/usr \ -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ - -DVULKAN_HEADERS_SOURCE_DIR="$TMP/Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION" \ - -DVULKAN_VALIDATIONLAYERS_SOURCE_DIR="$TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION" \ + -DVULKAN_HEADERS_SOURCE_DIR="$TMP/Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION" \ + -DVULKAN_VALIDATIONLAYERS_SOURCE_DIR="$TMP/Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION" \ -DVVL_INCLUDE_DIR="$PKG/usr/include/vulkan" \ -Dvalijson_DIR="$TMP/valijson-$VALIJSON_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/valijson" \ -Djsoncpp_DIR="$TMP/jsoncpp-$JSONCPP_VERSION/build/install/usr/lib$LIBDIRSUFFIX/cmake/jsoncpp" \ @@ -682,8 +681,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/volk-sdk-$VOLK_VERSION.tar.?z || exit 1 -cd $TMP/volk-sdk-$VOLK_VERSION +tar xvf $CWD/volk-vulkan-sdk-$VOLK_VERSION.tar.?z || exit 1 +cd $TMP/volk-vulkan-sdk-$VOLK_VERSION chown -R root:root . find . \ @@ -798,45 +797,45 @@ cp -a \ SPIRV-Headers-$SPIRV_HEADERS_VERSION/README* \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Headers cp -a \ - glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ - glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \ - glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Tools cp -a \ - glslang-sdk-$GLSLANG_VERSION/LICENSE* \ - glslang-sdk-$GLSLANG_VERSION/README* \ - glslang-sdk-$GLSLANG_VERSION/*.md \ + glslang-vulkan-sdk-$GLSLANG_VERSION/LICENSE* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/README* \ + glslang-vulkan-sdk-$GLSLANG_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/glslang cp -a \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/README* \ - Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/*.md \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/README* \ + Vulkan-Headers-vulkan-sdk-$VULKAN_HEADERS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Headers cp -a \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/LICENSE* \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/README* \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/*.md \ - Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/LICENSE* \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/README* \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/*.md \ + Vulkan-Loader-vulkan-sdk-$VULKAN_LOADER_VERSION/loader/LoaderAndLayerInterface.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Loader cp -a \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \ - Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/LICENSE* \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/README* \ + Vulkan-ValidationLayers-vulkan-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ValidationLayers cp -a \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \ - Vulkan-ExtensionLayer-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/LICENSE* \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/README* \ + Vulkan-ExtensionLayer-vulkan-sdk-$VULKAN_EXTENSIONLAYER_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-ExtensionLayer cp -a \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/README* \ - Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION/*.md \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/LICENSE* \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/README* \ + Vulkan-Tools-vulkan-sdk-$VULKAN_TOOLS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Tools cp -a \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/LICENSE* \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/README* \ - VulkanTools-sdk-$VULKANTOOLS_VERSION/*.md \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/LICENSE* \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/README* \ + VulkanTools-vulkan-sdk-$VULKANTOOLS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/VulkanTools cp -a \ shaderc-$SHADERC_VERSION/AUTHORS \ @@ -845,14 +844,14 @@ cp -a \ shaderc-$SHADERC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/shaderc cp -a \ - SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/LICENSE* \ - SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/README* \ - SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/*.md \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/LICENSE* \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/README* \ + SPIRV-Cross-vulkan-sdk-$SPIRV_CROSS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross cp -a \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/README* \ - gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/*.md \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/README* \ + gfxreconstruct-vulkan-sdk-$GFXRECONSTRUCT_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/gfxreconstruct cp -a \ DirectXShaderCompiler-$DXC_VERSION/LICENSE* \ @@ -861,24 +860,24 @@ cp -a \ DirectXShaderCompiler-$DXC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler cp -a \ - SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \ - SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/README* \ - SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/*.md \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/README* \ + SPIRV-Reflect-vulkan-sdk-$SPIRV_REFLECT_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Reflect cp -a \ - Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/LICENSE* \ - Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/README* \ - Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION/*.md \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/LICENSE* \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/README* \ + Vulkan-Profiles-vulkan-sdk-$VULKAN_PROFILES_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles cp -a \ - volk-sdk-$VOLK_VERSION/LICENSE* \ - volk-sdk-$VOLK_VERSION/README* \ - volk-sdk-$VOLK_VERSION/*.md \ + volk-vulkan-sdk-$VOLK_VERSION/LICENSE* \ + volk-vulkan-sdk-$VOLK_VERSION/README* \ + volk-vulkan-sdk-$VOLK_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/volk cp -a \ - Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/LICENSE* \ - Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/README* \ - Vulkan-Utility-Libraries-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/*.md \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/LICENSE* \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/README* \ + Vulkan-Utility-Libraries-vulkan-sdk-$VULKAN_UTILITY_LIBRARIES_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Utility-Libraries cp -a \ VulkanCapsViewer-$VULKAN_CAPS_VIEWER_VERSION/LICENSE* \