diff --git a/.gitignore b/.gitignore index b82a809..0d4fa30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/shaderc-2023.7.tar.gz +SOURCES/3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz diff --git a/.shaderc.metadata b/.shaderc.metadata index b998602..9e14eee 100644 --- a/.shaderc.metadata +++ b/.shaderc.metadata @@ -1 +1 @@ -800eb34b6e1e6ef70ace0c383fe4fe62f899d31c SOURCES/shaderc-2023.7.tar.gz +a8c755b5bf8c4da67f88a20fe764980e61b5cd1a SOURCES/3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz diff --git a/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch index b49b925..312864e 100644 --- a/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/SOURCES/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -15,7 +15,7 @@ diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig sh -endif() - -add_custom_target(build-version -- ${PYTHON_EXECUTABLE} +- ${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).") diff --git a/SOURCES/glslang_linker_flags.patch b/SOURCES/glslang_linker_flags.patch index 9324f21..0bc540c 100644 --- a/SOURCES/glslang_linker_flags.patch +++ b/SOURCES/glslang_linker_flags.patch @@ -1,9 +1,9 @@ --- a/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL) find_package(Threads) target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV + glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) @@ -12,12 +12,12 @@ --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) 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 +- glslang SPIRV # Glslang libraries ++ glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries $<$:libtint> # Tint libraries, optional shaderc_util shaderc # internal Shaderc libraries ${CMAKE_THREAD_LIBS_INIT}) diff --git a/SPECS/shaderc.spec b/SPECS/shaderc.spec index 82b1684..ece56f3 100644 --- a/SPECS/shaderc.spec +++ b/SPECS/shaderc.spec @@ -1,19 +1,29 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + # Glslang revision from packaged version -%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 +%global glslang_version 3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1 Name: shaderc -Version: 2023.7 -Release: 1%{?dist} -Summary: A collection of tools, libraries, and tests for Vulkan shader compilation +Version: 2025.2 +Release: %autorelease +Summary: Collection of tools, libraries, and tests for Vulkan shader compilation -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/google/shaderc -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source: %{url}/archive/%{glslang_version}.tar.gz # Patch to unbundle 3rd party code -Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch -Patch2: glslang_linker_flags.patch +Patch: 0001-Drop-third-party-code-in-CMakeLists.txt.patch +Patch: glslang_linker_flags.patch -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build BuildRequires: sed @@ -65,9 +75,9 @@ A library for compiling shader strings into SPIR-V. Static libraries for libshaderc. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{glslang_version} -rm -rf third_party +rm -r third_party # Stolen from Gentoo # Create build-version.inc since we want to use our packaged @@ -85,18 +95,18 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %build # We disable the tests because they don't work with our unbundling of 3rd party. # See https://github.com/google/shaderc/issues/470 -%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=True \ - -DSHADERC_SKIP_TESTS=True \ - -DPYTHON_EXE=%{__python3} \ - -GNinja -%cmake3_build +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_SKIP_RPATH=True \ + -DSHADERC_SKIP_TESTS=True \ + -DPYTHON_EXECUTABLE=%{python3} \ + -GNinja +%cmake_build %install -%cmake3_install +%cmake_install %check -%ctest3 +%ctest %files -n glslc %doc glslc/README.asciidoc @@ -121,33 +131,86 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog -* Wed Jan 17 2024 José Expósito - 2023.7-1 -- Update to 1.3.268.0 SDK +## START: Generated by rpmautospec +* Sun Jun 22 2025 Anusha Srivatsa - 2025.2-1 +- Update to SDK v1.4.313.0 -* Fri Jul 07 2023 Dave Airlie - 2023.4-1 -- Update for 1.3.250.1 sdk release +* Tue Jan 21 2025 José Expósito - 2024.4-1 +- Update to 1.4.304.0 SDK + +* Tue Oct 29 2024 Troy Dawson - 2024.0-2 +- Bump release for October 2024 mass rebuild: + +* Fri Jul 05 2024 José Expósito - 2024.0-1 +- Update to 1.3.280.0 SDK + +* Mon Jun 24 2024 Troy Dawson - 2023.7-4 +- Bump release for June 2024 mass rebuild + +* Tue Apr 30 2024 Tomas Pelka - 2023.7-3 +- Add gating.yaml via API + +* Sat Jan 27 2024 Fedora Release Engineering - 2023.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Nov 02 2023 José Expósito - 2023.7-1 +- update to 1.3.268.0 SDK + +* Sat Jul 22 2023 Fedora Release Engineering - 2023.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 22 2023 Davide Cavalca - 2023.3-1 +- Update to 2023.3 and tidy up the spec; Fixes: RHBZ#1997985 + +* Thu Feb 16 2023 Dave Airlie - 2023.1-3 +- fix build-version attempt * Thu Feb 16 2023 Dave Airlie - 2023.1-2 -- Update for 1.3.239.0 sdk release +- upload sources -* Fri Aug 26 2022 Dave Airlie - 2022.2-2 -- Update for 1.3.224.0 sdk release +* Thu Feb 16 2023 Dave Airlie - 2023.1-1 +- update to 2023.1 for sdk 1.3.239.0 release -* Fri Jun 24 2022 Dave Airlie - 2022.2-1 -- Update for 1.3.216.0 sdk release +* Tue Jan 31 2023 Mamoru TASAKA - 2022.2-5 +- Backport upstream patch to support current spirv-tools -* Mon Feb 28 2022 Dave Airlie - 2022.1-1 -- Update for 1.3.204.0 sdk release +* Sat Jan 21 2023 Fedora Release Engineering - 2022.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Tue Aug 10 2021 Mohan Boddu - 2020.5-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Sun Oct 23 2022 Robert-André Mauchin - 2022.2-3 +- Update to 2022.2 -* Fri Jul 30 2021 Dave Airlie - 2020.5-3 -- Update for 1.2.182.0 sdk release +* Sun Oct 23 2022 Robert-André Mauchin +- Update to 2022.2 -* Fri Apr 16 2021 Mohan Boddu - 2020.5-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Aug 26 2022 Dave Airlie - 2022.2-1 +- update shaderc to sdk 1.3.224 release version + +* Sat Jul 23 2022 Fedora Release Engineering - 2021.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2021.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 06 2021 Dave Airlie - 2021.3-3 +- force a bump for spirv-tools abi change + +* Thu Dec 02 2021 Dave Airlie - 2021.3-2 +- add updates sources + +* Thu Dec 02 2021 Dave Airlie - 2021.3-1 +- Update to v2021.3 + +* Sun Jul 25 2021 Robert-André Mauchin - 2021.0-5 +- Update to 2021.1 Close: rhbz#1974600 + +* Fri Jul 23 2021 Fedora Release Engineering - 2021.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin - 2021.0-2 +- Update to 2021.0 +- Fix changelog +- Close: rhbz#1952332 * Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin - 2020.5-1 - Update to 2020.5 @@ -198,3 +261,5 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr * Mon Sep 24 2018 Robert-André Mauchin - 2017.2-1 - Initial build + +## END: Generated by rpmautospec