Compare commits
58 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7cfe9fc425 | ||
|
|
a329a0be6f | ||
|
|
03bb698512 | ||
|
|
296e1ebf6d | ||
|
|
43567d2f46 | ||
|
|
b08e5bcfdc | ||
|
|
03213de09a | ||
|
|
98bfc81aeb | ||
|
|
778f507aee | ||
|
|
ebaa6f9175 | ||
|
|
9a300b042a | ||
|
|
e9b1585281 | ||
|
|
b5145be5a7 | ||
|
|
b32e668d9d | ||
|
|
e2ea6da7a4 | ||
|
|
69ab0ca763 | ||
|
|
532876f399 | ||
|
|
e319f19c4b | ||
|
|
66374dd34e | ||
|
|
015b5d055c | ||
|
|
a317187e65 | ||
|
|
c39ab21c8f | ||
| 4a5f8f6b07 | |||
|
|
e372b7585c | ||
|
|
2ad635f2b0 | ||
|
|
49f19ee582 | ||
| c30203295b | |||
|
|
80bbfbd100 | ||
|
|
d0f8d4b689 | ||
|
|
4987ecd9e0 | ||
|
|
c51ae85d16 | ||
|
|
7549837cf6 | ||
|
|
5012bf8856 | ||
|
|
636d983a46 | ||
|
|
ff40768c64 | ||
|
|
d7061f6fa5 | ||
|
|
a2698b1c1c | ||
|
|
1150544b5c | ||
|
|
5d69c02a1f | ||
|
|
350f8f9131 | ||
|
|
719bd557e2 | ||
|
|
3b1492aaef | ||
|
|
aab6525b62 | ||
|
|
8ad38eb650 |
||
|
|
e8a0957709 |
||
|
|
1987df224e | ||
|
|
d9cd506315 |
||
|
|
dcdcb8c38a |
||
|
|
fac8674882 | ||
|
|
268e1560c3 | ||
|
|
180856cf7d | ||
|
|
9eed86af39 | ||
|
|
10c0266890 | ||
|
|
64f3b94f91 | ||
|
|
81471bb086 | ||
|
|
f8b120b21d | ||
|
|
8b725acd6f | ||
|
|
0862c53e13 |
7 changed files with 278 additions and 0 deletions
26
.gitignore
vendored
Normal file
26
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/shaderc-7a23a01.tar.gz
|
||||
/shaderc-7d8582b.tar.gz
|
||||
/shaderc-34c412f.tar.gz
|
||||
/shaderc-f76bb2f.tar.gz
|
||||
/shaderc-7c2aa93.tar.gz
|
||||
/shaderc-4162bb1.tar.gz
|
||||
/shaderc-1fce597.tar.gz
|
||||
/shaderc-0dbd899.tar.gz
|
||||
/shaderc-24275a1.tar.gz
|
||||
/shaderc-bdd134d.tar.gz
|
||||
/shaderc-adca18d.tar.gz
|
||||
/shaderc-1701a27.tar.gz
|
||||
/shaderc-551f106.tar.gz
|
||||
/shaderc-d0b0222.tar.gz
|
||||
/shaderc-2023.3.tar.gz
|
||||
/shaderc-2023.7.tar.gz
|
||||
/shaderc-2023.8.tar.gz
|
||||
/shaderc-2024.0.tar.gz
|
||||
/3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz
|
||||
/ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz
|
||||
/caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz
|
||||
/3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz
|
||||
/8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz
|
||||
/73743588fe9c39f2f1c780a087d94afac691a189.tar.gz
|
||||
/301b4ede53d59b68bf55f95bb26412d9233c8187.tar.gz
|
||||
/d5f08ae5c5a9a45165578445cbd0f9adf0223448.tar.gz
|
||||
22
.packit.yaml
Normal file
22
.packit.yaml
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# packit config for shaderc
|
||||
# Build Stage 4 - depends on glslang
|
||||
|
||||
jobs:
|
||||
- job: koji_build
|
||||
trigger: commit | koji_build
|
||||
allowed_committers: [all_committers]
|
||||
allowed_pr_authors: ['asrivats','jexposit']
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
sidetag_group: vulkan-sdk-releases
|
||||
dependencies:
|
||||
- glslang
|
||||
|
||||
- job: bodhi_update
|
||||
trigger: koji_build
|
||||
dist_git_branches:
|
||||
- fedora-all
|
||||
sidetag_group: vulkan-sdk-releases
|
||||
dependencies:
|
||||
- vulkan-validation-layers
|
||||
- vulkan-tools
|
||||
24
0001-Drop-third-party-code-in-CMakeLists.txt.patch
Normal file
24
0001-Drop-third-party-code-in-CMakeLists.txt.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt
|
||||
--- shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig 2021-03-05 13:50:35.469018657 +0100
|
||||
+++ shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt 2021-03-05 13:52:02.679524176 +0100
|
||||
@@ -112,20 +112,10 @@ endif(MSVC)
|
||||
|
||||
# Configure subdirectories.
|
||||
# We depend on these for later projects, so they should come first.
|
||||
-add_subdirectory(third_party)
|
||||
|
||||
add_subdirectory(libshaderc_util)
|
||||
add_subdirectory(libshaderc)
|
||||
add_subdirectory(glslc)
|
||||
-if(${SHADERC_ENABLE_EXAMPLES})
|
||||
- add_subdirectory(examples)
|
||||
-endif()
|
||||
-
|
||||
-add_custom_target(build-version
|
||||
- ${Python_EXECUTABLE}
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
|
||||
- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
|
||||
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
|
||||
|
||||
function(define_pkg_config_file NAME LIBS)
|
||||
add_custom_target(${NAME}-pkg-config ALL
|
||||
57
changelog
Normal file
57
changelog
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2021.0-2
|
||||
- Update to 2021.0
|
||||
- Fix changelog
|
||||
- Close: rhbz#1952332
|
||||
|
||||
* Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2020.5-1
|
||||
- Update to 2020.5
|
||||
- Close: rhbz#1931006
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.4-1
|
||||
- Update to 2020.4
|
||||
- Close: rhbz#1906260
|
||||
|
||||
* Sat Dec 05 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.3-1
|
||||
- Update to 2020.3
|
||||
- Close: rhbz#1875183
|
||||
|
||||
* Sat Aug 08 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.2-1
|
||||
- Update to 2020.2
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.1-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 20:15:27 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.1-1
|
||||
- Update to 2020.1
|
||||
|
||||
* Sun Feb 02 20:53:01 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2019.1-1
|
||||
- Update to 2019.1
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jun 10 00:18:18 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2019.0-1
|
||||
- Release 2019.0
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Oct 03 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2018.0-1
|
||||
- Release 2018.0
|
||||
|
||||
* Mon Sep 24 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2017.2-1
|
||||
- Initial build
|
||||
|
||||
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 @@ add_definitions(-DENABLE_HLSL)
|
||||
find_package(Threads)
|
||||
target_link_libraries(shaderc_util PRIVATE
|
||||
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 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
endif(SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
|
||||
target_link_libraries(glslc PRIVATE
|
||||
- glslang SPIRV # Glslang libraries
|
||||
+ 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})
|
||||
|
||||
124
shaderc.spec
Normal file
124
shaderc.spec
Normal file
|
|
@ -0,0 +1,124 @@
|
|||
# Glslang revision from packaged version
|
||||
%global glslang_version d5f08ae5c5a9a45165578445cbd0f9adf0223448
|
||||
|
||||
Name: shaderc
|
||||
Version: 2026.2
|
||||
Release: %autorelease
|
||||
Summary: Collection of tools, libraries, and tests for Vulkan shader compilation
|
||||
|
||||
License: Apache-2.0
|
||||
URL: https://github.com/google/shaderc
|
||||
Source: %{url}/archive/%{glslang_version}.tar.gz
|
||||
# Patch to unbundle 3rd party code
|
||||
Patch: 0001-Drop-third-party-code-in-CMakeLists.txt.patch
|
||||
Patch: glslang_linker_flags.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: sed
|
||||
BuildRequires: spirv-tools
|
||||
|
||||
BuildRequires: glslang-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: spirv-headers-devel
|
||||
BuildRequires: spirv-tools-devel
|
||||
|
||||
%description
|
||||
A collection of tools, libraries and tests for shader compilation.
|
||||
|
||||
Shaderc aims to to provide:
|
||||
- a command line compiler with GCC- and Clang-like usage, for better
|
||||
integration with build systems
|
||||
- an API where functionality can be added without breaking existing clients
|
||||
- an API supporting standard concurrency patterns across multiple
|
||||
operating systems
|
||||
- increased functionality such as file #include support
|
||||
|
||||
%package -n glslc
|
||||
Summary: A command line compiler for GLSL/HLSL to SPIR-V
|
||||
|
||||
%description -n glslc
|
||||
A command line compiler for GLSL/HLSL to SPIR-V.
|
||||
|
||||
%package -n libshaderc
|
||||
Summary: A library for compiling shader strings into SPIR-V
|
||||
|
||||
%description -n libshaderc
|
||||
A library for compiling shader strings into SPIR-V.
|
||||
|
||||
%package -n libshaderc-devel
|
||||
Summary: Development files for libshaderc
|
||||
Requires: libshaderc%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n libshaderc-devel
|
||||
A library for compiling shader strings into SPIR-V.
|
||||
|
||||
Development files for libshaderc.
|
||||
|
||||
%package -n libshaderc-static
|
||||
Summary: A library for compiling shader strings into SPIR-V (static libraries)
|
||||
|
||||
%description -n libshaderc-static
|
||||
A library for compiling shader strings into SPIR-V.
|
||||
|
||||
Static libraries for libshaderc.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{glslang_version}
|
||||
|
||||
rm -r third_party
|
||||
|
||||
# Stolen from Gentoo
|
||||
# Create build-version.inc since we want to use our packaged
|
||||
# SPIRV-Tools and glslang
|
||||
sed -i -e '/build-version/d' glslc/CMakeLists.txt
|
||||
echo \"shaderc $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' CHANGES)\" \
|
||||
> glslc/src/build-version.inc
|
||||
echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' /usr/share/doc/spirv-tools/CHANGES)\" \
|
||||
>> glslc/src/build-version.inc
|
||||
echo \"glslang %{glslang_version}\" >> glslc/src/build-version.inc
|
||||
|
||||
# Point to correct include
|
||||
sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/src/compiler.cc
|
||||
|
||||
%build
|
||||
# We disable the tests because they don't work with our unbundling of 3rd party.
|
||||
# See https://github.com/google/shaderc/issues/470
|
||||
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_SKIP_RPATH=True \
|
||||
-DSHADERC_SKIP_TESTS=True \
|
||||
-DPYTHON_EXECUTABLE=%{python3} \
|
||||
-GNinja
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
%check
|
||||
%ctest
|
||||
|
||||
%files -n glslc
|
||||
%doc glslc/README.asciidoc
|
||||
%license LICENSE
|
||||
%{_bindir}/glslc
|
||||
|
||||
%files -n libshaderc
|
||||
%doc AUTHORS CHANGES CONTRIBUTORS README.md
|
||||
%license LICENSE
|
||||
%{_libdir}/libshaderc_shared.so.1*
|
||||
|
||||
%files -n libshaderc-devel
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/libshaderc_shared.so
|
||||
%{_libdir}/pkgconfig/shaderc.pc
|
||||
|
||||
%files -n libshaderc-static
|
||||
%license LICENSE
|
||||
%{_libdir}/libshaderc.a
|
||||
%{_libdir}/libshaderc_combined.a
|
||||
%{_libdir}/pkgconfig/shaderc_static.pc
|
||||
%{_libdir}/pkgconfig/shaderc_combined.pc
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
SHA512 (d5f08ae5c5a9a45165578445cbd0f9adf0223448.tar.gz) = 91223ef1c85a8e7a5dff8b220e816afe278830f9fb3f7a15e88fd814995b2ea453aaba0370d22102520e9c4acd375436ff79b2ddd6cdbf03aab72541523d5592
|
||||
Loading…
Add table
Add a link
Reference in a new issue