diff options
Diffstat (limited to 'source')
33 files changed, 160 insertions, 96 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index 16f1bc438..24a6d0237 100755 --- a/source/a/aaa_libraries/aaa_libraries.SlackBuild +++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_libraries VERSION=${VERSION:-15.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs index 064b41705..ce0485b12 100644 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs @@ -60,8 +60,8 @@ /usr/lib/libjpeg.so.62 /usr/lib/libjson-c.so.5 /usr/lib/libturbojpeg.so.0 -/usr/lib/liblber-2.4.so.2 -/usr/lib/libldap-2.4.so.2 +/usr/lib/liblber.so.2 +/usr/lib/libldap.so.2 /usr/lib/libltdl.so.7 /usr/lib/libmenu.so.5 /usr/lib/libmenu.so.6 diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx deleted file mode 100644 index bb3f65ca9..000000000 --- a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/libvpx +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/libvpx.so.6 diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/openldap-2.4 b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/openldap-2.4 new file mode 100644 index 000000000..ca40013f8 --- /dev/null +++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/openldap-2.4 @@ -0,0 +1,3 @@ +# We'll keep these around for a little while... probably remove on 2022-04-06 or thereabouts +/usr/lib/liblber-2.4.so.2 +/usr/lib/libldap-2.4.so.2 diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild index 6d7927120..0e22b88a1 100755 --- a/source/a/quota/quota.SlackBuild +++ b/source/a/quota/quota.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=quota VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild index ffbe020a5..9ca96c91b 100755 --- a/source/ap/cups-filters/cups-filters.SlackBuild +++ b/source/ap/cups-filters/cups-filters.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups-filters VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild index 8725ddbaa..a297f08b8 100755 --- a/source/d/subversion/subversion.SlackBuild +++ b/source/d/subversion/subversion.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=subversion VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/kde/kde/build/kldap b/source/kde/kde/build/kldap index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kldap +++ b/source/kde/kde/build/kldap @@ -1 +1 @@ -1 +2 diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild index b8e48b829..a8f8962a0 100755 --- a/source/l/GConf/GConf.SlackBuild +++ b/source/l/GConf/GConf.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=GConf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild index 393ff0c80..b14d3ba75 100755 --- a/source/l/apr-util/apr-util.SlackBuild +++ b/source/l/apr-util/apr-util.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=apr-util VERSION=${VERSION:-$(echo apr-util-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index f8dd78279..c8e417151 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=harfbuzz VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/serf/serf.SlackBuild b/source/l/serf/serf.SlackBuild index 9b58e685e..ddc1406c8 100755 --- a/source/l/serf/serf.SlackBuild +++ b/source/l/serf/serf.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=serf VERSION=${VERSION:-$(echo serf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 5a384ac09..70c3a44a1 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alpine VERSION=${VERSION:-2.25} -ALPINEBUILD=${ALPINEBUILD:-1} +ALPINEBUILD=${ALPINEBUILD:-2} IMAPDBUILD=${IMAPDBUILD:-1} PINEPGP=${PINEPGP:-0.18.0} diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild index 0b7190588..cc853d73e 100755 --- a/source/n/autofs/autofs.SlackBuild +++ b/source/n/autofs/autofs.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=autofs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild index 94649e0dc..5520efac3 100755 --- a/source/n/curl/curl.SlackBuild +++ b/source/n/curl/curl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=curl VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild index 219e49df4..acc7bc86d 100755 --- a/source/n/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/source/n/cyrus-sasl/cyrus-sasl.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cyrus-sasl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 3- -d - | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index 7993a195e..ada755325 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dovecot VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index b15f0502a..ea854fa71 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=epic5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} EPICVER=5 HELPFILE=current -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} ## Default to no Ruby support, since it seems that ruby-2.7.0 is not compatible. ## Patches to fix this are welcome, otherwise we'll keep an eye on upstream. diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild index 8f73536fa..572ffc120 100755 --- a/source/n/gnupg/gnupg.SlackBuild +++ b/source/n/gnupg/gnupg.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnupg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild index eb30b9d3d..9aa0bb1d4 100755 --- a/source/n/gnupg2/gnupg2.SlackBuild +++ b/source/n/gnupg2/gnupg2.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gnupg2 VERSION=${VERSION:-$(echo gnupg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 438525eef..36a3a91e3 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/krb5/krb5.SlackBuild b/source/n/krb5/krb5.SlackBuild index e39bf7ed0..668d6ce7e 100755 --- a/source/n/krb5/krb5.SlackBuild +++ b/source/n/krb5/krb5.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=krb5 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 64e2b64cd..fb3f2964e 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=netatalk VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild index 197944623..1fc96f52b 100755 --- a/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild +++ b/source/n/nss-pam-ldapd/nss-pam-ldapd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nss-pam-ldapd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/openldap/openldap.SlackBuild b/source/n/openldap/openldap.SlackBuild index 3b6171c6f..b0bc9746d 100755 --- a/source/n/openldap/openldap.SlackBuild +++ b/source/n/openldap/openldap.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2018, 2019, 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2015-2017 Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com> # All rights reserved. # @@ -150,7 +150,9 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-mdb=yes \ --enable-monitor=yes \ --enable-perl=yes \ - --disable-ndb \ + --enable-argon2 \ + --with-argon2=libsodium \ + --disable-wt \ \ --enable-overlays=mod \ \ @@ -178,6 +180,9 @@ rmdir $PKG/var/run chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so.* # Restrict access to database: +if [ ! -d $PKG/var/lib/openldap ]; then + mkdir -p $PKG/var/lib/openldap +fi chmod 700 $PKG/var/lib/openldap # Fix ownership: diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 5bbf8d5b2..f945ec3aa 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.25 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index 3cc6375a9..aa8c7ffa7 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=postfix VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 71b6212d2..33b57590a 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] diff --git a/source/x/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild index 50d238048..36b080ea7 100755 --- a/source/x/marisa/marisa.SlackBuild +++ b/source/x/marisa/marisa.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=marisa SRCNAM=marisa-trie VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/vulkan-sdk/VERSION b/source/x/vulkan-sdk/VERSION index 0b8928f3a..bd9e2d24f 100644 --- a/source/x/vulkan-sdk/VERSION +++ b/source/x/vulkan-sdk/VERSION @@ -1 +1 @@ -1.2.176.1 +1.3.204.0 diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index da1121023..126523e18 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -58,6 +58,9 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do COMMIT=$(basename $i) REPO=$(echo $i | cut -d "/" -f 1-5) NAME=$(basename $REPO) + echo "" + echo "$NAME" + echo "" # release notes for bugfix releases contain the repo list multiple times # only create tarballs for the most recent ones (on top) @@ -66,7 +69,7 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd $NAME-$COMMIT git reset --hard $COMMIT || git reset --hard origin/$COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf $NAME-$COMMIT.tar $NAME-$COMMIT plzip -9 $NAME-$COMMIT.tar @@ -79,7 +82,7 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd SPIRV-Headers-$SPIRV_HEADERS_COMMIT git reset --hard $SPIRV_HEADERS_COMMIT || git reset --hard origin/$SPIRV_HEADERS_COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf SPIRV-Headers-$SPIRV_HEADERS_COMMIT.tar SPIRV-Headers-$SPIRV_HEADERS_COMMIT plzip -9 SPIRV-Headers-$SPIRV_HEADERS_COMMIT.tar @@ -92,7 +95,7 @@ for i in $(grep "Repo:" release_notes.html | cut -d "\"" -f 2); do cd robin-hood-hashing-$ROBIN_HOOD_COMMIT git reset --hard $ROBIN_HOOD_COMMIT || git reset --hard origin/$ROBIN_HOOD_COMMIT git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf robin-hood-hashing-$ROBIN_HOOD_COMMIT.tar robin-hood-hashing-$ROBIN_HOOD_COMMIT plzip -9 robin-hood-hashing-$ROBIN_HOOD_COMMIT.tar @@ -112,7 +115,7 @@ if ! [ -e "Vulkan-ExtensionLayer.fetched" ]; then git reset --hard sdk-$VERSION-TAG || git reset --hard origin/sdk-$VERSION-TAG || \ git reset --hard sdk.$VERSION-TAG || git reset --hard origin/sdk.$VERSION-TAG git submodule update --init --recursive - git describe > .git-version + git describe --tags > .git-version cd .. tar --exclude-vcs -cf Vulkan-ExtensionLayer-sdk-$VERSION.tar Vulkan-ExtensionLayer-sdk-$VERSION plzip -9 Vulkan-ExtensionLayer-sdk-$VERSION.tar diff --git a/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff b/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff deleted file mode 100644 index 0e94795eb..000000000 --- a/source/x/vulkan-sdk/gfxreconstruct-sdk.glibc-2.35.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./framework/util/page_guard_manager.cpp.orig 2021-06-15 14:04:31.000000000 -0500 -+++ ./framework/util/page_guard_manager.cpp 2022-02-12 18:53:36.586025716 -0600 -@@ -110,7 +110,7 @@ - static struct sigaction s_old_sigaction = {}; - static stack_t s_old_stack = {}; - --static uint8_t s_alt_stack[SIGSTKSZ]; -+static uint8_t s_alt_stack[_SC_SIGSTKSZ]; - - static void PageGuardExceptionHandler(int id, siginfo_t* info, void* data) - { diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 1c9afe4d1..bf88a291e 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vulkan-sdk -# Copyright 2016, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vulkan-sdk # The ./VERSION file is created by ./fetch-sources.sh: VERSION=${VERSION:-$(cat VERSION)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -71,9 +71,9 @@ fi TMP=${TMP:-/tmp} PKG=$TMP/package-vulkan-sdk -GLSLANG_VERSION=$(echo glslang-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_HEADERS_VERSION=$(echo SPIRV-Headers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +GLSLANG_VERSION=$(echo glslang-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) @@ -82,10 +82,11 @@ VULKAN_EXTENSIONLAYER_VERSION=$(echo Vulkan-ExtensionLayer-sdk-*.tar.?z | 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) SHADERC_VERSION=$(echo shaderc-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_CROSS_VERSION=$(echo SPIRV-Cross-*.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) DXC_VERSION=$(echo DirectXShaderCompiler-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-*.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) # upstream builder order: # - SPIRV-Headers @@ -101,6 +102,7 @@ SPIRV_REFLECT_VERSION=$(echo SPIRV-Reflect-*.tar.?z | rev | cut -f 3- -d . | cut # - gfxreconstruct # - DirectXShaderCompiler # - SPIRV-Reflect +# - Vulkan-Profiles rm -rf $PKG mkdir -p $TMP $PKG @@ -108,7 +110,7 @@ mkdir -p $TMP $PKG cd $TMP # Clear existing tmp sources: rm -rf SPIRV-Headers-$SPIRV_HEADERS_VERSION \ - glslang-${GLSLANG_VERSION} \ + glslang-sdk-${GLSLANG_VERSION} \ Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION \ Vulkan-Loader-sdk-$VULKAN_LOADER_VERSION \ Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION \ @@ -116,10 +118,11 @@ rm -rf SPIRV-Headers-$SPIRV_HEADERS_VERSION \ Vulkan-Tools-sdk-$VULKAN_TOOLS_VERSION \ VulkanTools-sdk-$VULKANTOOLS_VERSION \ shaderc-$SHADERC_VERSION \ - SPIRV-Cross-$SPIRV_CROSS_VERSION \ + SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION \ gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION \ DirectXShaderCompiler-$DXC_VERSION \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION + SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION \ + Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION tar xvf $CWD/SPIRV-Headers-$SPIRV_HEADERS_VERSION.tar.?z || exit 1 cd SPIRV-Headers-$SPIRV_HEADERS_VERSION @@ -144,15 +147,15 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/glslang-${GLSLANG_VERSION}.tar.?z || exit 1 -cd glslang-$GLSLANG_VERSION/External -tar xvf $CWD/SPIRV-Tools-$SPIRV_TOOLS_VERSION.tar.?z || exit 1 -mv SPIRV-Tools-$SPIRV_TOOLS_VERSION spirv-tools +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 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-${GLSLANG_VERSION} +cd $TMP/glslang-sdk-${GLSLANG_VERSION} chown -R root:root . find . \ @@ -162,9 +165,9 @@ find . \ -exec chmod 644 {} \+ # Fix LIBDIRSUFFIX -for i in $(find . -name CMakeLists.txt); do - sed -i "s|DESTINATION lib|DESTINATION \${CMAKE_INSTALL_LIBDIR}|" "$i" -done +# for i in $(find . -name CMakeLists.txt); do +# sed -i "s|DESTINATION lib|DESTINATION \${CMAKE_INSTALL_LIBDIR}|" "$i" +# done mkdir -p build cd build @@ -228,11 +231,31 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION.tar.?z || exit 1 -cd $TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/external tar xvf $CWD/robin-hood-hashing-$ROBIN_HOOD_VERSION.tar.?z || exit 1 -mv robin-hood-hashing-$ROBIN_HOOD_VERSION robin-hood-hashing -cd .. +cd robin-hood-hashing-$ROBIN_HOOD_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 \ + -DRH_STANDALONE_PROJECT="OFF" \ + .. + + make $NUMJOBS || make || exit 1 + 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 chown -R root:root . find . \ @@ -259,7 +282,7 @@ cd build -DVULKAN_HEADERS_INSTALL_DIR=$PKG/usr \ -DSPIRV_HEADERS_INSTALL_DIR=$PKG/usr \ -DBUILD_LAYER_SUPPORT_FILES=On \ - -DROBIN_HOOD_HASHING_INSTALL_DIR="$TMP/Vulkan-ValidationLayers-sdk-$VULKAN_VALIDATIONLAYERS_VERSION/external/robin-hood-hashing" \ + -DROBIN_HOOD_HASHING_INSTALL_DIR="$TMP/robin-hood-hashing-$ROBIN_HOOD_VERSION/build/install/usr" \ .. make $NUMJOBS || make || exit 1 @@ -401,8 +424,8 @@ cd build -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ -DSHADERC_SKIP_TESTS=On \ -DSHADERC_SKIP_EXAMPLES=On \ - -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-$GLSLANG_VERSION/External/spirv-tools \ - -DSHADERC_GLSLANG_DIR=$TMP/glslang-$GLSLANG_VERSION \ + -DSHADERC_SPIRV_TOOLS_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION/External/spirv-tools \ + -DSHADERC_GLSLANG_DIR=$TMP/glslang-sdk-$GLSLANG_VERSION \ -DSKIP_GLSLANG_INSTALL=On \ -DSKIP_SPIRV_TOOLS_INSTALL=On \ -DBUILD_SHARED_LIBS=On \ @@ -415,8 +438,8 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP -tar xvf $CWD/SPIRV-Cross-$SPIRV_CROSS_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Cross-$SPIRV_CROSS_VERSION +tar xvf $CWD/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION chown -R root:root . find . \ @@ -425,9 +448,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Set git hash -SPIRV_CROSS_SHORT_HASH=$(echo $SPIRV_CROSS_VERSION | cut -c 1-8) -sed -i "s|version \"unknown\"|version \"$SPIRV_CROSS_SHORT_HASH\"|" \ +# Set version +sed -i "s|version \"unknown\"|version \"$SPIRV_CROSS_VERSION\"|" \ CMakeLists.txt mkdir -p build @@ -450,9 +472,6 @@ cd $TMP tar xvf $CWD/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION.tar.?z || exit 1 cd $TMP/gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION -# patch to build with glibc-2.34: -zcat $CWD/gfxreconstruct-sdk.glibc-2.35.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -464,7 +483,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=stringop-overflow" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=stringop-overflow" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ .. @@ -483,7 +502,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -mkdir -p build +mkdir -p build/docs cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -492,7 +511,9 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_INCLUDEDIR=include/dxc \ -DLLVM_LIBDIR_SUFFIX=$LIBDIRSUFFIX \ - $(cat ../utils/cmake-predefined-config-params) \ + -DLLVM_BUILD_TOOLS="OFF" \ + -C"../cmake/caches/PredefinedParams.cmake" \ + -DHLSL_INCLUDE_TESTS="OFF" \ .. make $NUMJOBS || make || exit 1 @@ -507,9 +528,12 @@ cd build cp -P lib$LIBDIRSUFFIX/libdxcompiler.so* $PKG/usr/lib$LIBDIRSUFFIX/ cp -r ../include/dxc $PKG/usr/include/ + # Remove CMakeLists.txt files in /usr/include + find $PKG/usr/include/dxc -name "CMakeLists.txt" | xargs rm -f + cd $TMP -tar xvf $CWD/SPIRV-Reflect-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 -cd $TMP/SPIRV-Reflect-$SPIRV_REFLECT_VERSION +tar xvf $CWD/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION.tar.?z || exit 1 +cd $TMP/SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION chown -R root:root . find . \ @@ -537,6 +561,41 @@ cd build $PKG/usr/include/SPIRV-Reflect/include/spirv/unified1/ cd $TMP +tar xvf $CWD/Vulkan-Profiles-sdk-$VULKAN_PROFILES_VERSION.tar.?z || exit 1 +cd $TMP/Vulkan-Profiles-sdk-$VULKAN_PROFILES_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 {} \+ + +# Fix finding vulkan-loader on Slackware64 +sed -i "s|PATH_SUFFIXES lib|PATH_SUFFIXES lib$LIBDIRSUFFIX|" \ + CMakeLists.txt + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=deprecated-declarations" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -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" \ + -DPROFILES_BUILD_TESTS="OFF" \ + -DREGENERATE_JSONCPP="OFF" \ + -DREGENERATE_PROFILES="OFF" \ + .. + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + +cd $TMP find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -556,19 +615,20 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/gfxreconstruct mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Reflect +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles cp -a \ SPIRV-Headers-$SPIRV_HEADERS_VERSION/LICENSE* \ SPIRV-Headers-$SPIRV_HEADERS_VERSION/README* \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Headers cp -a \ - glslang-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ - glslang-$GLSLANG_VERSION/External/spirv-tools/README* \ - glslang-$GLSLANG_VERSION/External/spirv-tools/*.md \ + glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/LICENSE* \ + glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/README* \ + glslang-sdk-$GLSLANG_VERSION/External/spirv-tools/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Tools cp -a \ - glslang-$GLSLANG_VERSION/LICENSE* \ - glslang-$GLSLANG_VERSION/README* \ - glslang-$GLSLANG_VERSION/*.md \ + glslang-sdk-$GLSLANG_VERSION/LICENSE* \ + glslang-sdk-$GLSLANG_VERSION/README* \ + glslang-sdk-$GLSLANG_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/glslang cp -a \ Vulkan-Headers-sdk-$VULKAN_HEADERS_VERSION/LICENSE* \ @@ -608,9 +668,9 @@ cp -a \ shaderc-$SHADERC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/shaderc cp -a \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/LICENSE* \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/README* \ - SPIRV-Cross-$SPIRV_CROSS_VERSION/*.md \ + SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/LICENSE* \ + SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/README* \ + SPIRV-Cross-sdk-$SPIRV_CROSS_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/SPIRV-Cross cp -a \ gfxreconstruct-sdk-$GFXRECONSTRUCT_VERSION/LICENSE* \ @@ -624,10 +684,15 @@ cp -a \ DirectXShaderCompiler-$DXC_VERSION/*.md \ $PKG/usr/doc/$PKGNAM-$VERSION/DirectXShaderCompiler cp -a \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/LICENSE* \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/README* \ - SPIRV-Reflect-$SPIRV_REFLECT_VERSION/*.md \ + SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/LICENSE* \ + SPIRV-Reflect-sdk-$SPIRV_REFLECT_VERSION/README* \ + SPIRV-Reflect-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 \ + $PKG/usr/doc/$PKGNAM-$VERSION/Vulkan-Profiles mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc |