forked from pool/spirv-tools
- Update to release 2020.6
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=57
This commit is contained in:
Git OBS Bridge
parent
259f94e7fa
commit
3e125e5571
@ -1,4 +1,4 @@
|
||||
libSPIRV-Tools-suse18
|
||||
libSPIRV-Tools-suse19
|
||||
spirv-tools-devel
|
||||
requires -spirv-tools-<targettype>
|
||||
requires "libSPIRV-Tools-suse18-<targettype> = <version>"
|
||||
requires "libSPIRV-Tools-suse19-<targettype> = <version>"
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 8 12:30:46 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2020.6
|
||||
* Take new (raytracing) termination instructions into account.
|
||||
* Do run DCE if SPV_KHR_ray_query is used.
|
||||
* Support SPV_KHR_fragment_shading_rate.
|
||||
* Add validation support for the ray tracing built-in variables.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 11 22:43:40 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -16,10 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
%define lname libSPIRV-Tools-suse18
|
||||
%define _lto_cflags %nil
|
||||
%define lname libSPIRV-Tools-suse19
|
||||
|
||||
Name: spirv-tools
|
||||
Version: 2020.4
|
||||
Version: 2020.6
|
||||
Release: 0
|
||||
Summary: API and commands for processing SPIR-V modules
|
||||
License: Apache-2.0
|
||||
@ -36,7 +37,7 @@ BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: python3-xml
|
||||
BuildRequires: spirv-headers >= 1.5.3.g18
|
||||
BuildRequires: spirv-headers >= 1.5.3.g22
|
||||
|
||||
%description
|
||||
The package includes an assembler, binary module parser,
|
||||
@ -64,12 +65,12 @@ validator, and is used in the standalone tools whilst also enabling
|
||||
integration into other code bases directly.
|
||||
|
||||
%prep
|
||||
%setup -qn SPIRV-Tools-%version
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -n SPIRV-Tools-%version
|
||||
|
||||
%build
|
||||
%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix"
|
||||
make %{?_smp_mflags}
|
||||
%cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \
|
||||
-DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
|
||||
size 2282982
|
||||
3
v2020.6.tar.gz
Normal file
3
v2020.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
|
||||
size 2595300
|
||||
94
ver.diff
94
ver.diff
@ -4,78 +4,86 @@ Date: 2016-06-13 11:46:16.846841814 +0200
|
||||
Unversioned libraries suck!
|
||||
|
||||
---
|
||||
source/CMakeLists.txt | 2 ++
|
||||
source/CMakeLists.txt | 3 +++
|
||||
source/fuzz/CMakeLists.txt | 1 +
|
||||
source/link/CMakeLists.txt | 1 +
|
||||
source/opt/CMakeLists.txt | 1 +
|
||||
source/reduce/CMakeLists.txt | 1 +
|
||||
5 files changed, 6 insertions(+)
|
||||
5 files changed, 7 insertions(+)
|
||||
|
||||
Index: spirv-tools-2019.5~git157/source/CMakeLists.txt
|
||||
Index: SPIRV-Tools-2020.6/source/CMakeLists.txt
|
||||
===================================================================
|
||||
--- spirv-tools-2019.5~git157.orig/source/CMakeLists.txt
|
||||
+++ spirv-tools-2019.5~git157/source/CMakeLists.txt
|
||||
@@ -336,6 +336,7 @@ set_source_files_properties(
|
||||
spvtools_pch(SPIRV_SOURCES pch_source)
|
||||
|
||||
add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
|
||||
+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse18)
|
||||
spvtools_default_compile_options(${SPIRV_TOOLS})
|
||||
target_include_directories(${SPIRV_TOOLS}
|
||||
PUBLIC
|
||||
@@ -349,6 +350,7 @@ spvtools_check_symbol_exports(${SPIRV_TO
|
||||
add_dependencies( ${SPIRV_TOOLS} core_tables enum_string_mapping extinst_tables )
|
||||
|
||||
--- SPIRV-Tools-2020.6.orig/source/CMakeLists.txt
|
||||
+++ SPIRV-Tools-2020.6/source/CMakeLists.txt
|
||||
@@ -367,6 +367,7 @@ endfunction()
|
||||
add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
|
||||
+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse18)
|
||||
spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
|
||||
target_include_directories(${SPIRV_TOOLS}-shared
|
||||
PUBLIC
|
||||
Index: spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt
|
||||
spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
|
||||
set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
|
||||
+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse19)
|
||||
target_compile_definitions(${SPIRV_TOOLS}-shared
|
||||
PRIVATE SPIRV_TOOLS_IMPLEMENTATION
|
||||
PUBLIC SPIRV_TOOLS_SHAREDLIB
|
||||
@@ -377,6 +378,7 @@ if(SPIRV_TOOLS_BUILD_STATIC)
|
||||
spirv_tools_default_target_options(${SPIRV_TOOLS}-static)
|
||||
# The static target does not have the '-static' suffix.
|
||||
set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}")
|
||||
+ set_target_properties(${SPIRV_TOOLS}-static PROPERTIES SOVERSION suse19)
|
||||
|
||||
# Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static"
|
||||
# or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS.
|
||||
@@ -389,6 +391,7 @@ if(SPIRV_TOOLS_BUILD_STATIC)
|
||||
set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
|
||||
else()
|
||||
add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
|
||||
+ set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse19)
|
||||
spirv_tools_default_target_options(${SPIRV_TOOLS})
|
||||
set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
|
||||
endif()
|
||||
Index: SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt
|
||||
===================================================================
|
||||
--- spirv-tools-2019.5~git157.orig/source/fuzz/CMakeLists.txt
|
||||
+++ spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt
|
||||
@@ -146,6 +146,7 @@ if(SPIRV_BUILD_FUZZER)
|
||||
--- SPIRV-Tools-2020.6.orig/source/fuzz/CMakeLists.txt
|
||||
+++ SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt
|
||||
@@ -425,6 +425,7 @@ if(SPIRV_BUILD_FUZZER)
|
||||
spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz)
|
||||
|
||||
add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES})
|
||||
+ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse18)
|
||||
+ set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse19)
|
||||
|
||||
spvtools_default_compile_options(SPIRV-Tools-fuzz)
|
||||
target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0)
|
||||
Index: spirv-tools-2019.5~git157/source/link/CMakeLists.txt
|
||||
|
||||
Index: SPIRV-Tools-2020.6/source/link/CMakeLists.txt
|
||||
===================================================================
|
||||
--- spirv-tools-2019.5~git157.orig/source/link/CMakeLists.txt
|
||||
+++ spirv-tools-2019.5~git157/source/link/CMakeLists.txt
|
||||
--- SPIRV-Tools-2020.6.orig/source/link/CMakeLists.txt
|
||||
+++ SPIRV-Tools-2020.6/source/link/CMakeLists.txt
|
||||
@@ -14,6 +14,7 @@
|
||||
add_library(SPIRV-Tools-link
|
||||
add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE}
|
||||
linker.cpp
|
||||
)
|
||||
+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse18)
|
||||
+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse19)
|
||||
|
||||
spvtools_default_compile_options(SPIRV-Tools-link)
|
||||
target_include_directories(SPIRV-Tools-link
|
||||
Index: spirv-tools-2019.5~git157/source/opt/CMakeLists.txt
|
||||
Index: SPIRV-Tools-2020.6/source/opt/CMakeLists.txt
|
||||
===================================================================
|
||||
--- spirv-tools-2019.5~git157.orig/source/opt/CMakeLists.txt
|
||||
+++ spirv-tools-2019.5~git157/source/opt/CMakeLists.txt
|
||||
@@ -231,6 +231,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch
|
||||
--- SPIRV-Tools-2020.6.orig/source/opt/CMakeLists.txt
|
||||
+++ SPIRV-Tools-2020.6/source/opt/CMakeLists.txt
|
||||
@@ -234,6 +234,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch
|
||||
|
||||
add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
|
||||
add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES})
|
||||
|
||||
+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse18)
|
||||
+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse19)
|
||||
spvtools_default_compile_options(SPIRV-Tools-opt)
|
||||
target_include_directories(SPIRV-Tools-opt
|
||||
PUBLIC
|
||||
Index: spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt
|
||||
Index: SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt
|
||||
===================================================================
|
||||
--- spirv-tools-2019.5~git157.orig/source/reduce/CMakeLists.txt
|
||||
+++ spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt
|
||||
@@ -83,6 +83,7 @@ target_include_directories(SPIRV-Tools-r
|
||||
--- SPIRV-Tools-2020.6.orig/source/reduce/CMakeLists.txt
|
||||
+++ SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt
|
||||
@@ -88,6 +88,7 @@ target_include_directories(SPIRV-Tools-r
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
PRIVATE ${spirv-tools_BINARY_DIR}
|
||||
)
|
||||
+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse18)
|
||||
+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse19)
|
||||
# The reducer reuses a lot of functionality from the SPIRV-Tools library.
|
||||
target_link_libraries(SPIRV-Tools-reduce
|
||||
PUBLIC ${SPIRV_TOOLS}
|
||||
PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user