Compare commits
No commits in common. "c9-beta" and "imports/c9-beta/shaderc-2022.1-1.el9" have entirely different histories.
c9-beta
...
imports/c9
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/shaderc-2024.0.tar.gz
|
||||
SOURCES/shaderc-1bbf43f.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
5c6d747e060e74f49e0a1f872dccefd87808cf77 SOURCES/shaderc-2024.0.tar.gz
|
||||
b0edee5bc60d60bb8bbf5fcef4283f1f3e30170b SOURCES/shaderc-1bbf43f.tar.gz
|
||||
|
||||
@ -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).")
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- a/libshaderc_util/CMakeLists.txt
|
||||
+++ b/libshaderc_util/CMakeLists.txt
|
||||
@@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL)
|
||||
@@ -47,7 +47,7 @@
|
||||
find_package(Threads)
|
||||
target_link_libraries(shaderc_util PRIVATE
|
||||
glslang SPIRV
|
||||
glslang OSDependent OGLCompiler HLSL 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 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
@@ -43,7 +43,7 @@
|
||||
endif(SHADERC_ENABLE_WGSL_OUTPUT)
|
||||
|
||||
target_link_libraries(glslc PRIVATE
|
||||
- glslang SPIRV # Glslang libraries
|
||||
+ glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries
|
||||
- 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})
|
||||
|
||||
@ -1,14 +1,22 @@
|
||||
# Force out of source build
|
||||
%undefine __cmake_in_source_build
|
||||
|
||||
# Release 1.3.204.0 sdk
|
||||
%global commit 1bbf43f210941ba69a2cd05cf3529063f1ff5bb9
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global snapshotdate 20220202
|
||||
|
||||
# Glslang revision from packaged version
|
||||
%global glslang_version 436237a4ab2be3225acedc66016ea2aa82946b37
|
||||
%global glslang_version 0c4c93bf615b51be9ec057ba830c0207bdedae80
|
||||
|
||||
Name: shaderc
|
||||
Version: 2024.0
|
||||
Version: 2022.1
|
||||
Release: 1%{?dist}
|
||||
Summary: A collection of tools, libraries, and tests for Vulkan shader compilation
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/google/shaderc
|
||||
Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
|
||||
# Patch to unbundle 3rd party code
|
||||
Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch
|
||||
Patch2: glslang_linker_flags.patch
|
||||
@ -16,12 +24,10 @@ Patch2: glslang_linker_flags.patch
|
||||
BuildRequires: cmake3
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: sed
|
||||
BuildRequires: spirv-tools
|
||||
|
||||
BuildRequires: glslang-devel
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: glslang-devel
|
||||
BuildRequires: spirv-headers-devel
|
||||
BuildRequires: spirv-tools
|
||||
BuildRequires: spirv-tools-devel
|
||||
|
||||
%description
|
||||
@ -65,14 +71,13 @@ A library for compiling shader strings into SPIR-V.
|
||||
Static libraries for libshaderc.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n %{name}-%{commit}
|
||||
|
||||
rm -rf 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)\" \
|
||||
@ -88,7 +93,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
|
||||
%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_SKIP_RPATH=True \
|
||||
-DSHADERC_SKIP_TESTS=True \
|
||||
-DPYTHON_EXECUTABLE=%{python3} \
|
||||
-DPYTHON_EXE=%{__python3} \
|
||||
-GNinja
|
||||
%cmake3_build
|
||||
|
||||
@ -121,24 +126,6 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
|
||||
%{_libdir}/pkgconfig/shaderc_combined.pc
|
||||
|
||||
%changelog
|
||||
* Fri Jul 05 2024 José Expósito <jexposit@redhat.com> - 2024.0-1
|
||||
- Update to 1.3.280.0 SDK
|
||||
|
||||
* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 2023.7-1
|
||||
- Update to 1.3.268.0 SDK
|
||||
|
||||
* Fri Jul 07 2023 Dave Airlie <airlied@redhat.com> - 2023.4-1
|
||||
- Update for 1.3.250.1 sdk release
|
||||
|
||||
* Thu Feb 16 2023 Dave Airlie <airlied@redhat.com> - 2023.1-2
|
||||
- Update for 1.3.239.0 sdk release
|
||||
|
||||
* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
|
||||
- Update for 1.3.224.0 sdk release
|
||||
|
||||
* Fri Jun 24 2022 Dave Airlie <airlied@redhat.com> - 2022.2-1
|
||||
- Update for 1.3.216.0 sdk release
|
||||
|
||||
* Mon Feb 28 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1
|
||||
- Update for 1.3.204.0 sdk release
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user