summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-11-24 20:52:02 +0000
committer Eric Hameleers <alien@slackware.com>2023-11-24 22:28:38 +0100
commit616339b7f26fafbbbcfd9f5e6282d1bce89e0f2a (patch)
treefb0eedc197ae63a6873391b3aeadd062c3ea1eb9 /source
parentc416b2d238eb858d7bcef8790c79e290868b793d (diff)
downloadcurrent-616339b7f26fafbbbcfd9f5e6282d1bce89e0f2a.tar.gz
current-616339b7f26fafbbbcfd9f5e6282d1bce89e0f2a.tar.xz
Fri Nov 24 20:52:02 UTC 202320231124205202
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.
Diffstat (limited to 'source')
-rwxr-xr-xsource/l/ffmpeg/ffmpeg.SlackBuild2
-rw-r--r--source/x/vulkan-sdk/DirectXShaderCompiler-dump-reflection.patch279
-rw-r--r--source/x/vulkan-sdk/DirectXShaderCompiler-gcc13.patch142
-rw-r--r--source/x/vulkan-sdk/VERSION2
-rwxr-xr-xsource/x/vulkan-sdk/fetch-sources.sh14
-rwxr-xr-xsource/x/vulkan-sdk/vulkan-sdk.SlackBuild357
6 files changed, 193 insertions, 603 deletions
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 <python3kgae@outlook.com>
-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: <nullptr>
-+// 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: <unknown: 0>
-+// 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<bool> DumpRDAT("dumprdat",
- cl::desc("Dump RDAT"),
- cl::init(false));
-
-+static cl::opt<bool> 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<IDxcBlobEncoding> pSource;
-+ ReadFileIntoBlob(m_dxcSupport, StringRefWide(InputFilename), &pSource);
-+
-+ CComPtr<IDxcContainerReflection> 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<ID3D12ShaderReflection> pShaderReflection;
-+ CComPtr<ID3D12LibraryReflection> 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<IDxcBlob> pPart;
-+ IFT(pReflection->GetPartContent(i, &pPart));
-+ const hlsl::DxilProgramHeader *pProgramHeader =
-+ reinterpret_cast<const hlsl::DxilProgramHeader*>(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<IDxcBlob> 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<Constant>(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<Constant>(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<Instruction>(V)) {
-
- for (Use &U : I->operands()) {
- Instruction *UseI = dyn_cast<Instruction>(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 <cstdint>
- /// \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* \