summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-01-01 20:33:50 +0000
committerEric Hameleers <alien@slackware.com>2020-01-02 08:59:50 +0100
commit28ca6fabe4f11e839f66810fb111ae094e9aa79c (patch)
tree33697a2299d8b0ad19669e6efd5d82a158457e43 /source/x
parentc01d25f478b3333130586a203534d27eeb6fe93d (diff)
downloadcurrent-28ca6fabe4f11e839f66810fb111ae094e9aa79c.tar.gz
Wed Jan 1 20:33:50 UTC 202020200101203350
Happy 2020 to the Slackware community! :-) a/aaa_terminfo-6.1_20191228-x86_64-1.txz: Upgraded. a/smartmontools-7.1-x86_64-1.txz: Upgraded. ap/sudo-1.8.30-x86_64-1.txz: Upgraded. d/python-setuptools-43.0.0-x86_64-1.txz: Upgraded. l/boost-1.72.0-x86_64-2.txz: Rebuilt. Recompiled against python3-3.8.1. Patched to fix missing boost/serialization/split_member.hpp include. This fixes the lightspark build at SBo. Thanks to orbea. l/ffmpeg-4.2.2-x86_64-1.txz: Upgraded. l/ncurses-6.1_20191228-x86_64-1.txz: Upgraded. l/netpbm-10.89.00-x86_64-1.txz: Upgraded. n/epic5-2.1.1-x86_64-4.txz: Rebuilt. Recompiled against python3-3.8.1. Thanks to Willy Sudiarto Raharjo for pointing this one out. n/whois-5.5.4-x86_64-1.txz: Upgraded. x/vulkan-sdk-1.1.130.0-x86_64-1.txz: Upgraded. extra/pure-alsa-system/ffmpeg-4.2.2-x86_64-1_alsa.txz: Upgraded.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/vulkan-sdk/fetch-sources.sh4
-rw-r--r--source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch30
-rwxr-xr-xsource/x/vulkan-sdk/vulkan-sdk.SlackBuild5
3 files changed, 3 insertions, 36 deletions
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh
index 48e51e3d..a7ad23f1 100755
--- a/source/x/vulkan-sdk/fetch-sources.sh
+++ b/source/x/vulkan-sdk/fetch-sources.sh
@@ -27,8 +27,8 @@
#
# Example: VERSION=1.1.92.1 ./fetch-sources.sh
-VERSION=${VERSION:-1.1.126.0}
-BRANCH=${BRANCH:-sdk-1.1.126}
+VERSION=${VERSION:-1.1.130.0}
+BRANCH=${BRANCH:-sdk-1.1.130}
rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \
Vulkan-Headers-sdk-${VERSION}* \
diff --git a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch b/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch
deleted file mode 100644
index e5a47591..00000000
--- a/source/x/vulkan-sdk/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 199d115e1542fe0a8427efda5fa36158474fb6cf Mon Sep 17 00:00:00 2001
-From: John Kessenich <cepheus@frii.com>
-Date: Tue, 5 Nov 2019 18:05:42 -0700
-Subject: [PATCH] Fix #1959 by reverting 7b0e236 to put files in two places.
-
----
- SPIRV/CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
- mode change 100644 => 100755 SPIRV/CMakeLists.txt
-
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-old mode 100644
-new mode 100755
-index e25ec0a13..9869bafdc
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS SPIRV EXPORT SPIRVTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
--
-- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-
-+ install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-+ install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+
-+ install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
- install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 32687831..3ed33960 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=vulkan-sdk
VERSION=${VERSION:-$(echo Vulkan-ValidationLayers-sdk-*.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:
MARCH=$( uname -m )
@@ -96,9 +96,6 @@ mv SPIRV-Headers-$SPIRV_HEADERS_VERSION spirv-headers
cd $TMP/glslang-${GLSLANG_VERSION}
-# Upstream revert to fix building shaderc (and others):
-zcat $CWD/glslang.199d115e1542fe0a8427efda5fa36158474fb6cf.patch.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 \) \