Fix FTBFS with new glslang
This commit is contained in:
parent
d9cd506315
commit
1987df224e
24
glslang_linker_flags.patch
Normal file
24
glslang_linker_flags.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
--- a/libshaderc_util/CMakeLists.txt
|
||||||
|
+++ b/libshaderc_util/CMakeLists.txt
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
find_package(Threads)
|
||||||
|
target_link_libraries(shaderc_util PRIVATE
|
||||||
|
glslang OSDependent OGLCompiler HLSL glslang SPIRV
|
||||||
|
- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
+ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
||||||
|
shaderc_add_tests(
|
||||||
|
TEST_PREFIX shaderc_util
|
||||||
|
|
||||||
|
--- a/glslc/CMakeLists.txt
|
||||||
|
+++ b/glslc/CMakeLists.txt
|
||||||
|
@@ -43,7 +43,7 @@
|
||||||
|
endif(SHADERC_ENABLE_WGSL_OUTPUT)
|
||||||
|
|
||||||
|
target_link_libraries(glslc PRIVATE
|
||||||
|
- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries
|
||||||
|
+ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries
|
||||||
|
$<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
|
||||||
|
shaderc_util shaderc # internal Shaderc libraries
|
||||||
|
${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
@ -19,6 +19,7 @@ URL: https://github.com/google/shaderc
|
|||||||
Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
|
Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
|
||||||
# Patch to unbundle 3rd party code
|
# Patch to unbundle 3rd party code
|
||||||
Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch
|
Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch
|
||||||
|
Patch2: glslang_linker_flags.patch
|
||||||
|
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -125,7 +126,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
|
|||||||
%{_libdir}/pkgconfig/shaderc_combined.pc
|
%{_libdir}/pkgconfig/shaderc_combined.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Aug 08 19:00:03 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.2-1
|
* Sat Aug 08 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.2-1
|
||||||
- Update to 2020.2
|
- Update to 2020.2
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.1-3
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.1-3
|
||||||
|
Loading…
Reference in New Issue
Block a user