ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-14 02:35:37 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#14726) Bump spirv-cross/1.3.236.0

Browse Source 
* add spirv-cross/1.3.236.0

* fix gcc5

* add patch fields
This commit is contained in:
SpaceIm
2022-12-19 15:26:44 +01:00
committed by GitHub
parent 692d0696db
commit 156eeb076c
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
recipes/spirv-cross/all/conandata.yml
View File

@@ -1,4 +1,7 @@
sources:
"1.3.236.0":
url: "https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.236.0.tar.gz"
sha256: "8140a2b53d1e218e9be1f8d5e2749b1ebe854d456e5cb356218fd288747d5438"
"1.3.231.1":
url: "https://github.com/KhronosGroup/SPIRV-Cross/archive/refs/tags/sdk-1.3.231.1.tar.gz"
sha256: "3b42f5b6e46b45600e09fd55234f59edb7cfca803e49d7830dc6fb5a086143b1"
@@ -42,6 +45,11 @@ sources:
url: "https://github.com/KhronosGroup/SPIRV-Cross/archive/2020-04-03.tar.gz"
sha256: "93f3a6dfad17c9ca0bf4d2d80809e90118e13b47502eb395baba8784025d7e97"
patches:
"1.3.236.0":
- patch_file: "patches/1.3.236.0-0001-fix-gcc5.patch"
patch_description: "Fix compilation with gcc-5"
patch_type: "portability"
base_path: "source_subfolder"
"cci.20210621":
- patch_file: "patches/0001-fix-bundle-install-cci.20210621.patch"
base_path: "source_subfolder"

14
recipes/spirv-cross/all/patches/1.3.236.0-0001-fix-gcc5.patch Normal file
View File

@@ -0,0 +1,14 @@
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -4955,9 +4955,9 @@ SmallVector<ConstantID> CompilerGLSL::get_composite_constant_ids(ConstantID cons
if (is_array(type) || type.basetype == SPIRType::Struct)
return constant->subconstants;
if (is_matrix(type))
- return constant->m.id;
+ return SmallVector<ConstantID>(constant->m.id);
if (is_vector(type))
- return constant->m.c[0].id;
+ return SmallVector<ConstantID>(constant->m.c[0].id);
SPIRV_CROSS_THROW("Unexpected scalar constant!");
}
if (!const_composite_insert_ids.count(const_id))

2
recipes/spirv-cross/config.yml
View File

@@ -1,4 +1,6 @@
versions:
"1.3.236.0":
folder: all
"1.3.231.1":
folder: all
"1.3.224.0":