commit 4f7f76ba220f2dc509602c187def7e25567e8c56
Author: Jakub Bogusz <[email protected]>
Date: Tue Apr 4 22:40:17 2023 +0200
- updated to 2023.3, adjusted for glslang 12
shaderc-system-libs.patch | 13 ++++++++++++-
shaderc.spec | 22 ++++++++++------------
2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/shaderc.spec b/shaderc.spec
index ddef501..edee28f 100644
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -2,25 +2,25 @@
Summary: Collection of tools, libraries and tests for shader compilation
Summary(pl.UTF-8): Zestaw narzędzi, bibliotek i testów do kompilacji
shaderów
Name: shaderc
-Version: 2021.3
+Version: 2023.3
Release: 1
License: Apache v2.0
Group: Libraries
-#Source0Download: https://github.com/google/shaderc/releases
+#Source0Download: https://github.com/google/shaderc/tags
Source0:
https://github.com/google/shaderc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d35d7dda364d73c65fc82f3f4f917cdd
+# Source0-md5: 5149e2beb4501830218edd4cfab68db5
Patch0: %{name}-system-libs.patch
Patch1: %{name}-shared.patch
URL: https://github.com/google/shaderc
# for docs
#BuildRequires: asciidoctor
-BuildRequires: cmake >= 2.8.12
-BuildRequires: glslang-devel >= 11.7.1
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: cmake >= 3.17.2
+BuildRequires: glslang-devel >= 12
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: python3 >= 1:3
BuildRequires: rpmbuild(macros) >= 1.605
-BuildRequires: spirv-tools >= 1:2021.4
-BuildRequires: spirv-tools-devel >= 1:2021.4
+BuildRequires: spirv-tools >= 1:2022.4
+BuildRequires: spirv-tools-devel >= 1:2022.4
%requires_ge glslang
%requires_ge_to spirv-tools-libs spirv-tools-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,12 +87,10 @@ Statyczne biblioteki shaderc.
%patch1 -p1
%build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
-DSHADERC_SKIP_TESTS=ON
-%{__make}
+%{__make} -C build
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/shaderc-system-libs.patch b/shaderc-system-libs.patch
index 09be4a8..898abea 100644
--- a/shaderc-system-libs.patch
+++ b/shaderc-system-libs.patch
@@ -61,7 +61,18 @@
find_package(Threads)
set(SHADERC_LIBS
- glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT}
-+ glslang OSDependent OGLCompiler HLSL glslang ${CMAKE_THREAD_LIBS_INIT}
++ glslang HLSL glslang ${CMAKE_THREAD_LIBS_INIT}
shaderc_util
SPIRV # from glslang
SPIRV-Tools
+--- shaderc-2023.3/libshaderc_util/CMakeLists.txt.orig 2023-03-17
16:56:41.000000000 +0100
++++ shaderc-2023.3/libshaderc_util/CMakeLists.txt 2023-04-04
22:25:20.672373268 +0200
+@@ -46,7 +46,7 @@ add_definitions(-DENABLE_HLSL)
+
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+- glslang OSDependent OGLCompiler HLSL glslang SPIRV
++ glslang HLSL glslang SPIRV
+ SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+
+ shaderc_add_tests(
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shaderc.git/commitdiff/4f7f76ba220f2dc509602c187def7e25567e8c56
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
