Accepting request 1167487 from X11:Wayland

- Update to release 2024.0

OBS-URL: https://build.opensuse.org/request/show/1167487
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shaderc?expand=0&rev=28
This commit is contained in:
Ana Guerrero 2024-04-15 18:14:11 +00:00 committed by Git OBS Bridge
commit 3932d5785a
5 changed files with 25 additions and 20 deletions

View File

@ -4,11 +4,11 @@
utils/update_build_version.sh | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
Index: shaderc-2023.8/CMakeLists.txt
Index: shaderc-2024.0/CMakeLists.txt
===================================================================
--- shaderc-2023.8.orig/CMakeLists.txt
+++ shaderc-2023.8/CMakeLists.txt
@@ -124,7 +124,6 @@ endif(MSVC)
--- shaderc-2024.0.orig/CMakeLists.txt
+++ shaderc-2024.0/CMakeLists.txt
@@ -120,7 +120,6 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
@ -16,19 +16,19 @@ Index: shaderc-2023.8/CMakeLists.txt
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
@@ -135,7 +134,7 @@ endif()
@@ -131,7 +130,7 @@ endif()
add_custom_target(build-version
${PYTHON_EXECUTABLE}
${Python_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh
${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).")
Index: shaderc-2023.8/libshaderc/CMakeLists.txt
Index: shaderc-2024.0/libshaderc/CMakeLists.txt
===================================================================
--- shaderc-2023.8.orig/libshaderc/CMakeLists.txt
+++ shaderc-2023.8/libshaderc/CMakeLists.txt
--- shaderc-2024.0.orig/libshaderc/CMakeLists.txt
+++ shaderc-2024.0/libshaderc/CMakeLists.txt
@@ -67,6 +67,8 @@ set(SHADERC_LIBS
shaderc_util
SPIRV # from glslang
@ -38,9 +38,9 @@ Index: shaderc-2023.8/libshaderc/CMakeLists.txt
)
target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS})
Index: shaderc-2023.8/utils/update_build_version.sh
Index: shaderc-2024.0/utils/update_build_version.sh
===================================================================
--- /dev/null
+++ shaderc-2023.8/utils/update_build_version.sh
+++ shaderc-2024.0/utils/update_build_version.sh
@@ -0,0 +1 @@
+#!/bin/true

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 12 17:08:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release 2024.0
* Explicitly use python3 in shebangs/scripts
-------------------------------------------------------------------
Fri Jan 19 13:04:49 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -19,7 +19,7 @@
# Remember to bump in baselibs.conf
%define lname libshaderc_shared1
Name: shaderc
Version: 2023.8
Version: 2024.0
Release: 0
Summary: A collection of tools, libraries and tests for shader compilation
License: Apache-2.0
@ -31,11 +31,11 @@ Source99: baselibs.conf
Patch1: 0001-Use-system-third-party-libs.patch
BuildRequires: c++_compiler
BuildRequires: cmake >= 2.8.12
BuildRequires: glslang-devel >= 14
BuildRequires: glslang-devel >= 14.1.0
BuildRequires: glslang-nonstd-devel
BuildRequires: python3-base
BuildRequires: spirv-headers >= 1.6.1~sdk275
BuildRequires: spirv-tools-devel >= 2023.6~rc1
BuildRequires: spirv-headers >= 1.6.1~sdk280
BuildRequires: spirv-tools-devel >= 2024.1~rc1
%description
A collection of tools, libraries and tests for shader compilation.
@ -82,8 +82,7 @@ export CXXFLAGS="%{optflags} -I%_includedir/External"
rm %buildroot/%_libdir/*.a
rm %buildroot/%_libdir/pkgconfig/shaderc_{static,combined}.pc
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%ldconfig_scriptlets -n %lname
%files
%license LICENSE

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfec5045f30d8f6d3d3914ab5b3cc2695947f266d41261b1459177cd789308d1
size 227238

3
v2024.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c761044e4e204be8e0b9a2d7494f08671ca35b92c4c791c7049594ca7514197f
size 227125